diff --git a/app/build.gradle b/app/build.gradle
index b48542e1d..e1953dc2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -157,8 +157,11 @@ dependencies {
     implementation "androidx.datastore:datastore-preferences:1.0.0"
     implementation 'androidx.biometric:biometric:1.2.0-alpha05'
 
+    // EncryptedSharedPreferences for secure credential storage
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"
+
     //tensorflow and mediapipe.
-    implementation 'com.google.mediapipe:tasks-vision:latest.release'
+    implementation 'com.google.mediapipe:tasks-vision:0.10.21'
     implementation ("org.tensorflow:tensorflow-lite:2.11.0")
     implementation ("org.tensorflow:tensorflow-lite-gpu:2.11.0")
     implementation ("org.tensorflow:tensorflow-lite-gpu-api:2.11.0")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a200d5ce..6bf05e808 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Required for camera intent on Android 11+ (package visibility); prevents crash when taking picture on Android 12+ -->
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
     <uses-feature android:name="android.hardware.camera" />
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -49,43 +56,57 @@
         tools:targetApi="31">
         <activity
             android:name=".ui.outreach_activity.OutreachActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.abha_id_activity.AbhaIdActivity"
             android:exported="false"
             android:label="@string/title_activity_abha_id"
             android:theme="@style/Theme.CHO"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".ui.web_view_activity.WebViewActivity"
-            android:exported="false"
-            android:label="@string/title_activity_web_view"
-            android:theme="@style/Theme.CHO" />
-
         <activity
             android:name=".ui.edit_patient_details_activity.EditPatientDetailsActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.RegisterPatientActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.scanAadhaar.ScanAadhaarActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.register_patient_activity.scanAadhaar.CaptureAct"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.master_location_settings.MasterLocationSettingsActivity"
-            android:exported="false" />
+            android:screenOrientation="portrait"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.home_activity.HomeActivity"
             android:exported="false"
-            android:label="CPHC" />
+            android:label="CPHC"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".ui.home.rmncha.SubModuleActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:parentActivityName=".ui.home_activity.HomeActivity"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.login_activity.LoginActivity"
             android:exported="true"
@@ -115,7 +136,7 @@
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
-            tools:node="remove"/>
+            tools:node="remove" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/org/piramalswasthya/cho/CHOApplication.kt b/app/src/main/java/org/piramalswasthya/cho/CHOApplication.kt
index e41d3d0ea..8d6e75b29 100644
--- a/app/src/main/java/org/piramalswasthya/cho/CHOApplication.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/CHOApplication.kt
@@ -14,6 +14,8 @@ import androidx.work.Configuration
 import dagger.hilt.android.EntryPointAccessors
 import dagger.hilt.android.HiltAndroidApp
 import com.google.firebase.FirebaseApp
+import org.piramalswasthya.cho.network.TokenRefreshHolder
+import org.piramalswasthya.cho.network.TokenRefreshProvider
 import org.piramalswasthya.cho.ui.home_activity.DemoDataStore
 import timber.log.Timber
 import javax.inject.Inject
@@ -58,10 +60,69 @@ class CHOApplication : Application(), Configuration.Provider {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         }
 
+        // Global keyboard insets handler: ensures the layout resizes when the soft keyboard
+        // opens on ALL activities. Required because targetSdk 35 enforces edge-to-edge,
+        // which makes windowSoftInputMode="adjustResize" silently ignored.
+        registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+                val window = activity.window
+                val insetsController = WindowCompat.getInsetsController(window, window.decorView)
+                insetsController.isAppearanceLightStatusBars = false
+                val statusBarBgView = View(activity).apply {
+                    tag = "status_bar_bg"
+                    setBackgroundColor(android.graphics.Color.parseColor("#24303C"))
+                }
+
+                val decorView = window.decorView as android.view.ViewGroup
+                decorView.addView(
+                    statusBarBgView,
+                    android.widget.FrameLayout.LayoutParams(
+                        android.widget.FrameLayout.LayoutParams.MATCH_PARENT, 0
+                    )
+                )
+
+                val rootView = activity.findViewById<View>(android.R.id.content)
+                ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, insets ->
+                    val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+                    val systemBarInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                    val bottomPadding = maxOf(imeInsets.bottom, systemBarInsets.bottom)
+                    view.setPadding(
+                        systemBarInsets.left,
+                        systemBarInsets.top,
+                        systemBarInsets.right,
+                        bottomPadding
+                    )
+
+                    statusBarBgView.layoutParams.height = systemBarInsets.top
+                    statusBarBgView.requestLayout()
+                    WindowInsetsCompat.CONSUMED
+                }
+            }
+
+            override fun onActivityStarted(activity: Activity) { /* No action needed */ }
+            override fun onActivityResumed(activity: Activity) { /* No action needed */ }
+            override fun onActivityPaused(activity: Activity) { /* No action needed */ }
+            override fun onActivityStopped(activity: Activity) { /* No action needed */ }
+            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { /* No action needed */ }
+            override fun onActivityDestroyed(activity: Activity) { /* No action needed */ }
+        })
+
+        // Set token refresh provider so AuthRefreshInterceptor can refresh JWT when expired
+        try {
+            val entryPoint = EntryPointAccessors.fromApplication(this, TokenRefreshEntryPoint::class.java)
+            TokenRefreshHolder.provider = entryPoint.tokenRefreshProvider()
+        } catch (e: Exception) {
+            Timber.w(e, "CHOApplication: Could not set TokenRefreshProvider")
+        }
     }
 
+    @dagger.hilt.EntryPoint
+    @dagger.hilt.InstallIn(dagger.hilt.components.SingletonComponent::class)
+    interface TokenRefreshEntryPoint {
+        fun tokenRefreshProvider(): TokenRefreshProvider
+    }
 
     companion object {
         fun dataStore(context: Context) = (context.applicationContext as CHOApplication).dataStore
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ANCVisitsAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ANCVisitsAdapter.kt
new file mode 100644
index 000000000..062b0a74e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ANCVisitsAdapter.kt
@@ -0,0 +1,103 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemAncVisitBinding
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.utils.DateTimeUtil
+
+class ANCVisitsAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientWithPwrDomain, ANCVisitsAdapter.ANCVisitViewHolder>(
+    ANCVisitDiffUtilCallBack
+) {
+
+    private object ANCVisitDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithPwrDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem == newItem
+    }
+
+    class ANCVisitViewHolder private constructor(
+        private val binding: RvItemAncVisitBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): ANCVisitViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAncVisitBinding.inflate(layoutInflater, parent, false)
+                return ANCVisitViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithPwrDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.patientWithPwr = item
+            binding.clickListener = clickListener
+            binding.ivCall.setOnClickListener {
+                clickListener?.onClickCall(item)
+            }
+
+            // Set weeks of pregnancy
+            val weeks = item.getWeeksOfPregnancy()
+            binding.tvWeeksPregnancy.text = if (weeks > 0 && weeks <= 40) {
+                weeks.toString()
+            } else {
+                "N/A"
+            }
+
+            // Set LMP date
+            binding.tvLmp.text = item.getFormattedLMPDate()
+
+            // Set EDD
+            binding.tvEdd.text = item.getFormattedEDD()
+
+            binding.tvLastVisit.text = "N/A"
+
+            // Hide "Add Visit" button if ANC 4 is completed and patient is not HRP
+            val isAnc4Completed = item.ancRecords.any { it.visitNumber == 4 && it.weight != null }
+            val isHRP = item.pwr?.isHrp ?: false
+            binding.btnAddAnc.visibility = if (isAnc4Completed && !isHRP) View.GONE else View.VISIBLE
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        ANCVisitViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: ANCVisitViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedAddANC: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedANCVisits: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedAddPMSMA: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null,
+        private val clickedCall: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null
+    ) {
+        fun onClickAddANC(item: PatientWithPwrDomain) =
+            clickedAddANC?.let { it(item) }
+
+        fun onClickANCVisits(item: PatientWithPwrDomain) =
+            clickedANCVisits?.let { it(item) }
+
+        fun onClickAddPMSMA(item: PatientWithPwrDomain) =
+            clickedAddPMSMA?.let { it(item) }
+
+        fun onClickCall(item: PatientWithPwrDomain) =
+            clickedCall?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/AbortionListAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/AbortionListAdapter.kt
new file mode 100644
index 000000000..0e9d3f24d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/AbortionListAdapter.kt
@@ -0,0 +1,89 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemAbortionBinding
+import org.piramalswasthya.cho.model.AbortionDomain
+
+class AbortionListAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<AbortionDomain, AbortionListAdapter.AbortionViewHolder>(
+    AbortionDiffUtilCallBack
+) {
+
+    private object AbortionDiffUtilCallBack : DiffUtil.ItemCallback<AbortionDomain>() {
+        override fun areItemsTheSame(
+            oldItem: AbortionDomain,
+            newItem: AbortionDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID &&
+                oldItem.abortionRecord?.id == newItem.abortionRecord?.id
+
+        override fun areContentsTheSame(
+            oldItem: AbortionDomain,
+            newItem: AbortionDomain
+        ) = oldItem == newItem
+    }
+
+    class AbortionViewHolder private constructor(
+        private val binding: RvItemAbortionBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): AbortionViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAbortionBinding.inflate(layoutInflater, parent, false)
+                return AbortionViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: AbortionDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.item = item
+            binding.clickListener = clickListener
+            binding.context = binding.root.context
+
+            // Set button color based on abortion form status (text is bound via app:abortionActionText)
+            val isFormFilled = item.isAbortionFormFilled
+            binding.btnAction.setBackgroundColor(
+                binding.root.resources.getColor(
+                    if (isFormFilled) android.R.color.holo_green_dark 
+                    else android.R.color.holo_red_dark,
+                    null
+                )
+            )
+
+
+            // Set sync icon visibility
+            binding.ivSync.visibility = if (item.abortionRecord?.syncState == org.piramalswasthya.cho.database.room.SyncState.SYNCED) {
+                android.view.View.VISIBLE
+            } else {
+                android.view.View.GONE
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        AbortionViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: AbortionViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patientID: String) -> Unit)? = null,
+        private val clickedAdd: ((patientID: String) -> Unit)? = null
+    ) {
+        fun onClickView(item: AbortionDomain) =
+            clickedView?.let { it(item.patient.patientID) }
+
+        fun onClickAdd(item: AbortionDomain) =
+            clickedAdd?.let { it(item.patient.patientID) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/AdolescentListAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/AdolescentListAdapter.kt
new file mode 100644
index 000000000..5633ffec0
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/AdolescentListAdapter.kt
@@ -0,0 +1,94 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemAdolescentListBinding
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.utils.DateTimeUtil
+
+class AdolescentListAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientDisplay, AdolescentListAdapter.AdolescentViewHolder>(
+    AdolescentDiffUtilCallBack
+) {
+
+    private object AdolescentDiffUtilCallBack : DiffUtil.ItemCallback<PatientDisplay>() {
+        override fun areItemsTheSame(
+            oldItem: PatientDisplay,
+            newItem: PatientDisplay
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientDisplay,
+            newItem: PatientDisplay
+        ) = oldItem == newItem
+    }
+
+    class AdolescentViewHolder private constructor(
+        private val binding: RvItemAdolescentListBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): AdolescentViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAdolescentListBinding.inflate(layoutInflater, parent, false)
+                return AdolescentViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientDisplay,
+            clickListener: ClickListener?
+        ) {
+            binding.patient = item
+            binding.clickListener = clickListener
+
+            // Set adolescent name
+            val firstName = item.patient.firstName ?: ""
+            val lastName = item.patient.lastName ?: ""
+            binding.tvAdolescentName.text = if (lastName.isNotEmpty()) {
+                "$firstName $lastName"
+            } else {
+                firstName
+            }
+
+            // Set age
+            item.patient.dob?.let {
+                binding.tvAge.text = DateTimeUtil.calculateAgeString(it)
+            } ?: run {
+                binding.tvAge.text = binding.root.context.getString(org.piramalswasthya.cho.R.string.na)
+            }
+
+            // Set beneficiary ID
+            binding.tvBeneficiaryId.text = item.patient.beneficiaryID?.toString() ?: "NA"
+
+            // Set phone number
+            binding.tvPhoneNo.text = item.patient.phoneNo ?: "NA"
+
+            // Set gender
+            binding.tvGender.text = item.gender?.genderName ?: "NA"
+
+            // Set parent name
+            binding.tvParentName.text = item.patient.parentName ?: "NA"
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        AdolescentViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: AdolescentViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patient: PatientDisplay) -> Unit)? = null
+    ) {
+        fun onClickView(item: PatientDisplay) =
+            clickedView?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitAdapter.kt
index caf7ad7d9..65c0eff3c 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitAdapter.kt
@@ -15,7 +15,7 @@ class AncVisitAdapter(private val clickListener: AncVisitClickListener) :
     private object MyDiffUtilCallBack : DiffUtil.ItemCallback<PregnantWomanAncCache>() {
         override fun areItemsTheSame(
             oldItem: PregnantWomanAncCache, newItem: PregnantWomanAncCache
-        ) = oldItem.patientID == newItem.patientID
+        ) = oldItem.patientID == newItem.patientID && oldItem.visitNumber == newItem.visitNumber
 
         override fun areContentsTheSame(
             oldItem: PregnantWomanAncCache, newItem: PregnantWomanAncCache
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitBottomSheetAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitBottomSheetAdapter.kt
new file mode 100644
index 000000000..9ecbd5396
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/AncVisitBottomSheetAdapter.kt
@@ -0,0 +1,135 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.RvItemAncVisitSimpleBinding
+import org.piramalswasthya.cho.helpers.Konstants
+import org.piramalswasthya.cho.helpers.getWeeksOfPregnancy
+import org.piramalswasthya.cho.helpers.getTodayMillis
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import java.text.SimpleDateFormat
+import java.util.*
+
+class AncVisitBottomSheetAdapter(
+    private val clickListener: AncVisitClickListener
+) : ListAdapter<PregnantWomanAncCache, AncVisitBottomSheetAdapter.AncVisitViewHolder>(AncVisitDiffCallback()) {
+
+    private var lmpDate: Long = 0L
+    private var allAncVisits: List<PregnantWomanAncCache> = emptyList()
+
+    fun updateData(visits: List<PregnantWomanAncCache>, lmpDate: Long) {
+        this.lmpDate = lmpDate
+        this.allAncVisits = visits
+        submitList(visits)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AncVisitViewHolder {
+        return AncVisitViewHolder.from(parent)
+    }
+
+    override fun onBindViewHolder(holder: AncVisitViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener, lmpDate, allAncVisits)
+    }
+
+    class AncVisitViewHolder private constructor(
+        private val binding: RvItemAncVisitSimpleBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(
+            item: PregnantWomanAncCache, 
+            clickListener: AncVisitClickListener,
+            lmpDate: Long,
+            allAncVisits: List<PregnantWomanAncCache>
+        ) {
+            val res = binding.root.context.resources
+            binding.tvVisitTitle.text = res.getString(R.string.anc_visit_number_format, item.visitNumber)
+
+            // Format date
+            val dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.getDefault())
+            val dateText = if (item.ancDate != null) {
+                dateFormat.format(Date(item.ancDate))
+            } else {
+                res.getString(R.string.not_scheduled)
+            }
+
+            // Calculate gestational age
+            val gaWeeks = getWeeksOfPregnancy(getTodayMillis(), lmpDate)
+
+            // Check if completed (weight is filled)
+            val isCompleted = item.weight != null
+
+            if (isCompleted) {
+                // COMPLETED
+                binding.tvVisitDate.text = res.getString(R.string.completed_with_date, dateText)
+                binding.tvVisitStatus.text = res.getString(R.string.completed_status)
+                binding.tvVisitStatus.setTextColor(binding.root.context.getColor(android.R.color.holo_green_dark))
+            } else {
+                // Check if DUE based on GA and previous visit completion
+                val isDue = when (item.visitNumber) {
+                    1 -> {
+                        // ANC 1: GA ≤12 weeks
+                        gaWeeks <= Konstants.maxAnc1Week
+                    }
+                    2 -> {
+                        // ANC 2: ANC 1 completed AND GA ≥14 weeks AND <28 weeks
+                        val anc1Completed = allAncVisits.any { it.visitNumber == 1 && it.weight != null }
+                        anc1Completed && gaWeeks >= Konstants.minAnc2Week && gaWeeks < 28
+                    }
+                    3 -> {
+                        // ANC 3: ANC 2 completed AND GA ≥28 weeks AND <36 weeks
+                        val anc2Completed = allAncVisits.any { it.visitNumber == 2 && it.weight != null }
+                        anc2Completed && gaWeeks >= Konstants.minAnc3Week && gaWeeks < 36
+                    }
+                    4 -> {
+                        // ANC 4: ANC 3 completed AND GA ≥36 weeks AND ≤40 weeks
+                        val anc3Completed = allAncVisits.any { it.visitNumber == 3 && it.weight != null }
+                        anc3Completed && gaWeeks >= Konstants.minAnc4Week && gaWeeks <= Konstants.maxAnc4Week
+                    }
+                    else -> false
+                }
+                
+                if (isDue) {
+                    // DUE
+                    binding.tvVisitDate.text = res.getString(R.string.scheduled_ga_format, dateText, gaWeeks)
+                    binding.tvVisitStatus.text = res.getString(R.string.due_status)
+                    binding.tvVisitStatus.setTextColor(binding.root.context.getColor(android.R.color.holo_orange_dark))
+                } else {
+                    // PENDING (not yet due)
+                    binding.tvVisitDate.text = res.getString(R.string.scheduled_ga_format, dateText, gaWeeks)
+                    binding.tvVisitStatus.text = res.getString(R.string.pending_status)
+                    binding.tvVisitStatus.setTextColor(binding.root.context.getColor(android.R.color.darker_gray))
+                }
+            }
+            
+            binding.root.setOnClickListener {
+                clickListener.onClick(item)
+            }
+        }
+
+        companion object {
+            fun from(parent: ViewGroup): AncVisitViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemAncVisitSimpleBinding.inflate(layoutInflater, parent, false)
+                return AncVisitViewHolder(binding)
+            }
+        }
+    }
+
+    class AncVisitClickListener(val clickListener: (ancVisit: PregnantWomanAncCache) -> Unit) {
+        fun onClick(ancVisit: PregnantWomanAncCache) = clickListener(ancVisit)
+    }
+}
+
+class AncVisitDiffCallback : DiffUtil.ItemCallback<PregnantWomanAncCache>() {
+    override fun areItemsTheSame(oldItem: PregnantWomanAncCache, newItem: PregnantWomanAncCache): Boolean {
+        return oldItem.id == newItem.id
+    }
+
+    override fun areContentsTheSame(oldItem: PregnantWomanAncCache, newItem: PregnantWomanAncCache): Boolean {
+        return oldItem == newItem
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ApiSearchAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ApiSearchAdapter.kt
index 34aa953b3..3e2bcad71 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/ApiSearchAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ApiSearchAdapter.kt
@@ -54,7 +54,7 @@ class ApiSearchAdapter(
             tvBenId.text = "Beneficiary ID: ${info.patient.beneficiaryID ?: "NA"}"
             tvGender.text = "Gender: ${info.genderName ?: "NA"}"
             tvAge.text = "Age: ${info.patient.age ?: "NA"}"
-            tvMobile.text = "Mobile No.: ${info.patient.phoneNo ?: "NA"}"
+            tvMobile.text = "Mob No.: ${info.patient.phoneNo ?: "NA"}"
 
         }
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/CHOCaseRecordItemAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/CHOCaseRecordItemAdapter.kt
index 97f6f98f5..abcedb8db 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/CHOCaseRecordItemAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/CHOCaseRecordItemAdapter.kt
@@ -58,7 +58,12 @@ class CHOCaseRecordItemAdapter(
             )
 
             binding.visitNumber.text = item.benVisitNo?.toString() ?: ""
-            binding.visitDate.text = DateTimeUtil.formatedDate(benFlow?.visitDate)
+            val visitDateText = if (!benFlow?.visitDate.isNullOrBlank()) {
+                DateTimeUtil.formatedDate(benFlow?.visitDate)
+            } else {
+                item.visitDate?.let { DateTimeUtil.formatDate(it) } ?: "N/A"
+            }
+            binding.visitDate.text = visitDateText
 
             binding.executePendingBindings()
         }
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ChiefComplaintMultiAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ChiefComplaintMultiAdapter.kt
index bc26b054e..648eb2913 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/ChiefComplaintMultiAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ChiefComplaintMultiAdapter.kt
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.textfield.TextInputEditText
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.model.ChiefComplaintDB
+import org.piramalswasthya.cho.utils.MasterDataLocalizer
 
 class ChiefComplaintMultiAdapter(
     private val chiefComplaints: List<ChiefComplaintDB>,
@@ -38,20 +39,22 @@ class ChiefComplaintMultiAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val chiefComplaint = chiefComplaints[position]
+        val ctx = holder.itemView.context
 
         holder.oldLayout.visibility = if (layoutVariant == null) View.VISIBLE else View.GONE
         holder.newLayout.visibility = if (layoutVariant == null) View.GONE else View.VISIBLE
 
-        holder.chiefComplaintName.setText(chiefComplaint.chiefComplaint)
-        holder.durationInput.setText(chiefComplaint.duration)
-        holder.durationUnitInput.setText(chiefComplaint.durationUnit)
+        val localizedChiefComplaint =
+            MasterDataLocalizer.localizeChiefComplaint(ctx, chiefComplaint.chiefComplaint)
+        val localizedDurationUnit =
+            MasterDataLocalizer.localizeDurationUnit(ctx, chiefComplaint.durationUnit)
 
-        holder.chiefComplaintName.setText(chiefComplaint.chiefComplaint)
+        holder.chiefComplaintName.setText(localizedChiefComplaint)
         holder.durationInput.setText(chiefComplaint.duration)
-        holder.durationUnitInput.setText(chiefComplaint.durationUnit)
+        holder.durationUnitInput.setText(localizedDurationUnit)
 
-        holder.tvChiefComplaint.text = chiefComplaint.chiefComplaint
-        holder.tvDurationValue.text = "${chiefComplaint.duration} ${chiefComplaint.durationUnit}"
+        holder.tvChiefComplaint.text = localizedChiefComplaint
+        holder.tvDurationValue.text = "${chiefComplaint.duration} $localizedDurationUnit"
         holder.tvDescription.text = chiefComplaint.description
 
         // Add a TextWatcher to update the duration property when the EditText changes
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ChildRegistrationAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ChildRegistrationAdapter.kt
new file mode 100644
index 000000000..f50f77632
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ChildRegistrationAdapter.kt
@@ -0,0 +1,97 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.RvItemChildRegBinding
+import org.piramalswasthya.cho.model.ChildRegDomain
+import org.piramalswasthya.cho.utils.DateTimeUtil
+
+class ChildRegistrationAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<ChildRegDomain, ChildRegistrationAdapter.ChildViewHolder>(
+    ChildDiffUtilCallBack
+) {
+
+    private object ChildDiffUtilCallBack : DiffUtil.ItemCallback<ChildRegDomain>() {
+        override fun areItemsTheSame(
+            oldItem: ChildRegDomain,
+            newItem: ChildRegDomain
+        ) = oldItem.motherPatient.patientID == newItem.motherPatient.patientID && 
+                oldItem.infant.babyIndex == newItem.infant.babyIndex
+
+        override fun areContentsTheSame(
+            oldItem: ChildRegDomain,
+            newItem: ChildRegDomain
+        ) = oldItem == newItem
+    }
+
+    class ChildViewHolder private constructor(
+        private val binding: RvItemChildRegBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): ChildViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemChildRegBinding.inflate(layoutInflater, parent, false)
+                return ChildViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: ChildRegDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.item = item
+            binding.clickListener = clickListener ?: ClickListener(null)
+
+            // Set infant name
+            binding.tvBabyName.text = item.customName
+
+            // Set button text and color based on child registration status
+            val isChildRegistered = item.isChildRegistered()
+            binding.btnAction.text = binding.root.context.getString(
+                if (isChildRegistered) R.string.view else R.string.register
+            )
+            binding.btnAction.setBackgroundColor(
+                binding.root.resources.getColor(
+                    if (isChildRegistered) android.R.color.holo_green_dark 
+                    else android.R.color.holo_red_dark,
+                    null
+                )
+            )
+
+            // Set age
+            item.childPatient?.dob?.let {
+                binding.tvAge.text = DateTimeUtil.calculateAgeString(it).ifBlank { "0 days" }
+            } ?: run {
+                binding.tvAge.text = "NA"
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        ChildViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: ChildViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedForm: ((patientID: String, babyIndex: Int, childPatientID: String?) -> Unit)? = null
+    ) {
+        fun onClickForm(item: ChildRegDomain) =
+            clickedForm?.let {
+                it(
+                    item.motherPatient.patientID, 
+                    item.infant.babyIndex,
+                    item.childPatient?.patientID
+                )
+            }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/DeliveryOutcomeAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/DeliveryOutcomeAdapter.kt
new file mode 100644
index 000000000..fa5f1d3ad
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/DeliveryOutcomeAdapter.kt
@@ -0,0 +1,79 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemDeliveryOutcomeBinding
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.utils.DateTimeUtil
+
+class DeliveryOutcomeAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientWithPwrDomain, DeliveryOutcomeAdapter.DeliveryOutcomeViewHolder>(
+    DeliveryOutcomeDiffUtilCallBack
+) {
+
+    private object DeliveryOutcomeDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithPwrDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem == newItem
+    }
+
+    class DeliveryOutcomeViewHolder private constructor(
+        private val binding: RvItemDeliveryOutcomeBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): DeliveryOutcomeViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemDeliveryOutcomeBinding.inflate(layoutInflater, parent, false)
+                return DeliveryOutcomeViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithPwrDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.patientWithPwr = item
+            binding.clickListener = clickListener
+
+            // Set age
+            item.patient.dob?.let {
+                binding.tvAge.text = DateTimeUtil.calculateAgeString(it)
+            } ?: run {
+                binding.tvAge.text = "NA"
+            }
+
+            // Set LMP date
+            binding.tvLmp.text = item.getFormattedLMPDate()
+
+            // Set EDD
+            binding.tvEdd.text = item.getFormattedEDD()
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        DeliveryOutcomeViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: DeliveryOutcomeViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null
+    ) {
+        fun onClickView(item: PatientWithPwrDomain) =
+            clickedView?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/DiagnosisAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/DiagnosisAdapter.kt
index de8f543ef..1d7598f35 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/DiagnosisAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/DiagnosisAdapter.kt
@@ -107,7 +107,13 @@ override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         itemChangeListener.onItemChanged()
     }
 
-    if (isVisitDetail == true && isFollowupVisit == false){
+    // When already filled (read-only): only show rows that have data; when editable show all rows
+    val isCaseReadOnly = isVisitDetail == true && isFollowupVisit == false
+    val isRowReadOnly = isCaseReadOnly || itemData.isPreFilled
+    val hasData = itemData.diagnosis.isNotBlank()
+    holder.itemView.visibility = if (isCaseReadOnly && !hasData) View.GONE else View.VISIBLE
+
+    if (isRowReadOnly) {
         holder.resetButton.isVisible = false
         holder.cancelButton.isVisible = false
         holder.diagnosisInput.isClickable = false
@@ -118,6 +124,16 @@ override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.diagnosisInpuTextt.defaultHintTextColor = ColorStateList.valueOf(
             ContextCompat.getColor(mContext, R.color.disable_field_hint_color)
         )
+    } else {
+        holder.resetButton.isVisible = true
+        holder.cancelButton.isVisible = true
+        holder.diagnosisInput.isClickable = true
+        holder.diagnosisInput.isFocusable = true
+        holder.diagnosisInpuTextt.boxBackgroundColor =
+            ContextCompat.getColor(mContext, R.color.white)
+        holder.diagnosisInpuTextt.defaultHintTextColor = ColorStateList.valueOf(
+            ContextCompat.getColor(mContext, R.color.primaryTextColor)
+        )
     }
 
     // Update the visibility of the "Cancel" button for all items
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ECRegistrationAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ECRegistrationAdapter.kt
new file mode 100644
index 000000000..89111fd15
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ECRegistrationAdapter.kt
@@ -0,0 +1,108 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemPatientEcWithFormBinding
+import org.piramalswasthya.cho.model.PatientWithEcrDomain
+import java.util.concurrent.TimeUnit
+
+class ECRegistrationAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientWithEcrDomain, ECRegistrationAdapter.PatientViewHolder>(PatientDiffUtilCallBack) {
+
+    private object PatientDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithEcrDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithEcrDomain,
+            newItem: PatientWithEcrDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithEcrDomain,
+            newItem: PatientWithEcrDomain
+        ) = oldItem == newItem &&
+                oldItem.lastVisitDate == newItem.lastVisitDate &&
+                oldItem.methodOfContraception == newItem.methodOfContraception &&
+                oldItem.antraNextDueDate == newItem.antraNextDueDate &&
+                oldItem.antraInjectionDate == newItem.antraInjectionDate &&
+                oldItem.lmpDateFromTracking == newItem.lmpDateFromTracking
+    }
+
+    class PatientViewHolder private constructor(
+        private val binding: RvItemPatientEcWithFormBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): PatientViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemPatientEcWithFormBinding.inflate(layoutInflater, parent, false)
+                return PatientViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithEcrDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.patientWithEcr = item
+            binding.clickListener = clickListener
+            binding.ivCall.setOnClickListener {
+                clickListener?.onClickCall(item)
+            }
+
+            // Always show LMP and Status layout blocks
+            binding.llLmpDate.visibility = View.VISIBLE
+
+            val lmpDate = item.ecr?.lmpDate ?: item.lmpDateFromTracking
+            if (lmpDate != null && lmpDate > 0L) {
+                val daysSinceLMP = TimeUnit.MILLISECONDS.toDays(
+                    System.currentTimeMillis() - lmpDate
+                )
+                binding.ivMissState.visibility = if (daysSinceLMP > 35) View.VISIBLE else View.GONE
+            } else {
+                binding.ivMissState.visibility = View.GONE
+            }
+
+            // Show Last Visit Date if available
+            binding.llLastVisitDate.visibility = if (item.lastVisitDate != null && item.lastVisitDate!! > 0L) {
+                View.VISIBLE
+            } else {
+                View.INVISIBLE
+            }
+
+            // Show ANTRA details if selected
+            binding.llAntraDetails.visibility = if (item.methodOfContraception == "ANTRA Injection") {
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        PatientViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: PatientViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val onAddVisit: ((patientWithEcr: PatientWithEcrDomain) -> Unit)? = null,
+        private val onViewVisit: ((patientWithEcr: PatientWithEcrDomain) -> Unit)? = null,
+        private val onCall: ((patientWithEcr: PatientWithEcrDomain) -> Unit)? = null
+    ) {
+        fun onAddVisit(item: PatientWithEcrDomain) =
+            onAddVisit?.let { it(item) }
+
+        fun onViewVisit(item: PatientWithEcrDomain) =
+            onViewVisit?.let { it(item) }
+
+        fun onClickCall(item: PatientWithEcrDomain) =
+            onCall?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ECTrackingAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ECTrackingAdapter.kt
index c2908a84d..75ef19573 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/ECTrackingAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ECTrackingAdapter.kt
@@ -39,6 +39,11 @@ class ECTrackingAdapter(private val clickListener: ECTrackViewClickListener) :
             binding.visit = item
             binding.filledOnString = EligibleCoupleTrackingCache.getECTFilledDateFromLong(item.visitDate)
             binding.clickListener = clickListener
+            binding.llAntraDetails.visibility = if (item.antraInjectionDate != null || item.antraDueDate != null) {
+                android.view.View.VISIBLE
+            } else {
+                android.view.View.GONE
+            }
             binding.executePendingBindings()
 
         }
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/FormInputAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/FormInputAdapter.kt
index 111408856..ce7d2558b 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/FormInputAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/FormInputAdapter.kt
@@ -2,8 +2,8 @@ package org.piramalswasthya.cho.adapter
 
 import android.app.DatePickerDialog
 import android.app.TimePickerDialog
-import android.content.Context.INPUT_METHOD_SERVICE
 import android.content.res.ColorStateList
+import android.content.Context.INPUT_METHOD_SERVICE
 import android.content.res.Resources
 import android.graphics.Color
 import android.os.Build
@@ -18,7 +18,6 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.CheckBox
 import android.widget.LinearLayout
 import android.widget.RadioButton
@@ -40,8 +39,14 @@ import org.piramalswasthya.cho.databinding.RvItemFormRadioV2Binding
 import org.piramalswasthya.cho.databinding.RvItemFormTextViewV2Binding
 import org.piramalswasthya.cho.databinding.RvItemFormTimepickerV2Binding
 import org.piramalswasthya.cho.helpers.Konstants
+import org.piramalswasthya.cho.configuration.Dataset
+import org.piramalswasthya.cho.databinding.LayoutUploadFormBinding
 import org.piramalswasthya.cho.helpers.getDateString
 import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.utils.KeyboardUtils
+import org.piramalswasthya.cho.utils.applySafeDateConstraints
+import org.piramalswasthya.cho.utils.setupDropdownKeyboardHandling
 import org.piramalswasthya.cho.model.InputType.AGE_PICKER
 import org.piramalswasthya.cho.model.InputType.CHECKBOXES
 import org.piramalswasthya.cho.model.InputType.DATE_PICKER
@@ -61,8 +66,12 @@ class FormInputAdapter(
     private val imageClickListener: ImageClickListener? = null,
     private val ageClickListener: AgeClickListener? = null,
     private val formValueListener: FormValueListener? = null,
-    private val isEnabled: Boolean = true
-) : ListAdapter<FormElement, ViewHolder>(FormInputDiffCallBack) {
+    private val isEnabled: Boolean = true,
+    private val selectImageClickListener: SelectUploadImageClickListener? = null,
+    private val viewDocumentListner: ViewDocumentOnClick? = null,
+
+    ) : ListAdapter<FormElement, ViewHolder>(FormInputDiffCallBack) {
+    var disableUpload = false
 
     //    @Inject
 //    lateinit var preferenceDao: PreferenceDao
@@ -73,8 +82,9 @@ class FormInputAdapter(
             oldItem.id == newItem.id
 
         override fun areContentsTheSame(oldItem: FormElement, newItem: FormElement): Boolean {
-            Timber.d("${oldItem.id}   ${oldItem.errorText} ${newItem.errorText}")
-            return oldItem.errorText == newItem.errorText
+            val contentsSame = oldItem.errorText == newItem.errorText && oldItem.value == newItem.value
+            Timber.d("${oldItem.id} errorText: ${oldItem.errorText}==${newItem.errorText}, value: '${oldItem.value}'=='${newItem.value}', same=$contentsSame")
+            return contentsSame
         }
     }
 
@@ -89,19 +99,32 @@ class FormInputAdapter(
             }
         }
 
-        fun bind(item: FormElement, isEnabled: Boolean, formValueListener: FormValueListener?) {
+        fun bind(
+            item: FormElement,
+            isEnabled: Boolean,
+            formValueListener: FormValueListener?,
+            refreshDeliveryOutcomeFields: (() -> Unit)? = null
+        ) {
             Timber.d("binding triggered!!! $isEnabled ${item.id}")
             if (!isEnabled) {
+                binding.et.isEnabled = false
                 binding.et.isClickable = false
                 binding.et.isFocusable = false
+                binding.et.isFocusableInTouchMode = false
+                binding.et.isLongClickable = false
+                binding.et.isCursorVisible = false
                 handleHintLength(item)
                 binding.form = item
                 binding.et.setText(item.value)
                 binding.executePendingBindings()
                 return
             } else {
+                binding.et.isEnabled = true
                 binding.et.isClickable = true
                 binding.et.isFocusable = true
+                binding.et.isFocusableInTouchMode = true
+                binding.et.isLongClickable = true
+                binding.et.isCursorVisible = true
             }
             binding.form = item
             if (item.errorText == null) binding.tilEditText.isErrorEnabled = false
@@ -119,8 +142,14 @@ class FormInputAdapter(
                 binding.tilEditText.setEndIconOnClickListener(null)
             }
 
+            if (!binding.et.hasFocus()) {
+                val currentText = binding.et.text?.toString() ?: ""
+                val itemValue = item.value ?: ""
+                if (currentText != itemValue) {
+                    binding.et.setText(itemValue)
+                }
+            }
 
-            //binding.et.setText(item.value.value)
             val textWatcher = object : TextWatcher {
                 override fun beforeTextChanged(
                     s: CharSequence?, start: Int, count: Int, after: Int
@@ -131,24 +160,33 @@ class FormInputAdapter(
                 }
 
                 override fun afterTextChanged(editable: Editable?) {
-//                    editable?.length?.let {
-//                        if (it > item.etMaxLength) {
-////                            editable.delete(item.etMaxLength + 1, it)
-//                            "This field cannot have more than ${item.etMaxLength} characters".let {
-//                                item.errorText = it
-//                                binding.tilEditText.error = it
-//                            }
-//                            return
-//                        } else
-//                            item.errorText = null
-//                    }
-                    item.value = editable?.toString()
-                    Timber.d("editable : $editable Current value : ${item.value}  isNull: ${item.value == null} isEmpty: ${item.value == ""}")
+                    val textValue = editable?.toString() ?: ""
+                    item.value = textValue
+
+                    val trimmedValue = textValue.trim()
+                    if (trimmedValue.isNotBlank() && item.errorText != null) {
+                        item.errorText = null
+                        binding.tilEditText.isErrorEnabled = false
+                        binding.tilEditText.error = null
+                    }
+
                     formValueListener?.onValueChanged(item, -1)
                     if (item.errorText != binding.tilEditText.error) {
                         binding.tilEditText.isErrorEnabled = item.errorText != null
                         binding.tilEditText.error = item.errorText
                     }
+
+                    // Delivery outcome fields share a cross-field validation rule.
+                    // Rebind the whole trio so sibling error states refresh when the
+                    // last field in the sum is edited. Gated by an explicit opt-in flag
+                    // (NOT the element id) because ids are reused across datasets — id
+                    // 15/16/17 are height/weight/bmi in the PW registration form, and
+                    // rebinding the focused EditText on every keystroke steals focus.
+                    if (item.refreshSiblingsOnChange) {
+                        binding.root.post {
+                            refreshDeliveryOutcomeFields?.invoke()
+                        }
+                    }
 //                        binding.tilEditText.error = null
 //                    else if(item.errorText!= null && binding.tilEditText.error==null)
 //                        binding.tilEditText.error = item.errorText
@@ -237,9 +275,15 @@ class FormInputAdapter(
                 if (hasFocus) binding.et.addTextChangedListener(textWatcher)
                 else {
                     binding.et.removeTextChangedListener(textWatcher)
-                    val imm =
-                        binding.root.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?
-                    imm!!.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
+                    // Use a deterministic hide here. The previous toggleSoftInput()
+                    // call *toggled* the IME, so when a field lost focus while the
+                    // keyboard was already closed (e.g. as the RecyclerView recycles
+                    // EditText rows during a scroll) it would re-open the keyboard
+                    // even though no field was tapped.
+                    KeyboardUtils.hideKeyboard(binding.et)
+//                     val imm =
+//                         binding.root.context.getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager?
+//                     imm?.hideSoftInputFromWindow(binding.et.windowToken, 0)
                 }
             }
             binding.et.setOnKeyListener(View.OnKeyListener { v, keyCode, event ->
@@ -301,8 +345,15 @@ class FormInputAdapter(
                 return
             }
 
+            binding.actvRvDropdown.setupDropdownKeyboardHandling()
+
             binding.actvRvDropdown.setOnItemClickListener { _, _, index, _ ->
                 item.value = item.entries?.get(index)
+                item.booleanValue = when (index) {
+                    item.trueIndex -> true
+                    item.falseIndex -> false
+                    else -> null
+                }
                 Timber.d("Item DD : $item")
 //                if (item.hasDependants || item.hasAlertError) {
                 formValueListener?.onValueChanged(item, index)
@@ -330,10 +381,8 @@ class FormInputAdapter(
         fun bind(
             item: FormElement, isEnabled: Boolean, formValueListener: FormValueListener?
         ) {
-            if (!isEnabled) {
-                binding.rg.isClickable = false
-                binding.rg.isFocusable = false
-            }
+            binding.rg.isClickable = isEnabled
+            binding.rg.isFocusable = isEnabled
 //            binding.rg.isEnabled = isEnabled
             binding.invalidateAll()
             binding.form = item
@@ -344,49 +393,37 @@ class FormInputAdapter(
                 item.entries?.let { items ->
                     orientation = item.orientation ?: LinearLayout.HORIZONTAL
                     weightSum = items.size.toFloat()
+                    val isHorizontal = orientation == LinearLayout.HORIZONTAL
                     items.forEach {
                         val rdBtn = RadioButton(this.context)
                         rdBtn.layoutParams = RadioGroup.LayoutParams(
-                            RadioGroup.LayoutParams.WRAP_CONTENT,
+                            if (isHorizontal) 0 else RadioGroup.LayoutParams.MATCH_PARENT,
                             RadioGroup.LayoutParams.WRAP_CONTENT,
                             1.0F
                         ).apply {
                             gravity = Gravity.CENTER_HORIZONTAL
                         }
                         rdBtn.id = View.generateViewId()
-                        val colorStateList = ColorStateList(
-                            arrayOf<IntArray>(
-                                intArrayOf(-android.R.attr.state_checked),
-                                intArrayOf(android.R.attr.state_checked)
-                            ), intArrayOf(
-                                binding.root.resources.getColor(
-                                    android.R.color.darker_gray,
-                                    binding.root.context.theme
-                                ),  // disabled
-                                binding.root.resources.getColor(
-                                    android.R.color.darker_gray,
-                                    binding.root.context.theme
-                                ) // enabled
-                            )
-                        )
-
-                        if (!isEnabled) rdBtn.buttonTintList = colorStateList
                         rdBtn.text = it
                         addView(rdBtn)
                         if (item.value == it) rdBtn.isChecked = true
+                        rdBtn.setOnClickListener {
+                            KeyboardUtils.hideKeyboard(binding.root)
+                            KeyboardUtils.hideKeyboardFromActivity(binding.root.context)
+                            binding.rg.clearFocus()
+                        }
                         rdBtn.setOnCheckedChangeListener { _, b ->
                             if (b) {
                                 item.value = it
+                                val index = item.entries!!.indexOf(it)
+                                item.booleanValue = when (index) {
+                                    item.trueIndex -> true
+                                    item.falseIndex -> false
+                                    else -> null
+                                }
                                 if (item.hasDependants || item.hasAlertError) {
-                                    Timber.d(
-                                        "listener trigger : ${item.id} ${
-                                            item.entries!!.indexOf(
-                                                it
-                                            )
-                                        } $it"
-                                    )
                                     formValueListener?.onValueChanged(
-                                        item, item.entries!!.indexOf(it)
+                                        item, index
                                     )
                                 }
                             }
@@ -408,7 +445,11 @@ class FormInputAdapter(
             if (!isEnabled) {
                 binding.rg.children.forEach {
                     it.isClickable = false
+                    it.isFocusable = false
+                    it.isEnabled = true
                 }
+            } else {
+                binding.rg.isEnabled = true
             }
             if (item.errorText != null) binding.llContent.setBackgroundResource(R.drawable.state_errored)
             else binding.llContent.setBackgroundResource(0)
@@ -464,6 +505,11 @@ class FormInputAdapter(
 
             if (item.errorText != null) binding.clRi.setBackgroundResource(R.drawable.state_errored)
             else binding.clRi.setBackgroundResource(0)
+            // Clear listeners before removing views to prevent false unchecked callbacks
+            // that would strip values from item.value during rebind
+            for (i in 0 until binding.llChecks.childCount) {
+                (binding.llChecks.getChildAt(i) as? CheckBox)?.setOnCheckedChangeListener(null)
+            }
             binding.llChecks.removeAllViews()
             binding.llChecks.apply {
                 item.entries?.let { items ->
@@ -476,10 +522,6 @@ class FormInputAdapter(
                             RadioGroup.LayoutParams.WRAP_CONTENT,
                             1.0F
                         )
-                        if (!isEnabled) {
-                            cbx.isClickable = false
-                            cbx.isFocusable = false
-                        }
                         cbx.id = View.generateViewId()
                         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) cbx.setTextAppearance(
                             context, android.R.style.TextAppearance_Material_Medium
@@ -487,10 +529,20 @@ class FormInputAdapter(
                         else cbx.setTextAppearance(android.R.style.TextAppearance_Material_Subhead)
                         cbx.text = it
                         addView(cbx)
-                        if (item.value?.contains(it) == true) cbx.isChecked = true
+                        if (item.value?.split(",")?.any { s -> s.trim() == it } == true) cbx.isChecked = true
+                        cbx.setOnClickListener {
+                            KeyboardUtils.hideKeyboard(binding.root)
+                            KeyboardUtils.hideKeyboardFromActivity(binding.root.context)
+                            binding.llChecks.clearFocus()
+                        }
+                        if (!isEnabled) {
+                            cbx.isClickable = false
+                            cbx.isFocusable = false
+                            cbx.isEnabled = true
+                        }
                         cbx.setOnCheckedChangeListener { _, b ->
                             if (b) {
-                                if (item.value != null) item.value = item.value + it
+                                if (item.value != null && item.value!!.isNotEmpty()) item.value = item.value + "," + it
                                 else item.value = it
                                 if (item.hasDependants || item.hasAlertError) {
                                     Timber.d(
@@ -506,11 +558,11 @@ class FormInputAdapter(
                                 }
                             } else {
                                 if (item.value?.contains(it) == true) {
-                                    item.value = item.value?.replace(it, "")
+                                    item.value = item.value!!.split(",").filter { s -> s.trim() != it }.joinToString(",").trim().takeIf { str -> str.isNotEmpty() } ?: null
                                 }
                             }
                             formValueListener?.onValueChanged(
-                                item, index * (if (b) 1 else -1)
+                                item, (index + 1) * (if (b) 1 else -1)
                             )
                             if (item.value.isNullOrBlank()) {
                                 item.value = null
@@ -546,8 +598,11 @@ class FormInputAdapter(
             binding.form = item
             binding.invalidateAll()
             if (!isEnabled) {
+                binding.et.isEnabled = false
                 binding.et.isFocusable = false
                 binding.et.isClickable = false
+                binding.et.isFocusableInTouchMode = false
+                binding.et.isLongClickable = false
                 binding.executePendingBindings()
                 return
             }
@@ -559,10 +614,19 @@ class FormInputAdapter(
             item.errorText?.also { binding.tilEditText.error = it }
                 ?: run { binding.tilEditText.error = null }
             binding.et.setOnClickListener {
+                KeyboardUtils.hideKeyboard(binding.et)
+                KeyboardUtils.hideKeyboardFromActivity(binding.root.context)
+
                 item.value?.let { value ->
-                    thisYear = value.substring(6).toInt()
-                    thisMonth = value.substring(3, 5).trim().toInt() - 1
-                    thisDay = value.substring(0, 2).trim().toInt()
+                    val parts = value.split("[-/]".toRegex())
+                    if (parts.size >= 3) {
+                        thisDay = parts[0].trim().toIntOrNull() ?: thisDay
+                        thisMonth = (parts[1].trim().toIntOrNull() ?: (thisMonth + 1)) - 1
+                        thisYear = parts[2].trim().toIntOrNull() ?: thisYear
+                    }
+                }
+                val formatDate: (Long) -> String? = { millis ->
+                    item.dateFormat?.let { Dataset.getDateFromLong(millis, it) } ?: getDateString(millis)
                 }
                 val datePickerDialog = DatePickerDialog(
                     it.context, { _, year, month, day ->
@@ -571,21 +635,18 @@ class FormInputAdapter(
                             set(Calendar.MONTH, month)
                             set(Calendar.DAY_OF_MONTH, day)
                         }.timeInMillis
-                        if (item.min != null && millis < item.min!!) {
-                            item.value = getDateString(item.min)
-                        } else if (item.max != null && millis > item.max!!)
-                            item.value = getDateString(item.max)
-                        else
-                            item.value = getDateString(millis)
-//                            "${if (day > 9) day else "0$day"}-${if (month > 8) month + 1 else "0${month + 1}"}-$year"
+                        item.value = when {
+                            item.min != null && millis < item.min!! -> formatDate(item.min!!)
+                            item.max != null && millis > item.max!! -> formatDate(item.max!!)
+                            else -> formatDate(millis)
+                        }
                         binding.invalidateAll()
                         if (item.hasDependants) formValueListener?.onValueChanged(item, -1)
                     }, thisYear, thisMonth, thisDay
                 )
                 item.errorText = null
                 binding.tilEditText.error = null
-                datePickerDialog.datePicker.maxDate = item.max ?: 0
-                datePickerDialog.datePicker.minDate = item.min ?: 0
+                datePickerDialog.datePicker.applySafeDateConstraints(item.min, item.max)
                 if (item.showYearFirstInDatePicker)
                     datePickerDialog.datePicker.touchables[0].performClick()
                 datePickerDialog.show()
@@ -611,22 +672,69 @@ class FormInputAdapter(
             binding.form = item
             binding.et.isEnabled = isEnabled
             binding.et.setOnClickListener {
+                KeyboardUtils.hideKeyboard(binding.et)
+                KeyboardUtils.hideKeyboardFromActivity(binding.root.context)
+
                 val hour: Int
+                val hourOfDay: Int  // 24-hour format (0-23) for TimePickerDialog
                 val minute: Int
                 if (item.value == null) {
                     val currentTime = Calendar.getInstance()
-                    hour = currentTime.get(Calendar.HOUR_OF_DAY)
+                    hourOfDay = currentTime.get(Calendar.HOUR_OF_DAY)
                     minute = currentTime.get(Calendar.MINUTE)
                 } else {
-                    hour = item.value!!.substringBefore(":").toInt()
-                    minute = item.value!!.substringAfter(":").toInt()
-                    Timber.d("Time picker hour min : $hour $minute")
+                    // Parse existing time value (handle both 12-hour with AM/PM and 24-hour formats)
+                    val timeValue = item.value!!
+                    val timeParts = timeValue.split(":")
+                    if (timeParts.size >= 2) {
+                        val hourStr = timeParts[0].trim()
+                        val minuteAndAmPm = timeParts[1].trim()
+                        val minuteStr = minuteAndAmPm.substringBefore(" ").trim()
+
+                        val parsedHour = hourStr.toIntOrNull() ?: 0
+                        val hasAmPm = timeValue.contains("AM", ignoreCase = true) ||
+                                timeValue.contains("PM", ignoreCase = true) ||
+                                timeValue.contains("am", ignoreCase = true) ||
+                                timeValue.contains("pm", ignoreCase = true)
+
+                        if (hasAmPm) {
+                            // Already in 12-hour format with AM/PM - convert to 24-hour format
+                            val isPM = timeValue.contains("PM", ignoreCase = true) ||
+                                    timeValue.contains("pm", ignoreCase = true)
+                            hourOfDay = when {
+                                parsedHour == 12 && !isPM -> 0   // 12 AM = 0:00
+                                parsedHour == 12 && isPM -> 12   // 12 PM = 12:00
+                                isPM -> parsedHour + 12            // PM: add 12
+                                else -> parsedHour                // AM: keep as is (except 12 AM handled above)
+                            }
+                        } else {
+                            // Already in 24-hour format
+                            hourOfDay = parsedHour
+                        }
+                        minute = minuteStr.toIntOrNull() ?: 0
+                        Timber.d("Time picker parsed hourOfDay: $hourOfDay, minute: $minute from value: $timeValue")
+                    } else {
+                        // Fallback to current time if parsing fails
+                        val currentTime = Calendar.getInstance()
+                        hourOfDay = currentTime.get(Calendar.HOUR_OF_DAY)
+                        minute = currentTime.get(Calendar.MINUTE)
+                    }
                 }
-                val mTimePicker = TimePickerDialog(it.context, { _, hourOfDay, minuteOfHour ->
-                    item.value = "$hourOfDay:$minuteOfHour"
+
+                val mTimePicker = TimePickerDialog(it.context, { _, selectedHourOfDay, selectedMinute ->
+                    // Format time in 12-hour format with AM/PM
+                    // selectedHourOfDay is in 24-hour format (0-23) even when dialog is in 12-hour mode
+                    val amPm = if (selectedHourOfDay < 12) "AM" else "PM"
+                    val displayHour = when {
+                        selectedHourOfDay == 0 -> 12
+                        selectedHourOfDay > 12 -> selectedHourOfDay - 12
+                        else -> selectedHourOfDay
+                    }
+                    val formattedMinute = String.format("%02d", selectedMinute)
+                    item.value = "$displayHour:$formattedMinute $amPm"
                     binding.invalidateAll()
 
-                }, hour, minute, false)
+                }, hourOfDay, minute, false)
                 mTimePicker.setTitle("Select Time")
                 mTimePicker.show()
             }
@@ -692,6 +800,11 @@ class FormInputAdapter(
             binding.form = item
             if (isEnabled) {
                 binding.clickListener = clickListener
+                binding.et.setOnClickListener {
+                    KeyboardUtils.hideKeyboard(binding.et)
+                    KeyboardUtils.hideKeyboardFromActivity(binding.root.context)
+                    clickListener?.onAgeClick(item)
+                }
 //                if (item.errorText == null) binding.tilEditText.isErrorEnabled = false
 //                Timber.d("Bound EditText item ${item.title} with ${item.required}")
 //                binding.tilEditText.error = item.errorText
@@ -759,6 +872,7 @@ class FormInputAdapter(
             TIME_PICKER -> TimePickerInputViewHolder.from(parent)
             HEADLINE -> HeadlineViewHolder.from(parent)
             AGE_PICKER -> AgePickerViewInputViewHolder.from(parent)
+            InputType.FILE_UPLOAD -> FileUploadInputViewHolder.from(parent)
         }
     }
 
@@ -767,7 +881,7 @@ class FormInputAdapter(
         val isEnabled = if (isEnabled) item.isEnabled else false
         when (item.inputType) {
             EDIT_TEXT -> (holder as EditTextInputViewHolder).bind(
-                item, isEnabled, formValueListener
+                item, isEnabled, formValueListener, ::refreshDeliveryOutcomeFields
             )
 
             DROPDOWN -> (holder as DropDownInputViewHolder).bind(item, isEnabled, formValueListener)
@@ -786,7 +900,12 @@ class FormInputAdapter(
                 isEnabled,
                 formValueListener
             )
-
+            InputType.FILE_UPLOAD -> (holder as FileUploadInputViewHolder).bind(
+                item,
+                selectImageClickListener,
+                viewDocumentListner,
+                isEnabled = isEnabled && !disableUpload
+            )
             TIME_PICKER -> (holder as TimePickerInputViewHolder).bind(item, isEnabled)
             HEADLINE -> (holder as HeadlineViewHolder).bind(item, formValueListener)
             AGE_PICKER -> (holder as AgePickerViewInputViewHolder).bind(
@@ -797,38 +916,135 @@ class FormInputAdapter(
         }
     }
 
+    class FileUploadInputViewHolder private constructor(private val binding: LayoutUploadFormBinding) :
+        ViewHolder(binding.root) {
+        companion object {
+            fun from(parent: ViewGroup): ViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = LayoutUploadFormBinding.inflate(layoutInflater, parent, false)
+                return FileUploadInputViewHolder(binding)
+            }
+        }
+
+
+        fun bind(
+            item: FormElement,
+            clickListener: SelectUploadImageClickListener?,
+            documentOnClick: ViewDocumentOnClick?,
+            isEnabled: Boolean
+        ) {
+            binding.form = item
+            binding.tvTitle.text = item.title
+            binding.clickListener = clickListener
+            binding.documentclickListener = documentOnClick
+            binding.btnView.visibility =
+                if (item.value != null && documentOnClick != null) View.VISIBLE else View.GONE
+
+            if (isEnabled) {
+                binding.addFile.visibility = View.VISIBLE
+//                binding.addFile.isEnabled = true
+//                binding.addFile.alpha = 1f
+            } else {
+                binding.addFile.visibility = View.GONE
+//                binding.addFile.isEnabled = false
+//                binding.addFile.alpha = 0.5f
+            }
+        }
+
+    }
+
     override fun getItemViewType(position: Int) = getItem(position).inputType.ordinal
 
+    fun refreshDeliveryOutcomeFields() {
+        val startIndex = currentList.indexOfFirst { it.refreshSiblingsOnChange }
+        if (startIndex != -1) {
+            notifyItemRangeChanged(startIndex, 3)
+        }
+    }
+
     /**
      * Validation Result : -1 -> all good
      * else index of element creating trouble
+     * @param recyclerView Optional RecyclerView to sync EditText values before validation
      */
-    fun validateInput(resources: Resources): Int {
-        var retVal = -1
-        if (!isEnabled) return retVal
+    fun validateInput(resources: Resources, recyclerView: androidx.recyclerview.widget.RecyclerView? = null): Int {
+        if (!isEnabled) return -1
+
+        recyclerView?.let { syncAllEditTextValues(it) }
+
+        clearErrorsForValidFields(resources)
+
+        val firstErrorIndex = findFirstFieldWithError()
+        if (firstErrorIndex != -1) return firstErrorIndex
+
+        return validateRequiredFields(resources)
+    }
+
+    private fun clearErrorsForValidFields(resources: Resources) {
+        val requiredError = resources.getString(R.string.form_input_empty_error)
+        currentList.forEachIndexed { index, it ->
+            if (it.inputType != TEXT_VIEW && it.required) {
+                val trimmedValue = it.value?.trim()
+                if (!trimmedValue.isNullOrBlank() && it.errorText == requiredError) {
+                    it.errorText = null
+                    notifyItemChanged(index)
+                }
+            }
+        }
+    }
+
+    private fun findFirstFieldWithError(): Int {
         currentList.forEachIndexed { index, it ->
-            Timber.d("Error text for ${it.title} ${it.errorText}")
             if (it.inputType != TEXT_VIEW && it.errorText != null) {
-                retVal = index
-                return@forEachIndexed
+                return index
             }
         }
-        Timber.d("Validation : $retVal")
-        if (retVal != -1) return retVal
+        return -1
+    }
+
+    private fun validateRequiredFields(resources: Resources): Int {
+        var retVal = -1
         currentList.forEachIndexed { index, it ->
             if (it.inputType != TEXT_VIEW && it.required) {
-                if (it.value.isNullOrBlank()) {
-                    Timber.d("validateInput called for item $it, with index ${index}")
+                val trimmedValue = it.value?.trim()
+                if (trimmedValue.isNullOrBlank()) {
                     it.errorText = resources.getString(R.string.form_input_empty_error)
                     notifyItemChanged(index)
                     if (retVal == -1) retVal = index
                 }
             }
-            /*            if(it.regex!=null){
-                            Timber.d("Regex not null")
-                            retVal= false
-                        }*/
         }
         return retVal
     }
-}
\ No newline at end of file
+
+    class SelectUploadImageClickListener(private val selectImageClick: (formId: Int) -> Unit) {
+
+        fun onSelectImageClick(form: FormElement) = selectImageClick(form.id)
+
+    }
+
+    class ViewDocumentOnClick(private val viewDocument: (formId: Int) -> Unit) {
+
+        fun onViewDocumentClick(form: FormElement) = viewDocument(form.id)
+
+    }
+
+    fun syncAllEditTextValues(recyclerView: androidx.recyclerview.widget.RecyclerView) {
+        for (i in 0 until recyclerView.childCount) {
+            val child = recyclerView.getChildAt(i)
+            val position = recyclerView.getChildAdapterPosition(child)
+            if (position != androidx.recyclerview.widget.RecyclerView.NO_POSITION) {
+                val formElement = getItem(position)
+                if (formElement.inputType == EDIT_TEXT) {
+                    val editText = child.findViewById<android.widget.EditText>(R.id.et)
+                    if (editText != null) {
+                        val currentText = editText.text?.toString() ?: ""
+                        if (currentText != formElement.value) {
+                            formElement.value = currentText
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/IconGridAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/IconGridAdapter.kt
new file mode 100644
index 000000000..6f605f73b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/IconGridAdapter.kt
@@ -0,0 +1,56 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.navigation.NavDirections
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemIconGridBinding
+import org.piramalswasthya.cho.model.Icon
+
+class IconGridAdapter(
+    private val clickListener: GridIconClickListener
+) :
+    ListAdapter<Icon, IconGridAdapter.IconViewHolder>(IconDiffCallback) {
+    object IconDiffCallback : DiffUtil.ItemCallback<Icon>() {
+        override fun areItemsTheSame(oldItem: Icon, newItem: Icon) =
+            oldItem.title == newItem.title
+
+        override fun areContentsTheSame(oldItem: Icon, newItem: Icon) =
+            (oldItem == newItem)
+
+    }
+
+
+    class IconViewHolder private constructor(private val binding: RvItemIconGridBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): IconViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemIconGridBinding.inflate(layoutInflater, parent, false)
+                return IconViewHolder(binding)
+            }
+        }
+
+        fun bind(item: Icon, clickListener: GridIconClickListener) {
+            binding.homeIcon = item
+            binding.clickListener = clickListener
+            binding.executePendingBindings()
+        }
+
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        IconViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: IconViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class GridIconClickListener(val selectedListener: (dest: NavDirections) -> Unit) {
+        fun onClicked(icon: Icon) = selectedListener(icon.navAction)
+
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/InfantListAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/InfantListAdapter.kt
new file mode 100644
index 000000000..bd9e226f4
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/InfantListAdapter.kt
@@ -0,0 +1,114 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemInfantListBinding
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import java.util.concurrent.TimeUnit
+
+class InfantListAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientDisplay, InfantListAdapter.InfantViewHolder>(
+    InfantDiffUtilCallBack
+) {
+
+    private object InfantDiffUtilCallBack : DiffUtil.ItemCallback<PatientDisplay>() {
+        override fun areItemsTheSame(
+            oldItem: PatientDisplay,
+            newItem: PatientDisplay
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientDisplay,
+            newItem: PatientDisplay
+        ) = oldItem == newItem
+    }
+
+    class InfantViewHolder private constructor(
+        private val binding: RvItemInfantListBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): InfantViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemInfantListBinding.inflate(layoutInflater, parent, false)
+                return InfantViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientDisplay,
+            clickListener: ClickListener?
+        ) {
+            binding.patient = item
+            binding.clickListener = clickListener
+
+            // Set infant name
+            val firstName = item.patient.firstName ?: ""
+            val lastName = item.patient.lastName ?: ""
+            binding.tvInfantName.text = if (lastName.isNotEmpty()) {
+                "$firstName $lastName"
+            } else {
+                firstName
+            }
+
+            // Set age
+            item.patient.dob?.let {
+                binding.tvAge.text = DateTimeUtil.calculateAgeString(it)
+            } ?: run {
+                binding.tvAge.text = binding.root.context.getString(org.piramalswasthya.cho.R.string.na)
+            }
+
+            // Set DOB
+            item.patient.dob?.let {
+                binding.tvDob.text = DateTimeUtil.formatDate(it)
+            } ?: run {
+                binding.tvDob.text = binding.root.context.getString(org.piramalswasthya.cho.R.string.na)
+            }
+
+            // Set beneficiary ID
+            binding.tvBeneficiaryId.text = item.patient.beneficiaryID?.toString() ?: "NA"
+
+            // Set phone number
+            binding.tvPhoneNo.text = item.patient.phoneNo ?: "NA"
+
+            // Set gender
+            binding.tvGender.text = item.gender?.genderName ?: "NA"
+
+            // Set parent name
+            binding.tvParentName.text = item.patient.parentName ?: "NA"
+
+            // Set days old (for overdue indicator)
+            item.patient.dob?.let { dob ->
+                val daysOld = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - dob.time)
+                binding.dueIcon.visibility = if (daysOld > 42) {
+                    android.view.View.VISIBLE
+                } else {
+                    android.view.View.GONE
+                }
+            } ?: run {
+                binding.dueIcon.visibility = android.view.View.GONE
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        InfantViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: InfantViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patient: PatientDisplay) -> Unit)? = null
+    ) {
+        fun onClickView(item: PatientDisplay) =
+            clickedView?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/InfantRegistrationAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/InfantRegistrationAdapter.kt
new file mode 100644
index 000000000..86f92360d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/InfantRegistrationAdapter.kt
@@ -0,0 +1,77 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemInfantRegBinding
+import org.piramalswasthya.cho.model.InfantRegDomain
+
+class InfantRegistrationAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<InfantRegDomain, InfantRegistrationAdapter.InfantViewHolder>(
+    InfantDiffUtilCallBack
+) {
+
+    private object InfantDiffUtilCallBack : DiffUtil.ItemCallback<InfantRegDomain>() {
+        override fun areItemsTheSame(
+            oldItem: InfantRegDomain,
+            newItem: InfantRegDomain
+        ) = oldItem.motherPatient.patientID == newItem.motherPatient.patientID && 
+                oldItem.babyIndex == newItem.babyIndex
+
+        override fun areContentsTheSame(
+            oldItem: InfantRegDomain,
+            newItem: InfantRegDomain
+        ) = oldItem == newItem
+    }
+
+    class InfantViewHolder private constructor(
+        private val binding: RvItemInfantRegBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): InfantViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemInfantRegBinding.inflate(layoutInflater, parent, false)
+                return InfantViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: InfantRegDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.item = item
+            binding.clickListener = if (item.isActionEnabled()) clickListener else null
+
+            // Set button color based on registration status (text is bound via app:infantRegActionText)
+            val showRegister = item.shouldShowRegisterAction()
+            binding.btnAction.setBackgroundColor(
+                binding.root.resources.getColor(
+                    if (showRegister) android.R.color.holo_red_dark else android.R.color.holo_green_dark,
+                    null
+                )
+            )
+            binding.btnAction.isEnabled = item.isActionEnabled()
+            binding.btnAction.alpha = if (item.isActionEnabled()) 1f else 0.7f
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        InfantViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: InfantViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedForm: ((patientID: String, babyIndex: Int) -> Unit)? = null
+    ) {
+        fun onClickForm(item: InfantRegDomain) =
+            clickedForm?.let { it(item.motherPatient.patientID, item.babyIndex) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/NeonatalOutcomeAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/NeonatalOutcomeAdapter.kt
new file mode 100644
index 000000000..c923166db
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/NeonatalOutcomeAdapter.kt
@@ -0,0 +1,61 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemNeonatalOutcomeBinding
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+
+class NeonatalOutcomeAdapter(private val clickListener: ClickListener) :
+    ListAdapter<PatientWithPwrDomain, NeonatalOutcomeAdapter.ViewHolder>(
+        NeonatalOutcomeDiffCallback()
+    ) {
+
+    class ViewHolder(private val binding: RvItemNeonatalOutcomeBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+
+        fun bind(patientWithPwr: PatientWithPwrDomain, clickListener: ClickListener) {
+            binding.patientWithPwr = patientWithPwr
+            binding.clickListener = clickListener
+            binding.executePendingBindings()
+        }
+
+        companion object {
+            fun from(parent: ViewGroup): ViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemNeonatalOutcomeBinding.inflate(layoutInflater, parent, false)
+                return ViewHolder(binding)
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder.from(parent)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(val clickListener: (patientWithPwr: PatientWithPwrDomain) -> Unit) {
+        fun onClick(patientWithPwr: PatientWithPwrDomain) = clickListener(patientWithPwr)
+    }
+}
+
+class NeonatalOutcomeDiffCallback : DiffUtil.ItemCallback<PatientWithPwrDomain>() {
+    override fun areItemsTheSame(
+        oldItem: PatientWithPwrDomain,
+        newItem: PatientWithPwrDomain
+    ): Boolean {
+        return oldItem.patient.patientID == newItem.patient.patientID
+    }
+
+    override fun areContentsTheSame(
+        oldItem: PatientWithPwrDomain,
+        newItem: PatientWithPwrDomain
+    ): Boolean {
+        return oldItem == newItem
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PNCMotherAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PNCMotherAdapter.kt
new file mode 100644
index 000000000..35d8f3a3e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PNCMotherAdapter.kt
@@ -0,0 +1,131 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemPncMotherBinding
+import org.piramalswasthya.cho.model.PatientWithPncDomain
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import org.piramalswasthya.cho.repositories.PncRepo
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class PNCMotherAdapter(
+    private val clickListener: ClickListener? = null,
+    private val pncRepo: PncRepo
+) : ListAdapter<PatientWithPncDomain, PNCMotherAdapter.PNCMotherViewHolder>(
+    PNCMotherDiffUtilCallBack
+) {
+
+    private object PNCMotherDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithPncDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithPncDomain,
+            newItem: PatientWithPncDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithPncDomain,
+            newItem: PatientWithPncDomain
+        ) = oldItem == newItem
+    }
+
+    class PNCMotherViewHolder private constructor(
+        private val binding: RvItemPncMotherBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        private var bindJob: Job? = null
+
+        companion object {
+            fun from(parent: ViewGroup): PNCMotherViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemPncMotherBinding.inflate(layoutInflater, parent, false)
+                return PNCMotherViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithPncDomain,
+            clickListener: ClickListener?,
+            pncRepo: PncRepo
+        ) {
+            binding.patientWithPnc = item
+            binding.clickListener = clickListener
+
+            // Set age
+            item.patient.dob?.let {
+                binding.tvAge.text = DateTimeUtil.calculateAgeString(it)
+            } ?: run {
+                binding.tvAge.text = "NA"
+            }
+
+            // Set delivery date
+            binding.tvDeliveryDate.text = item.getFormattedDeliveryDate()
+
+            // Set days since delivery
+            val daysSinceDelivery = item.getDaysSinceDelivery()
+            binding.tvDaysSinceDelivery.text = when {
+                daysSinceDelivery == null -> "NA"
+                daysSinceDelivery > 0 -> "$daysSinceDelivery days"
+                else -> "Today"
+            }
+
+            // Enable/disable Add Visit button based on eligibility
+            bindJob?.cancel()
+            bindJob = CoroutineScope(Dispatchers.Main + SupervisorJob()).launch {
+                val isEnabled = withContext(Dispatchers.IO) {
+                    checkAddVisitEligibility(item, pncRepo)
+                }
+                if (!isActive) return@launch  // ViewHolder may have been recycled
+                binding.btnAddVisit.isEnabled = isEnabled
+                binding.btnAddVisit.alpha = if (isEnabled) 1.0f else 0.5f
+            }
+
+            binding.executePendingBindings()
+        }
+        
+        private suspend fun checkAddVisitEligibility(
+            item: PatientWithPncDomain,
+            pncRepo: PncRepo
+        ): Boolean {
+            // Get last visit number
+            val lastVisitNumber = pncRepo.getLastVisitNumber(item.patient.patientID) ?: 0
+            val availableVisits = listOf(1, 3, 7, 14, 21, 28, 42).filter { it > lastVisitNumber }
+            
+            // No more visits available
+            if (availableVisits.isEmpty()) return false
+            
+            val nextVisitNumber = availableVisits.first()
+            
+            // First visit is always allowed
+            if (lastVisitNumber == 0) return true
+            
+            // For subsequent visits, check days since delivery
+            val daysSinceDelivery = item.getDaysSinceDelivery() ?: return false
+            
+            // Enable button if enough days have elapsed
+            return daysSinceDelivery >= nextVisitNumber
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        PNCMotherViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: PNCMotherViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener, pncRepo)
+    }
+
+    class ClickListener(
+        private val onAddVisit: ((patientWithPnc: PatientWithPncDomain) -> Unit)? = null,
+        private val onViewVisits: ((patientWithPnc: PatientWithPncDomain) -> Unit)? = null
+    ) {
+        fun clickAddVisit(item: PatientWithPncDomain) = onAddVisit?.invoke(item)
+        fun clickViewVisits(item: PatientWithPncDomain) = onViewVisits?.invoke(item)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PatientItemAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PatientItemAdapter.kt
index f50ec10dc..0540d09e4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/PatientItemAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PatientItemAdapter.kt
@@ -1,8 +1,10 @@
 package org.piramalswasthya.cho.adapter
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.os.Build
 import android.util.Log
+import android.util.LruCache
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,32 +13,72 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.databinding.PatientListItemViewBinding
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.network.ESanjeevaniApiService
 import org.piramalswasthya.cho.ui.home.HomeViewModel
-import org.piramalswasthya.cho.utils.Constants.pattern
 import org.piramalswasthya.cho.utils.DateTimeUtil
+import org.piramalswasthya.cho.utils.ImgUtils
 
 class PatientItemAdapter(
     private val apiService: ESanjeevaniApiService,
     var context: Context,
     private val clickListener: BenClickListener,
     private val showAbha: Boolean = false,
+    private val showEditButton: Boolean = false,
 ) : ListAdapter<PatientDisplayWithVisitInfo, PatientItemAdapter.BenViewHolder>(BenDiffUtilCallBack) {
+
+    companion object {
+        // Bitmap cache for beneficiary photos to avoid repeated Base64 decode on scroll/rebind.
+        private val benImageBitmapCache = object : LruCache<String, Bitmap>(6 * 1024) {
+            override fun sizeOf(key: String, value: Bitmap): Int = value.byteCount / 1024
+        }
+    }
+
     private object BenDiffUtilCallBack : DiffUtil.ItemCallback<PatientDisplayWithVisitInfo>() {
+        private fun stableKey(item: PatientDisplayWithVisitInfo): String {
+            return item.patient.beneficiaryID?.toString()
+                ?: "${item.patient.patientID}_${item.benVisitNo ?: -1}"
+        }
+
         override fun areItemsTheSame(
             oldItem: PatientDisplayWithVisitInfo, newItem: PatientDisplayWithVisitInfo
-        ) = oldItem.patient.beneficiaryID == newItem.patient.beneficiaryID
+        ) = stableKey(oldItem) == stableKey(newItem)
 
         override fun areContentsTheSame(
             oldItem: PatientDisplayWithVisitInfo, newItem: PatientDisplayWithVisitInfo
-        ) = oldItem == newItem
+        ): Boolean {
+            val oldPatient = oldItem.patient
+            val newPatient = newItem.patient
+
+            return oldPatient.firstName == newPatient.firstName &&
+                    oldPatient.lastName == newPatient.lastName &&
+                    oldPatient.dob == newPatient.dob &&
+                    oldPatient.phoneNo == newPatient.phoneNo &&
+                    oldPatient.beneficiaryID == newPatient.beneficiaryID &&
+                    oldPatient.syncState == newPatient.syncState &&
+                    oldPatient.healthIdDetails?.healthIdNumber == newPatient.healthIdDetails?.healthIdNumber &&
+                    oldPatient.benImage == newPatient.benImage &&
+                    oldItem.genderName == newItem.genderName &&
+                    oldItem.villageName == newItem.villageName &&
+                    oldItem.visitDate == newItem.visitDate &&
+                    oldItem.referDate == newItem.referDate &&
+                    oldItem.referTo == newItem.referTo &&
+                    oldItem.nurseFlag == newItem.nurseFlag &&
+                    oldItem.doctorFlag == newItem.doctorFlag &&
+                    oldItem.labtechFlag == newItem.labtechFlag &&
+                    oldItem.pharmacist_flag == newItem.pharmacist_flag
+        }
 
     }
 
+    init {
+        setHasStableIds(true)
+    }
+
     class BenViewHolder private constructor(private val binding: PatientListItemViewBinding) :
         RecyclerView.ViewHolder(binding.root) {
         companion object {
@@ -52,20 +94,22 @@ class PatientItemAdapter(
             item: PatientDisplayWithVisitInfo,
             clickListener: BenClickListener?,
             showAbha: Boolean,
+            showEditButton: Boolean,
             mContext: Context
         ) {
             var gender = ""
             binding.benVisitInfo = item
             binding.clickListener = clickListener
             binding.showAbha = showAbha
+            binding.showEditButton = showEditButton
             binding.hasAbha = !item.patient.healthIdDetails?.healthIdNumber.isNullOrEmpty()
 
             val firstName = item.patient.firstName ?: ""
             val lastName = item.patient.lastName ?: ""
             val capitalizedFirstName = firstName.split(" ")
-                .joinToString(" ") { it -> it.replaceFirstChar { it.uppercaseChar() } }
+                .joinToString(" ") { token -> token.replaceFirstChar { it.uppercaseChar() } }
             val capitalizedLastName = lastName.split(" ")
-                .joinToString(" ") { it -> it.replaceFirstChar { it.uppercaseChar() } }
+                .joinToString(" ") { token -> token.replaceFirstChar { it.uppercaseChar() } }
 
             val fullName = "$capitalizedFirstName $capitalizedLastName"
             binding.patientName.text = fullName
@@ -76,54 +120,49 @@ class PatientItemAdapter(
 
             val visitDateText = item.visitDate?.let { DateTimeUtil.formatDate(it) }
             if (visitDateText.isNullOrBlank()) {
-                binding.visitDate.text = "NA"
-                binding.referDate.text = "NA"
+                binding.visitDate.text = ""
+                binding.referDate.text = ""
             } else {
                 binding.visitDate.text = visitDateText
                 binding.referDate.text = visitDateText
             }
-            binding.patientPhoneNo.text = item.patient.phoneNo ?: "NA"
+            binding.patientPhoneNo.text = item.patient.phoneNo
+                ?.takeIf { it.isNotBlank() }
+                ?: mContext.getString(R.string.not_available)
             if (item.villageName.isNullOrBlank()) {
-                binding.village.text = "NA"
+                binding.village.text = ""
             } else binding.village.text = item.villageName
 
             binding.patientGender.text = item.genderName
             gender = item.genderName.toString()
 
-            if (item.patient.dob != null) {
-                val type = DateTimeUtil.getPatientTypeByAge(item.patient.dob!!)
-                if (type == "new_born_baby") {
-                    binding.ivPatientIcon.setImageResource(R.drawable.ic_new_born_baby)
-                } else if (type == "infant") {
-                    binding.ivPatientIcon.setImageResource(R.drawable.ic_infant)
-                } else if (type == "child") {
-                    //male female check
-                    if (gender == "Male") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_boy)
-                    } else if (gender == "Female") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_girl)
+            // Try to load the beneficiary photo first; fall back to age/gender icon if none
+            val benImage = item.patient.benImage
+            if (!benImage.isNullOrEmpty()) {
+                val cacheKey = "${item.patient.patientID}:${benImage.hashCode()}"
+                val cachedBitmap = PatientItemAdapter.benImageBitmapCache.get(cacheKey)
+                if (cachedBitmap != null) {
+                    Glide.with(mContext)
+                        .load(cachedBitmap)
+                        .placeholder(R.drawable.ic_person)
+                        .circleCrop()
+                        .into(binding.ivPatientIcon)
+                } else {
+                    val base64Data = if (benImage.contains(",")) benImage.substringAfter(",") else benImage
+                    val bitmap = ImgUtils.decodeBase64ToBitmap(base64Data)
+                    if (bitmap != null) {
+                        PatientItemAdapter.benImageBitmapCache.put(cacheKey, bitmap)
+                        Glide.with(mContext)
+                            .load(bitmap)
+                            .placeholder(R.drawable.ic_person)
+                            .circleCrop()
+                            .into(binding.ivPatientIcon)
                     } else {
-
-                    }
-
-                } else if (type == "adolescence") {
-                    if (gender == "Male") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_boy)
-                    } else if (gender == "Female") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_girl)
-                    } else {
-
-                    }
-
-                } else if (type == "adult") {
-                    if (gender == "Male") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_male)
-                    } else if (gender == "Female") {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_female)
-                    } else {
-                        binding.ivPatientIcon.setImageResource(R.drawable.ic_unisex)
+                        setDefaultPatientIcon(item.patient.dob, gender, binding)
                     }
                 }
+            } else {
+                setDefaultPatientIcon(item.patient.dob, gender, binding)
             }
 
             if (item.patient.syncState == SyncState.SYNCED) {
@@ -150,23 +189,26 @@ class PatientItemAdapter(
             }
 
 
-            if (item.patient.syncState == SyncState.SYNCED) {
-                //  binding.ivSyncState.visibility = View.VISIBLE
+            // Show BeneficiaryID if it exists, regardless of sync state
+            if (item.patient.beneficiaryID != null) {
                 binding.patientBenId.text = item.patient.beneficiaryID.toString()
                 binding.llBenId.visibility = View.VISIBLE
+            } else {
+                binding.llBenId.visibility = View.GONE
+            }
+
+            if (item.patient.syncState == SyncState.SYNCED ) {
+                //  binding.ivSyncState.visibility = View.VISIBLE
                 binding.btnAbha.isEnabled = true
             } else {
                 binding.btnAbha.isEnabled = false
-                binding.llBenId.visibility = View.GONE
                 //   binding.ivSyncState.visibility = View.GONE
             }
-            /*   Commented as prescription button should not display to user*/
-
-            if(item.doctorFlag == 9){
-                   binding.prescriptionDownloadBtn.visibility = View.VISIBLE
-               }else{
-                   binding.prescriptionDownloadBtn.visibility = View.GONE
-               }
+            // Show prescription download when doctor has submitted (medicine prescribed) or pharmacist has submitted
+            // doctorFlag 2 = submitted with test pending, 3 = post-lab, 9 = submitted without test
+            val showPrescriptionDownload = item.pharmacist_flag == 9 ||
+                    item.doctorFlag == 2 || item.doctorFlag == 3 || item.doctorFlag == 9
+            binding.prescriptionDownloadBtn.visibility = if (showPrescriptionDownload) View.VISIBLE else View.GONE
 
             if (item.referTo != null) {
                 binding.referToLl.visibility = View.VISIBLE
@@ -180,15 +222,40 @@ class PatientItemAdapter(
             binding.executePendingBindings()
 
         }
+
+        private fun setDefaultPatientIcon(dob: java.util.Date?, gender: String, binding: PatientListItemViewBinding) {
+            if (dob != null) {
+                val type = DateTimeUtil.getPatientTypeByAge(dob)
+                when (type) {
+                    "new_born_baby" -> binding.ivPatientIcon.setImageResource(R.drawable.ic_new_born_baby)
+                    "infant" -> binding.ivPatientIcon.setImageResource(R.drawable.ic_infant)
+                    "child", "adolescence" -> {
+                        if (gender == "Male") binding.ivPatientIcon.setImageResource(R.drawable.ic_boy)
+                        else if (gender == "Female") binding.ivPatientIcon.setImageResource(R.drawable.ic_girl)
+                    }
+                    "adult" -> {
+                        if (gender == "Male") binding.ivPatientIcon.setImageResource(R.drawable.ic_male)
+                        else if (gender == "Female") binding.ivPatientIcon.setImageResource(R.drawable.ic_female)
+                        else binding.ivPatientIcon.setImageResource(R.drawable.ic_unisex)
+                    }
+                }
+            }
+        }
     }
 
     override fun onCreateViewHolder(
         parent: ViewGroup, viewType: Int
     ) = BenViewHolder.from(parent)
 
+    override fun getItemId(position: Int): Long {
+        val item = getItem(position)
+        val uniqueKey = "${item.patient.patientID}:${item.benVisitNo ?: -1}"
+        return uniqueKey.hashCode().toLong()
+    }
+
     override fun onBindViewHolder(holder: BenViewHolder, position: Int) {
 //        patientId = getItem(position).patient.patientID
-        holder.bind(getItem(position), clickListener, showAbha, holder.itemView.context)
+        holder.bind(getItem(position), clickListener, showAbha, showEditButton, holder.itemView.context)
 
     }
 
@@ -198,6 +265,7 @@ class PatientItemAdapter(
         private val clickedEsanjeevani: (benVisitInfo: PatientDisplayWithVisitInfo) -> Unit,
         private val clickedDownloadPrescription: (benVisitInfo: PatientDisplayWithVisitInfo) -> Unit,
         private val syncIconButton: (benVisitInfo: PatientDisplayWithVisitInfo) -> Unit,
+        private val clickedEdit: (benVisitInfo: PatientDisplayWithVisitInfo) -> Unit
     ) {
         fun onClickedBen(item: PatientDisplayWithVisitInfo) = clickedBen(
             item,
@@ -219,7 +287,10 @@ class PatientItemAdapter(
         fun onClickSync(item: PatientDisplayWithVisitInfo) {
             syncIconButton(item)
         }
+        fun onClickEdit(item: PatientDisplayWithVisitInfo) {
+            clickedEdit(item)
+        }
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PharmacistItemAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PharmacistItemAdapter.kt
index 5f2c4374c..47e503f88 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/PharmacistItemAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PharmacistItemAdapter.kt
@@ -1,17 +1,15 @@
 package org.piramalswasthya.cho.adapter
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import okhttp3.internal.notifyAll
+import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.databinding.PharmacistListItemViewBinding
 import org.piramalswasthya.cho.model.PrescriptionItemDTO
 import timber.log.Timber
@@ -21,12 +19,13 @@ class PharmacistItemAdapter(
     private val context: Context,
     private var issueType: String,
     private val clickListener: PharmacistClickListener,
+    private val networkAvailabilityCheck: () -> Boolean
 ) : ListAdapter<PrescriptionItemDTO,PharmacistItemAdapter.BenViewHolder>(BenDiffUtilCallBack) {
 
     private object BenDiffUtilCallBack : DiffUtil.ItemCallback<PrescriptionItemDTO>() {
         override fun areItemsTheSame(
             oldItem: PrescriptionItemDTO, newItem: PrescriptionItemDTO
-        ) = oldItem.drugID == newItem.drugID
+        ) = oldItem.id == newItem.id
 
         override fun areContentsTheSame(
             oldItem: PrescriptionItemDTO, newItem: PrescriptionItemDTO
@@ -50,13 +49,17 @@ class PharmacistItemAdapter(
         fun bind(
             item: PrescriptionItemDTO,
             issueType:String,
-            clickListener: PharmacistClickListener
+            clickListener: PharmacistClickListener,
+            networkAvailabilityCheck: () -> Boolean
         ) {
             Timber.d("*******************DAta Prescription DTO************** ",clickListener)
             binding.prescription = item
             binding.clickListener = clickListener
 
-            binding.medicationName.text = (item.genericDrugName + " "+ item.drugStrength)
+            binding.medicationName.text = listOf(
+                item.genericDrugName.trim(),
+                item.drugStrength?.trim().orEmpty()
+            ).filter { it.isNotBlank() }.joinToString(" ")
             binding.formValue.text = (item.drugForm ?: "")
             if(item.duration!=null){
                 binding.durationValue.text = (item.duration ?:"") + " " + (item.durationUnit ?: "")
@@ -65,18 +68,52 @@ class PharmacistItemAdapter(
             binding.doseValue.text = item.dose ?: ""
             binding.quantityPrescribedValue.text = item.qtyPrescribed.toString() ?: ""
             binding.routeValue.text = item.route ?: ""
-            binding.quantityDispensedValue.text = item.qtyPrescribed.toString() ?: ""
-            binding.specialInstructionValue.text = item.dose ?: ""
-            binding.btnViewBatch.text = if (issueType == "Manual Issue") {
-                "Select Batch"
+            val dispensedQty = if (issueType == "Manual Issue") {
+                item.batchList.filter { it.isSelected }.sumOf { it.dispenseQuantity }
             } else {
-                "View Batch"
+//                item.batchList.sumOf { it.qty }
+                item.qtyPrescribed.toString()
             }
-            binding.btnViewBatch.setOnClickListener {
-                if (issueType == "Manual Issue") {
-                    clickListener.onClickSelectBatch(item)
-                } else {
-                    clickListener.onClickViewBatch(item)
+            binding.quantityValue.text = item.batchList.sumOf { it.qty }.toString()
+
+            binding.quantityDispensedValue.text = dispensedQty.toString()
+            binding.specialInstructionValue.text = item.instructions ?: ""
+
+            // Handle button visibility and text based on issue type and network availability
+            when (issueType) {
+                "Manual Issue" -> {
+                    val isNetworkAvailable = networkAvailabilityCheck()
+                    val hasSelectedBatch = item.batchList.any { it.isSelected && it.dispenseQuantity > 0 }
+                    binding.btnViewBatch.text = if (hasSelectedBatch) "Edit Batch" else "Select Batch"
+                    binding.btnViewBatch.visibility = android.view.View.VISIBLE
+                    binding.btnViewBatch.isEnabled = isNetworkAvailable
+                    binding.btnViewBatch.setOnClickListener {
+                        if (isNetworkAvailable) {
+                            clickListener.onClickSelectBatch(item)
+                        } else {
+                            android.widget.Toast.makeText(
+                                binding.root.context,
+                                binding.root.context.getString(R.string.network_required_manual_batch),
+                                android.widget.Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                }
+                "System Issue" -> {
+                    // Hide/comment the view batch button for system issue
+                    binding.btnViewBatch.visibility = android.view.View.GONE
+                    // Alternatively, you can comment out the button functionality:
+                    /*
+                    binding.btnViewBatch.text = "View Batch"
+                    binding.btnViewBatch.visibility = android.view.View.VISIBLE
+                    binding.btnViewBatch.isEnabled = false
+                    binding.btnViewBatch.setOnClickListener {
+                        clickListener.onClickViewBatch(item)
+                    }
+                    */
+                }
+                else -> {
+                    binding.btnViewBatch.visibility = android.view.View.GONE
                 }
             }
             binding.executePendingBindings()
@@ -90,7 +127,7 @@ class PharmacistItemAdapter(
 
     override fun onBindViewHolder(holder: BenViewHolder, position: Int) {
         drugID = getItem(position).drugID.toString()
-        holder.bind(getItem(position), issueType , clickListener)
+        holder.bind(getItem(position), issueType, clickListener, networkAvailabilityCheck)
 
 //        holder.itemView.findViewById<MaterialButton>(R.id.submit_btn).setOnClickListener { // When submit button is clicked
 //            network = isInternetAvailable(context)
@@ -144,4 +181,4 @@ class PharmacistItemAdapter(
         notifyDataSetChanged()  // Refresh UI with updated label
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PmsmaListAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PmsmaListAdapter.kt
new file mode 100644
index 000000000..7bdf74a77
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PmsmaListAdapter.kt
@@ -0,0 +1,66 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemPmsmaBinding
+import org.piramalswasthya.cho.model.PmsmaDomain
+
+class PmsmaListAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PmsmaDomain, PmsmaListAdapter.PmsmaViewHolder>(
+    PmsmaDiffUtilCallBack
+) {
+
+    private object PmsmaDiffUtilCallBack : DiffUtil.ItemCallback<PmsmaDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PmsmaDomain,
+            newItem: PmsmaDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PmsmaDomain,
+            newItem: PmsmaDomain
+        ) = oldItem == newItem
+    }
+
+    class PmsmaViewHolder private constructor(
+        private val binding: RvItemPmsmaBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): PmsmaViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemPmsmaBinding.inflate(layoutInflater, parent, false)
+                return PmsmaViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PmsmaDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.item = item
+            binding.clickListener = clickListener
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        PmsmaViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: PmsmaViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedAdd: ((item: PmsmaDomain) -> Unit)? = null,
+        private val clickedView: ((item: PmsmaDomain) -> Unit)? = null,
+    ) {
+        fun onClickAdd(item: PmsmaDomain) = clickedAdd?.invoke(item)
+        fun onClickView(item: PmsmaDomain) = clickedView?.invoke(item)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PregnantWomenAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PregnantWomenAdapter.kt
new file mode 100644
index 000000000..d797ea0e9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PregnantWomenAdapter.kt
@@ -0,0 +1,80 @@
+package org.piramalswasthya.cho.adapter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.databinding.RvItemPregnantWomanBinding
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+
+class PregnantWomenAdapter(
+    private val clickListener: ClickListener? = null
+) : ListAdapter<PatientWithPwrDomain, PregnantWomenAdapter.PregnantWomanViewHolder>(
+    PregnantWomanDiffUtilCallBack
+) {
+
+    private object PregnantWomanDiffUtilCallBack : DiffUtil.ItemCallback<PatientWithPwrDomain>() {
+        override fun areItemsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem.patient.patientID == newItem.patient.patientID
+
+        override fun areContentsTheSame(
+            oldItem: PatientWithPwrDomain,
+            newItem: PatientWithPwrDomain
+        ) = oldItem == newItem
+    }
+
+    class PregnantWomanViewHolder private constructor(
+        private val binding: RvItemPregnantWomanBinding
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        companion object {
+            fun from(parent: ViewGroup): PregnantWomanViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val binding = RvItemPregnantWomanBinding.inflate(layoutInflater, parent, false)
+                return PregnantWomanViewHolder(binding)
+            }
+        }
+
+        fun bind(
+            item: PatientWithPwrDomain,
+            clickListener: ClickListener?
+        ) {
+            binding.patientWithPwr = item
+            binding.clickListener = clickListener
+
+            // Handle PWR status display (registered or not)
+            if (item.pwr == null || !item.isActive()) {
+                // Not registered or inactive pregnancy
+                binding.btnViewPwr.text = binding.root.context.getString(org.piramalswasthya.cho.R.string.register)
+                binding.btnViewPwr.setBackgroundColor(
+                    binding.root.resources.getColor(android.R.color.holo_red_dark, null)
+                )
+            } else {
+                // Already registered and active
+                binding.btnViewPwr.text = binding.root.context.getString(org.piramalswasthya.cho.R.string.view)
+                binding.btnViewPwr.setBackgroundColor(
+                    binding.root.resources.getColor(android.R.color.holo_green_dark, null)
+                )
+            }
+
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        PregnantWomanViewHolder.from(parent)
+
+    override fun onBindViewHolder(holder: PregnantWomanViewHolder, position: Int) {
+        holder.bind(getItem(position), clickListener)
+    }
+
+    class ClickListener(
+        private val clickedView: ((patientWithPwr: PatientWithPwrDomain) -> Unit)? = null
+    ) {
+        fun onClickView(item: PatientWithPwrDomain) =
+            clickedView?.let { it(item) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/PrescriptionAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/PrescriptionAdapter.kt
index ead62d905..41b5ae1db 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/PrescriptionAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/PrescriptionAdapter.kt
@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter
 import android.widget.AutoCompleteTextView
 import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.RecyclerView
@@ -21,17 +22,22 @@ import org.piramalswasthya.cho.model.PrescriptionValues
 import org.piramalswasthya.cho.ui.commons.case_record.FormItemAdapter
 import org.piramalswasthya.cho.ui.setSpinnerItems
 import org.piramalswasthya.cho.utils.HelperUtil
+import org.piramalswasthya.cho.utils.setupDropdownKeyboardHandling
+import org.piramalswasthya.cho.utils.KeyboardUtils
 
 class PrescriptionAdapter(
     private val isVisitDetail: Boolean? = null,
     private val isFollowupVisit: Boolean? = null,
+    private val isMedicineDispensedByPharmacist: Boolean = false,
+    private var dispensedLockedItemCount: Int = 0,
     private val itemList: MutableList<PrescriptionValues>,
     private val formMD: List<ItemMasterList>,
     private val frequencyDropDown: List<String>,
     private val unitDropDown: List<String>,
     private val instructionDropdown: List<String>,
     private val itemMasterForFilter: List<ItemMasterList>,
-    private val itemChangeListener: RecyclerViewItemChangeListenersP
+    private val itemChangeListener: RecyclerViewItemChangeListenersP,
+    private val fetchStockListener: ((Int, (Int) -> Unit) -> Unit)? = null
 ) : RecyclerView.Adapter<PrescriptionAdapter.ViewHolder>() {
 
     private var durationCount = 0
@@ -52,6 +58,7 @@ class PrescriptionAdapter(
         val addButton : TextView = itemView.findViewById(R.id.addButton)
         val subtractButton : TextView = itemView.findViewById(R.id.subtractButton)
         val textPrescriptionHeading : TextView = itemView.findViewById(R.id.textPrescriptionHeading)
+        val textStock : TextView = itemView.findViewById(R.id.textStock)
 
 //        Dropdown Fields
         val formOptionsDropDown: TextInputLayout = itemView.findViewById(R.id.dosagesDropDown)
@@ -110,8 +117,9 @@ class PrescriptionAdapter(
                 itemData.frequency = ""
                 itemData.duration = ""
                 itemData.instructions = ""
-                itemData.unit = ""
+                itemData.unit = "Day(s)"
                 itemData.id = null
+                textStock.text = ""
                 notifyItemChanged(position)
                 itemChangeListener.onItemChanged()
             }
@@ -121,6 +129,9 @@ class PrescriptionAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         durationCount=0
         val itemData = itemList[position]
+
+        android.util.Log.d("PrescriptionAdapter", "onBindViewHolder: position=$position, title=${itemData.title}, isDispensed=${itemData.isDispensed}, form=${itemData.form}, id=${itemData.id}")
+
        holder.subtractButton.isEnabled = false
         holder.addButton.setOnClickListener {
             durationCount = itemData.duration.toIntOrNull()?.takeIf { it <= maxDuration } ?: 0
@@ -132,7 +143,7 @@ class PrescriptionAdapter(
             }
             // Disable the "Add" button when the duration count reaches the maximum
             if (durationCount >= maxDuration) {
-                Toast.makeText(holder.itemView.context, "Maximum value allowed for Duration is 6.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(holder.itemView.context, holder.itemView.context.getString(R.string.max_duration_allowed_6), Toast.LENGTH_SHORT).show()
                 holder.addButton.isEnabled = false
             }
             // Enable the "Subtract" button
@@ -161,7 +172,15 @@ class PrescriptionAdapter(
             holder.addButton.isEnabled = true
         }
 
-        if (isVisitDetail == true && isFollowupVisit == false){
+        // Read-only in view mode; dispensed rows always stay locked across multi-cycle edits.
+        val isCaseReadOnly = (isVisitDetail == true && isFollowupVisit == false)
+        val isDispensedLockedRow = itemData.isDispensed || (isMedicineDispensedByPharmacist && position < dispensedLockedItemCount)
+        val isRowReadOnly = isCaseReadOnly || isDispensedLockedRow
+        val hasData = itemData.id != null || itemData.form.isNotBlank() || itemData.frequency.isNotBlank() ||
+                itemData.duration.isNotBlank() || itemData.instructions.isNotBlank() || itemData.unit.isNotBlank()
+        holder.itemView.visibility = if (isRowReadOnly && !hasData) View.GONE else View.VISIBLE
+
+        if (isRowReadOnly) {
             holder.subtractButton.isEnabled = false
             holder.addButton.isEnabled = false
 
@@ -175,20 +194,52 @@ class PrescriptionAdapter(
 
             holder.resetButton.isVisible = false
             holder.cancelButton.isVisible = false
+        } else {
+            holder.resetButton.isVisible = true
+            holder.cancelButton.isVisible = true
         }
 
-        // Bind data and set listeners for user interactions
-        holder.formOptions.setText(itemData.form)
-        holder.frequencyOptions.setText(itemData.frequency)
+        // Bind data WITHOUT triggering text watchers (set data before adding listeners)
+        // Use setText with BufferType.EDITABLE to avoid triggering watchers
+        holder.formOptions.setText(itemData.form, false)
+        holder.frequencyOptions.setText(itemData.frequency, false)
         holder.durationInput.setText(itemData.duration)
-        holder.instructionOption.setText(itemData.instructions)
-        holder.unitOption.setText(itemData.unit)
+        holder.instructionOption.setText(itemData.instructions, false)
+        holder.unitOption.setText(itemData.unit, false)
         holder.cancelButton.isEnabled = itemCount > 1
         holder.resetButton.isEnabled = false
 
+        android.util.Log.d("PrescriptionAdapter", "Data bound: position=$position, form='${itemData.form}', frequency='${itemData.frequency}', duration='${itemData.duration}'")
+
+        // Show "Dispensed" label in green for dispensed medicines
+        if (itemData.isDispensed) {
+            holder.textPrescriptionHeading.text = "${itemData.title} - Dispensed"
+            holder.textPrescriptionHeading.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.stock_green))
+        } else {
+            holder.textPrescriptionHeading.text = itemData.title
+            holder.textPrescriptionHeading.setTextColor(ContextCompat.getColor(holder.itemView.context, android.R.color.black))
+        }
+
         if(itemData.id!=null){
             var st = formMD.find { it.itemID==itemData.id }
-            holder.formOptions.setText(st?.dropdownForMed.toString())
+            holder.formOptions.setText(st?.dropdownForMed.toString(), false)
+
+            android.util.Log.d("PrescriptionAdapter", "Setting form from ID: position=$position, id=${itemData.id}, form=${st?.dropdownForMed}")
+
+            itemData.id?.let { id ->
+                fetchStockListener?.invoke(id) { stock ->
+                    if (stock > 0) {
+                        holder.textStock.text = holder.itemView.context.getString(R.string.stock_label, stock)
+                        holder.textStock.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.stock_green))
+                    } else {
+                        holder.textStock.text = holder.itemView.context.getString(R.string.out_of_stock)
+                        holder.textStock.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.stock_red))
+                    }
+                }
+            }
+        } else {
+            android.util.Log.d("PrescriptionAdapter", "No ID for position=$position, clearing stock text")
+            holder.textStock.text = ""
         }
 
 //       holder.formOptions.setSpinnerItems(formMD.map { it.dropdownForMed }.toTypedArray())
@@ -209,7 +260,20 @@ class PrescriptionAdapter(
 
             selectedItem?.let {
                 holder.formOptions.setText(selectedName)
+                holder.formOptions.setSelection(holder.formOptions.text?.length ?: 0)
                 itemData.id = it.itemID
+
+                it.itemID?.let { id ->
+                    fetchStockListener?.invoke(id) { stock ->
+                        if (stock > 0) {
+                            holder.textStock.text = holder.itemView.context.getString(R.string.stock_label, stock)
+                            holder.textStock.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.stock_green))
+                        } else {
+                            holder.textStock.text = holder.itemView.context.getString(R.string.out_of_stock)
+                            holder.textStock.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.stock_red))
+                        }
+                    }
+                }
             }
         }
 
@@ -229,6 +293,38 @@ class PrescriptionAdapter(
         formMD.map { it.dropdownForMed }.toTypedArray()
             ?.let { holder.formOptions.setSpinnerItems(it) }
 
+        holder.formOptions.threshold = 0
+        holder.frequencyOptions.threshold = 0
+        holder.unitOption.threshold = 0
+        holder.instructionOption.threshold = 0
+
+        if (!isRowReadOnly) {
+            holder.formOptions.setupDropdownKeyboardHandling()
+
+            // Keep editable autocomplete behavior for text-entry dropdowns.
+            holder.formOptions.showSoftInputOnFocus = true
+            holder.formOptions.setOnTouchListener(null)
+            holder.formOptions.setOnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) holder.formOptions.showDropDown()
+            }
+            holder.formOptions.setOnClickListener { holder.formOptions.showDropDown() }
+
+            // Frequency, Unit, Instruction are pure dropdowns (endIconMode=dropdown_menu).
+            // Do NOT apply setupDropdownKeyboardHandling — it conflicts with Material's
+            // dropdown_menu behaviour, causing a grey/disabled look and blocking field taps.
+            val dropdownFields = listOf(holder.frequencyOptions, holder.unitOption, holder.instructionOption)
+            for (field in dropdownFields) {
+                field.setOnClickListener { field.showDropDown() }
+                field.setOnFocusChangeListener { _, hasFocus ->
+                    if (hasFocus) {
+                        KeyboardUtils.hideKeyboard(field)
+                        field.showDropDown()
+                    }
+                }
+            }
+        }
+
+
         holder.formOptions.addTextChangedListener{
             itemData.form= it.toString()
             holder.updateResetButtonState()
@@ -248,7 +344,7 @@ class PrescriptionAdapter(
                 if (!s.isNullOrBlank() && s.length == 1 && s[0] == '0') s.clear()
                 if (!s.isNullOrBlank() && s.toString().toInt()>6) {
                     s.clear()
-                    Toast.makeText(holder.itemView.context, "Maximum value allowed for Duration is 6.", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(holder.itemView.context, holder.itemView.context.getString(R.string.max_duration_allowed_6), Toast.LENGTH_SHORT).show()
                 }
                 else {
                     itemData.duration = s.toString()
@@ -275,7 +371,8 @@ class PrescriptionAdapter(
         // Update the visibility of the "Reset" button for all items
         holder.updateResetButtonState()
 
-        holder.textPrescriptionHeading.text = "Medicine - ${position + 1}"
+        // Don't overwrite the title if it's already set (especially for dispensed medicines)
+        // The title with "Dispensed" label is already set above
     }
 
 
@@ -289,7 +386,12 @@ class PrescriptionAdapter(
 
     override fun getItemCount(): Int = itemList.size
 
+    fun setDispensedLockedItemCount(count: Int) {
+        dispensedLockedItemCount = count.coerceAtLeast(0)
+        notifyDataSetChanged()
+    }
+
 }
 interface RecyclerViewItemChangeListenersP {
     fun onItemChanged()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/SelectBatchAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/SelectBatchAdapter.kt
index 42b8f0c03..0b29734a2 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/SelectBatchAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/SelectBatchAdapter.kt
@@ -3,6 +3,7 @@ package org.piramalswasthya.cho.adapter
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.widget.doAfterTextChanged
@@ -42,7 +43,7 @@ class SelectBatchAdapter(
         fun bind(
             item: PrescriptionBatchDTO,
         ) {
-            binding.tvExpiryDate.text = DateTimeUtil.formatDateStr(item.expiryDate)
+            binding.tvExpiryDate.text = item.expiryDate
             binding.tvQuantityInHand.text = "In Hand Qty: ${item.qty.toString()}"
             binding.tvBatchNo.text = "Batch No: ${item.batchNo.toString()}"
             binding.checkboxSelect.setOnCheckedChangeListener(null)
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/SubCategoryAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/SubCategoryAdapter.kt
index ce8021a10..f83945fc9 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/SubCategoryAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/SubCategoryAdapter.kt
@@ -1,12 +1,29 @@
 package org.piramalswasthya.cho.adapter
 
 import android.content.Context
-import android.view.View
-import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import android.widget.TextView
-import org.piramalswasthya.cho.model.SubVisitCategory
+import android.widget.Filter
 
-class SubCategoryAdapter(context: Context, resource: Int,textViewResourceId:Int,  subCats: List<String>) :
-        ArrayAdapter<String>(context, resource,textViewResourceId, subCats) {
+class SubCategoryAdapter(
+    context: Context,
+    resource: Int,
+    textViewResourceId: Int,
+    private val subCats: List<String>
+) : ArrayAdapter<String>(context, resource, textViewResourceId, subCats) {
+
+    override fun getFilter(): Filter = object : Filter() {
+        override fun performFiltering(constraint: CharSequence?): FilterResults {
+            // Sub Category / Reason for Visit are pickers, not search fields.
+            // Always return the full list so stale text (e.g. after navigating back)
+            // doesn't narrow the dropdown to only the already-selected item.
+            return FilterResults().apply {
+                values = subCats
+                count = subCats.size
+            }
+        }
+
+        override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+            notifyDataSetChanged()
+        }
+    }
 }
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/ViewPagerAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/ViewPagerAdapter.kt
index 5f691cf6b..055265361 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/ViewPagerAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/ViewPagerAdapter.kt
@@ -5,6 +5,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import org.piramalswasthya.cho.ui.home.HomeFragment
+import org.piramalswasthya.cho.ui.home.RMNCHAFragment
 import org.piramalswasthya.cho.ui.home_activity.DashboardFragment
 
 class ViewPagerAdapter(supportFragmentManager: FragmentManager, lifecycle: Lifecycle) : FragmentStateAdapter(supportFragmentManager, lifecycle) {
@@ -14,15 +15,15 @@ class ViewPagerAdapter(supportFragmentManager: FragmentManager, lifecycle: Lifec
     private val mFragmentTitleList = ArrayList<String>()
 
     override fun getItemCount(): Int {
-        return  2
+        return  3
     }
 
     override fun createFragment(position: Int): Fragment {
-       return if(position==0){
-            HomeFragment()
-        }
-        else{
-            DashboardFragment()
-        }
+       return when(position) {
+           0 -> HomeFragment()
+           1 -> DashboardFragment()
+           2 -> RMNCHAFragment()
+           else -> HomeFragment()
+       }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/adapter/VillageDropdownAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/adapter/VillageDropdownAdapter.kt
index 1f213683f..a69a07407 100644
--- a/app/src/main/java/org/piramalswasthya/cho/adapter/VillageDropdownAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/adapter/VillageDropdownAdapter.kt
@@ -22,13 +22,15 @@ class VillageDropdownAdapter(
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
         val view = super.getView(position, convertView, parent)
-        (view as? TextView)?.text = dataList[position].villageName
+        val item = getItem(position)
+        (view as? TextView)?.text = item?.villageName.orEmpty()
         return view
     }
 
     override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
         val view = super.getDropDownView(position, convertView, parent)
-        (view as? TextView)?.text = dataList[position].villageName
+        val item = getItem(position)
+        (view as? TextView)?.text = item?.villageName.orEmpty()
         return view
     }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/ChildBeneficiaryRegistrationDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/ChildBeneficiaryRegistrationDataset.kt
new file mode 100644
index 000000000..fad88b319
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/ChildBeneficiaryRegistrationDataset.kt
@@ -0,0 +1,152 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.network.getDateFromLong
+
+class ChildBeneficiaryRegistrationDataset(
+    context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private val childName = FormElement(
+        id = 1,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.name_of_child),
+        required = true,
+        hasDependants = false
+    )
+
+    private val dob = FormElement(
+        id = 2,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.date_of_birth),
+        required = true,
+        hasDependants = false,
+        isEnabled = false,
+        max = System.currentTimeMillis()
+    )
+
+    private val sex = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_sex),
+        entries = resources.getStringArray(R.array.no_sex_array),
+        required = true,
+        hasDependants = false,
+        isEnabled = false
+    )
+
+    private val motherName = FormElement(
+        id = 4,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.mother_name),
+        required = false,
+        hasDependants = false
+    )
+
+    private val fatherName = FormElement(
+        id = 5,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.father_s_name),
+        required = false,
+        hasDependants = false
+    )
+
+    private val mobileNumber = FormElement(
+        id = 6,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.tv_mob_no_ph),
+        required = false,
+        hasDependants = false
+    )
+
+    private val birthWeight = FormElement(
+        id = 7,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.no_birth_weight),
+        required = false,
+        hasDependants = false
+    )
+
+    suspend fun setUpPage(
+        motherPatient: Patient,
+        deliveryOutcomeCache: DeliveryOutcomeCache,
+        infantRegCache: InfantRegCache,
+        existingChild: Patient?
+    ) {
+        val fullMotherName =
+            "${motherPatient.firstName.orEmpty()} ${motherPatient.lastName.orEmpty()}".trim()
+        val childDisplayName = existingChild?.let { child ->
+            listOfNotNull(child.firstName, child.lastName).joinToString(" ").trim()
+        }.takeUnless { it.isNullOrBlank() }
+            ?: infantRegCache.babyName
+            ?: "baby of ${motherPatient.firstName.orEmpty()}".trim()
+
+        childName.value = childDisplayName
+        motherName.value = fullMotherName
+        fatherName.value = motherPatient.spouseName ?: motherPatient.parentName ?: ""
+        mobileNumber.value = motherPatient.phoneNo ?: ""
+        birthWeight.value = infantRegCache.weight?.let { (it * 1000).toInt().toString() }
+
+        val childDobMillis = existingChild?.dob?.time ?: deliveryOutcomeCache.dateOfDelivery
+        dob.value = childDobMillis?.let { getDateFromLong(it) }
+        dob.min = childDobMillis
+
+        val sexId = existingChild?.genderID ?: infantRegCache.genderID
+        sex.value = sexId?.let { id ->
+            sex.entries?.getOrNull(id - 1)
+        }
+
+        setUpPage(
+            listOf(
+                childName,
+                dob,
+                sex,
+                motherName,
+                fatherName,
+                mobileNumber,
+                birthWeight
+            )
+        )
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            childName.id -> validateAllAlphabetsSpecialOnEditText(childName)
+            else -> -1
+        }
+    }
+
+    fun getChildFirstName(): String {
+        val name = childName.value?.trim().orEmpty()
+        return name.substringBefore(" ").ifBlank { name }
+    }
+
+    fun getChildLastName(): String? {
+        val name = childName.value?.trim().orEmpty()
+        val last = name.substringAfter(" ", "").trim()
+        return last.ifBlank { null }
+    }
+
+    fun getChildFullName(): String = childName.value?.trim().orEmpty()
+
+    fun getDobMillis(): Long? = Dataset.getLongFromDate(dob.value).takeIf { it != 0L }
+
+    fun getGenderID(): Int? {
+        val selected = sex.value ?: return null
+        return sex.entries?.indexOf(selected)?.plus(1)
+    }
+
+    fun getFatherName(): String? = fatherName.value?.trim().takeUnless { it.isNullOrEmpty() }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        // This dataset maps directly to Patient entity fields via getters.
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/ChildRegistrationDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/ChildRegistrationDataset.kt
new file mode 100644
index 000000000..633264da6
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/ChildRegistrationDataset.kt
@@ -0,0 +1,1003 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import android.widget.LinearLayout
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.network.getDateFromLong
+import org.piramalswasthya.cho.network.getLongFromDate
+
+class ChildRegistrationDataset(
+    context: Context, currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    companion object {
+        private const val WEIGHT_MIN = 500
+        private const val WEIGHT_MAX = 6000
+        private const val OUTCOME_LIVE_BIRTH_INDEX = 0
+        private const val CURRENT_STATUS_DIED_INDEX = 3
+    }
+
+    // ─── Existing FLW fields ────────────────────────────────────────────
+
+    private var babyName = FormElement(
+        id = 1,
+        inputType = InputType.TEXT_VIEW,
+        title = "Name of Baby",
+        required = false,
+        hasDependants = false
+    )
+
+    private var infantTerm = FormElement(
+        id = 2,
+        inputType = InputType.TEXT_VIEW,
+        title = "Infant Term",
+        entries = arrayOf("Full Term", "Pre Term"),
+        required = false,
+        hasDependants = false
+    )
+
+    private var corticosteroidGiven = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = "Was Corticosteroid Inj. given?",
+        entries = arrayOf("Yes", "No", "Don't Know"),
+        required = false,
+        hasDependants = false
+    )
+
+    // Q2: Outcome at Birth (BRD)
+    private val outcomeAtBirth = FormElement(
+        id = 4,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_outcome_at_birth),
+        arrayId = R.array.no_outcome_at_birth_array,
+        entries = resources.getStringArray(R.array.no_outcome_at_birth_array),
+        required = true,
+        hasDependants = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    // Q3: Sex
+    private var gender = FormElement(
+        id = 5,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_sex),
+        arrayId = R.array.no_sex_array,
+        entries = resources.getStringArray(R.array.no_sex_array),
+        required = true,
+        hasDependants = false,
+        hasAlertError = true,
+        orientation = LinearLayout.VERTICAL,
+    )
+
+    // Q4: Cried immediately after birth?
+    private var babyCriedAtBirth = FormElement(
+        id = 6,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_cried_immediately),
+        arrayId = R.array.no_cried_immediately_array,
+        entries = resources.getStringArray(R.array.no_cried_immediately_array),
+        required = true,
+        hasDependants = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    // Q5: Type of resuscitation (multi-select, shown if cried after resuscitation)
+    private val typeOfResuscitation = FormElement(
+        id = 7,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_type_of_resuscitation),
+        arrayId = R.array.no_type_of_resuscitation_array,
+        entries = resources.getStringArray(R.array.no_type_of_resuscitation_array),
+        required = false,
+        hasDependants = false
+    )
+
+    private var resuscitation = FormElement(
+        id = 8,
+        inputType = InputType.RADIO,
+        title = "If No, Resuscitation Done",
+        entries = arrayOf("Yes", "No"),
+        required = true,
+        hasDependants = false
+    )
+
+    private var referred = FormElement(
+        id = 9,
+        inputType = InputType.RADIO,
+        title = "Referred to higher facility for further management",
+        entries = arrayOf("Yes", "No", "NA"),
+        required = false,
+        hasDependants = false
+    )
+
+    // Q6: Birth Weight (grams)
+    private var weight = FormElement(
+        id = 10,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_birth_weight),
+        required = true,
+        hasDependants = false,
+        etMaxLength = 4,
+        min = WEIGHT_MIN.toLong(),
+        max = WEIGHT_MAX.toLong(),
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+    )
+
+    // Q7: Any congenital anomaly detected?
+    private var hadBirthDefect = FormElement(
+        id = 11,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_congenital_anomaly_detected),
+        arrayId = R.array.no_congenital_anomaly_array,
+        entries = resources.getStringArray(R.array.no_congenital_anomaly_array),
+        required = true,
+        hasDependants = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    // Q8: Type of congenital anomaly (multi-select)
+    private var birthDefect = FormElement(
+        id = 12,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_type_of_congenital_anomaly),
+        arrayId = R.array.no_type_of_congenital_anomaly_array,
+        entries = resources.getStringArray(R.array.no_type_of_congenital_anomaly_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q9: Other congenital anomaly
+    private var otherDefect = FormElement(
+        id = 13,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_other_congenital_anomaly),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 300
+    )
+
+    // Q10: Newborn Complications (multi-select)
+    private val newbornComplications = FormElement(
+        id = 14,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_newborn_complications),
+        arrayId = R.array.no_newborn_complications_array,
+        entries = resources.getStringArray(R.array.no_newborn_complications_array),
+        required = false,
+        hasDependants = false
+    )
+
+    // Q11: Current Status of Baby
+    private val currentStatusOfBaby = FormElement(
+        id = 15,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_current_status_of_baby),
+        arrayId = R.array.no_current_status_array,
+        entries = resources.getStringArray(R.array.no_current_status_array),
+        required = true,
+        hasDependants = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    // Q12: Cause of Death (multi-select, shown if Died)
+    private val causeOfDeath = FormElement(
+        id = 16,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_cause_of_death),
+        arrayId = R.array.no_cause_of_death_array,
+        entries = resources.getStringArray(R.array.no_cause_of_death_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q13: Other cause of death
+    private val otherCauseOfDeath = FormElement(
+        id = 17,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_other_cause_of_death),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 300
+    )
+
+    private var breastFeedingStarted = FormElement(
+        id = 18,
+        inputType = InputType.RADIO,
+        title = "Breast feeding started within 1 hour of birth",
+        entries = arrayOf("Yes", "No"),
+        required = true,
+        hasDependants = false,
+    )
+
+    // Q14: Birth dose vaccines given (multi-select)
+    private val birthDoseVaccinesGiven = FormElement(
+        id = 19,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_birth_dose_vaccines_given),
+        arrayId = R.array.no_birth_dose_vaccines_array,
+        entries = resources.getStringArray(R.array.no_birth_dose_vaccines_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q15: Reason for not giving birth dose vaccines
+    private val reasonForNoVaccines = FormElement(
+        id = 20,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_reason_for_no_vaccines),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 200
+    )
+
+    private val opv0Dose = FormElement(
+        id = 21,
+        inputType = InputType.DATE_PICKER,
+        title = "OPV0 Dose",
+        required = false,
+        max = System.currentTimeMillis(),
+        hasDependants = false
+    )
+
+    private val bcgDose = FormElement(
+        id = 22,
+        inputType = InputType.DATE_PICKER,
+        title = "BCG Dose",
+        required = false,
+        max = System.currentTimeMillis(),
+        hasDependants = false
+    )
+
+    private val hepBDose = FormElement(
+        id = 23,
+        inputType = InputType.DATE_PICKER,
+        title = "HEP B-0 Dose",
+        required = false,
+        max = System.currentTimeMillis(),
+        hasDependants = false
+    )
+
+    // Q16: Vitamin K injection given?
+    private val vitaminKInjectionGiven = FormElement(
+        id = 24,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_vitamin_k_injection_given),
+        entries = arrayOf(resources.getString(R.string.yes), resources.getString(R.string.no)),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q17: Reason for no Vitamin K
+    private val reasonForNoVitaminK = FormElement(
+        id = 25,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_reason_for_no_vitamin_k),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 200
+    )
+
+    private val vitkDose = FormElement(
+        id = 26,
+        inputType = InputType.DATE_PICKER,
+        title = "VITK Dose",
+        required = false,
+        max = System.currentTimeMillis(),
+        hasDependants = false
+    )
+
+    // Q18: Birth Certificate issued?
+    private val birthCertificateIssued = FormElement(
+        id = 27,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_birth_certificate_issued),
+        arrayId = R.array.no_birth_certificate_array,
+        entries = resources.getStringArray(R.array.no_birth_certificate_array),
+        required = true,
+        hasDependants = false,
+        hasAlertError = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    // ─── Helper: generate baby name from patient & delivery data ────────
+    private fun generateBabyName(
+        ben: Patient?,
+        deliveryOutcomeCache: DeliveryOutcomeCache,
+        babyIndex: Int
+    ): String? {
+        if (ben == null) return null
+        return if (deliveryOutcomeCache.liveBirth == null || deliveryOutcomeCache.liveBirth == 1)
+            "baby of ${ben.firstName}"
+        else
+            "baby ${babyIndex + 1} of ${ben.firstName}"
+    }
+
+    // ─── Helper: restore all saved field values from cache ─────────────
+    private fun restoreSavedValues(saved: InfantRegCache) {
+        infantTerm.value = saved.infantTerm
+        corticosteroidGiven.value = saved.corticosteroidGiven
+        outcomeAtBirth.value = when (saved.outcomeAtBirth) {
+            "Diedrelative during delivery" -> resources.getStringArray(R.array.no_outcome_at_birth_array).getOrNull(3)
+            else -> getLocalValueInArray(R.array.no_outcome_at_birth_array, saved.outcomeAtBirth)
+        }
+
+        gender.value = saved.genderID?.let {
+             if (it > 0 && it <= (gender.entries?.size ?: 0)) gender.entries?.get(it - 1) else null
+        }
+        babyCriedAtBirth.value = when {
+            saved.babyCriedAtBirth == true -> resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(0) // Immediate cry
+            saved.resuscitation == true -> resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(1) // Cried after resuscitation
+            isStillbirthOrDiedAtBirth(outcomeAtBirth.value) -> resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(2) // Not applicable (Stillbirth)
+            else -> null
+        }
+        typeOfResuscitation.value = getLocalValuesInArray(R.array.no_type_of_resuscitation_array, saved.typeOfResuscitation)
+        resuscitation.value = saved.resuscitation?.let { if (it) "Yes" else "No" }
+        referred.value = saved.referred
+        hadBirthDefect.value = getLocalValueInArray(R.array.no_congenital_anomaly_array, saved.hadBirthDefect)
+        birthDefect.value = getLocalValuesInArray(R.array.no_type_of_congenital_anomaly_array, saved.birthDefect)
+        otherDefect.value = saved.otherDefect?.takeIf { it.isNotBlank() }
+        weight.value = saved.weight?.let { (it * 1000).toInt().toString() } // Convert kg to grams for display
+        breastFeedingStarted.value = saved.breastFeedingStarted?.let { if (it) "Yes" else "No" }
+        newbornComplications.value = getLocalValuesInArray(R.array.no_newborn_complications_array, saved.newbornComplications)
+        currentStatusOfBaby.value = getLocalValueInArray(R.array.no_current_status_array, saved.currentStatusOfBaby)
+        causeOfDeath.value = getLocalValuesInArray(R.array.no_cause_of_death_array, saved.causeOfDeath)
+        otherCauseOfDeath.value = saved.otherCauseOfDeath?.takeIf { it.isNotBlank() }
+        birthDoseVaccinesGiven.value = getLocalValuesInArray(R.array.no_birth_dose_vaccines_array, saved.birthDoseVaccinesGiven)
+        reasonForNoVaccines.value = saved.reasonForNoVaccines?.takeIf { it.isNotBlank() }
+        vitaminKInjectionGiven.value = when (saved.vitaminKInjectionGiven) {
+            true -> resources.getString(R.string.yes)
+            false -> resources.getString(R.string.no)
+            else -> null
+        }
+        reasonForNoVitaminK.value = saved.reasonForNoVitaminK?.takeIf { it.isNotBlank() }
+        birthCertificateIssued.value = getLocalValueInArray(R.array.no_birth_certificate_array, saved.birthCertificateIssued)
+
+        opv0Dose.value = saved.opv0Dose?.let { getDateFromLong(it) }
+        bcgDose.value = saved.bcgDose?.let { getDateFromLong(it) }
+        hepBDose.value = saved.hepBDose?.let { getDateFromLong(it) }
+        vitkDose.value = saved.vitkDose?.let { getDateFromLong(it) }
+    }
+
+    // ─── Helper: insert a field (and optional sub-field) after anchor ──
+    private fun insertAfter(
+        list: MutableList<FormElement>,
+        anchor: FormElement,
+        primary: FormElement,
+        secondary: FormElement? = null
+    ) {
+        val idx = list.indexOf(anchor)
+        if (idx < 0) return
+        if (!list.contains(primary)) {
+            list.add(idx + 1, primary)
+        }
+        if (secondary != null && !list.contains(secondary)) {
+            val primaryIndex = list.indexOf(primary).takeIf { it >= 0 } ?: idx
+            list.add(primaryIndex + 1, secondary)
+        }
+    }
+
+    // ─── Helper: restore conditional (dependant) fields into the list ──
+    private fun restoreConditionalFields(
+        saved: InfantRegCache,
+        list: MutableList<FormElement>
+    ) {
+        val localizedHadBirthDefect = getLocalValueInArray(R.array.no_congenital_anomaly_array, saved.hadBirthDefect)
+        val localizedCurrentStatus = getLocalValueInArray(R.array.no_current_status_array, saved.currentStatusOfBaby)
+        val localizedCauseOfDeath = getLocalValuesInArray(R.array.no_cause_of_death_array, saved.causeOfDeath)
+        val localizedBirthDoseVaccines = getLocalValuesInArray(R.array.no_birth_dose_vaccines_array, saved.birthDoseVaccinesGiven)
+
+        if (saved.babyCriedAtBirth == false || saved.resuscitation == true) {
+            val criedIdx = list.indexOf(babyCriedAtBirth)
+            if (criedIdx >= 0 && !saved.typeOfResuscitation.isNullOrBlank() && !list.contains(typeOfResuscitation)) {
+                list.add(criedIdx + 1, typeOfResuscitation)
+            }
+        }
+        val anomalyArray = resources.getStringArray(R.array.no_congenital_anomaly_array)
+        if (localizedHadBirthDefect == anomalyArray.getOrNull(0) || localizedHadBirthDefect == anomalyArray.getOrNull(2)) {
+            val other = if (hasSelectedOption(birthDefect.value, getOtherOption(birthDefect.entries))) otherDefect else null
+            insertAfter(list, hadBirthDefect, birthDefect, other)
+        }
+        if (localizedCurrentStatus == resources.getStringArray(R.array.no_current_status_array).getOrNull(3)) {
+            val other = if (hasSelectedOption(localizedCauseOfDeath, getOtherOption(causeOfDeath.entries))) otherCauseOfDeath else null
+            insertAfter(list, currentStatusOfBaby, causeOfDeath, other)
+        }
+        if (hasSelectedOption(localizedBirthDoseVaccines, resources.getStringArray(R.array.no_birth_dose_vaccines_array).getOrNull(3))) {
+            insertAfter(list, birthDoseVaccinesGiven, reasonForNoVaccines)
+        }
+        if (saved.vitaminKInjectionGiven == false) {
+            insertAfter(list, vitaminKInjectionGiven, reasonForNoVitaminK)
+        }
+    }
+
+    // ─── Helper: infer infant term from gestational age ────────────────
+    private fun inferInfantTerm(deliveryOutcomeCache: DeliveryOutcomeCache) {
+        if (!infantTerm.value.isNullOrBlank()) return
+        deliveryOutcomeCache.gestationalAgeAtDelivery?.let { gaString ->
+            val weeks = gaString.substringBefore("w").trim().toIntOrNull()
+            if (weeks != null) {
+                infantTerm.value = if (weeks < 37) "Pre Term" else "Full Term"
+            }
+        }
+    }
+
+    // ─── Helper: pre-populate defaults from delivery outcome ───────────
+    private fun prepopulateDefaults(deliveryOutcomeCache: DeliveryOutcomeCache) {
+        inferInfantTerm(deliveryOutcomeCache)
+
+        val deliveryDate = deliveryOutcomeCache.dateOfDelivery?.let { getDateFromLong(it) }
+        if (deliveryDate != null) {
+            if (opv0Dose.value == null) opv0Dose.value = deliveryDate
+            if (bcgDose.value == null) bcgDose.value = deliveryDate
+            if (hepBDose.value == null) hepBDose.value = deliveryDate
+            if (vitkDose.value == null) vitkDose.value = deliveryDate
+        }
+    }
+
+    suspend fun setUpPage(
+        ben: Patient?,
+        deliveryOutcomeCache: DeliveryOutcomeCache,
+        babyIndex: Int,
+        saved: InfantRegCache?
+    ) {
+        val list = mutableListOf(
+            babyName,
+            infantTerm,
+            corticosteroidGiven,
+            outcomeAtBirth
+        )
+
+        deliveryOutcomeCache.dateOfDelivery?.let {
+            opv0Dose.min = it
+            bcgDose.min = it
+            hepBDose.min = it
+            vitkDose.min = it
+        }
+
+        babyName.value = saved?.babyName ?: generateBabyName(ben, deliveryOutcomeCache, babyIndex)
+
+        if (saved != null) {
+            restoreSavedValues(saved)
+        }
+
+        //prepopulateDefaults(deliveryOutcomeCache)
+
+        if (isStillbirthOrDiedAtBirth(outcomeAtBirth.value)) {
+            birthDoseVaccinesGiven.required = false
+            vitaminKInjectionGiven.required = false
+            list.add(newbornComplications)
+        } else {
+            list.addAll(getLiveBirthBaseFields())
+        }
+        if (saved != null) {
+            restoreConditionalFields(saved, list)
+        }
+        refreshConditionalRequirements()
+
+        setUpPage(list)
+    }
+
+    // ─── Helper: toggle dependant fields based on a condition ──────────
+    private fun toggleDependant(
+        source: FormElement,
+        condition: Boolean,
+        showItems: List<FormElement>,
+        hideItems: List<FormElement> = emptyList()
+    ): Int {
+        return if (condition) {
+            triggerDependants(source = source, removeItems = hideItems, addItems = showItems)
+        } else {
+            triggerDependants(source = source, removeItems = showItems + hideItems, addItems = emptyList())
+        }
+    }
+
+    private fun hasSelectedOption(value: String?, option: String?): Boolean {
+        if (value.isNullOrBlank() || option.isNullOrBlank()) return false
+        return value.split(",").any { it.trim() == option }
+    }
+
+    private fun getOtherOption(entries: Array<String>?): String? {
+        return entries?.firstOrNull { it.contains("Other", ignoreCase = true) }
+    }
+
+    private fun isLiveBirthOutcome(value: String?): Boolean {
+        val liveBirth = resources.getStringArray(R.array.no_outcome_at_birth_array)
+            .getOrNull(OUTCOME_LIVE_BIRTH_INDEX)
+        return value == liveBirth
+    }
+
+    private fun isStillbirthOrDiedAtBirth(value: String?): Boolean {
+        if (value.isNullOrBlank()) return false
+        return !isLiveBirthOutcome(value)
+    }
+
+    private fun getOutcomeDependentFields(): List<FormElement> {
+        return listOf(
+            gender,
+            babyCriedAtBirth,
+            typeOfResuscitation,
+            weight,
+            hadBirthDefect,
+            birthDefect,
+            otherDefect,
+            newbornComplications,
+            currentStatusOfBaby,
+            causeOfDeath,
+            otherCauseOfDeath,
+            breastFeedingStarted,
+            birthDoseVaccinesGiven,
+            reasonForNoVaccines,
+            opv0Dose,
+            bcgDose,
+            hepBDose,
+            vitaminKInjectionGiven,
+            reasonForNoVitaminK,
+            vitkDose,
+            birthCertificateIssued
+        )
+    }
+
+    private fun getLiveBirthBaseFields(): List<FormElement> {
+        return mutableListOf<FormElement>().apply {
+            add(gender)
+            add(babyCriedAtBirth)
+            if (babyCriedAtBirth.value == resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(1)) {
+                add(typeOfResuscitation)
+            }
+            add(weight)
+            add(hadBirthDefect)
+            val anomalyArray = resources.getStringArray(R.array.no_congenital_anomaly_array)
+            val hasAnomaly = hadBirthDefect.value == anomalyArray.getOrNull(0) ||
+                hadBirthDefect.value == anomalyArray.getOrNull(2)
+            if (hasAnomaly) {
+                add(birthDefect)
+                if (hasSelectedOption(birthDefect.value, getOtherOption(birthDefect.entries))) {
+                    add(otherDefect)
+                }
+            }
+            add(newbornComplications)
+            add(currentStatusOfBaby)
+            if (currentStatusOfBaby.value == resources.getStringArray(R.array.no_current_status_array)
+                    .getOrNull(CURRENT_STATUS_DIED_INDEX)
+            ) {
+                add(causeOfDeath)
+                if (hasSelectedOption(causeOfDeath.value, getOtherOption(causeOfDeath.entries))) {
+                    add(otherCauseOfDeath)
+                }
+            } else {
+                add(breastFeedingStarted)
+                add(birthDoseVaccinesGiven)
+                if (hasSelectedOption(
+                        birthDoseVaccinesGiven.value,
+                        resources.getStringArray(R.array.no_birth_dose_vaccines_array).getOrNull(3)
+                    )
+                ) {
+                    add(reasonForNoVaccines)
+                }
+                add(opv0Dose)
+                add(bcgDose)
+                add(hepBDose)
+                add(vitaminKInjectionGiven)
+                if (vitaminKInjectionGiven.value == resources.getString(R.string.no)) {
+                    add(reasonForNoVitaminK)
+                }
+                add(vitkDose)
+                add(birthCertificateIssued)
+            }
+        }
+    }
+
+    private fun resetConditionalRequirements() {
+        birthDefect.required = false
+        otherDefect.required = false
+        causeOfDeath.required = false
+        otherCauseOfDeath.required = false
+        reasonForNoVaccines.required = false
+        reasonForNoVitaminK.required = false
+        birthDoseVaccinesGiven.required = true
+        vitaminKInjectionGiven.required = true
+    }
+
+    private fun refreshConditionalRequirements() {
+        resetConditionalRequirements()
+
+        if (!isLiveBirthOutcome(outcomeAtBirth.value)) {
+            birthDoseVaccinesGiven.required = false
+            vitaminKInjectionGiven.required = false
+            return
+        }
+
+        val anomalyArray = resources.getStringArray(R.array.no_congenital_anomaly_array)
+        if (hadBirthDefect.value == anomalyArray.getOrNull(0) || hadBirthDefect.value == anomalyArray.getOrNull(2)) {
+            birthDefect.required = true
+        }
+        if (hasSelectedOption(birthDefect.value, getOtherOption(birthDefect.entries))) {
+            otherDefect.required = true
+        }
+
+        if (currentStatusOfBaby.value == resources.getStringArray(R.array.no_current_status_array)
+                .getOrNull(CURRENT_STATUS_DIED_INDEX)
+        ) {
+            causeOfDeath.required = true
+            if (hasSelectedOption(causeOfDeath.value, getOtherOption(causeOfDeath.entries))) {
+                otherCauseOfDeath.required = true
+            }
+            birthDoseVaccinesGiven.required = false
+            vitaminKInjectionGiven.required = false
+        } else {
+            val noneVaccine = resources.getStringArray(R.array.no_birth_dose_vaccines_array).getOrNull(3)
+            if (hasSelectedOption(birthDoseVaccinesGiven.value, noneVaccine)) {
+                reasonForNoVaccines.required = true
+            }
+            if (vitaminKInjectionGiven.value == resources.getString(R.string.no)) {
+                reasonForNoVitaminK.required = true
+            }
+        }
+    }
+
+    private suspend fun handleOutcomeAtBirthChange(selectedValue: String?): Int {
+        resetConditionalRequirements()
+
+        val fieldsToAdd = if (isLiveBirthOutcome(selectedValue)) {
+            getLiveBirthBaseFields()
+        } else {
+            birthDoseVaccinesGiven.required = false
+            vitaminKInjectionGiven.required = false
+            listOf(newbornComplications)
+        }
+
+        if (isStillbirthOrDiedAtBirth(selectedValue)) {
+            emitAlertErrorMessage(R.string.no_alert_stillbirth)
+        }
+
+        val index = getIndexOfElement(outcomeAtBirth)
+        if (index == -1) return -1
+
+        return triggerDependants(
+            source = outcomeAtBirth,
+            removeItems = getOutcomeDependentFields(),
+            addItems = fieldsToAdd.distinct(),
+            position = index + 1
+        )
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            outcomeAtBirth.id -> {
+                val selected = outcomeAtBirth.entries?.getOrNull(index)
+                outcomeAtBirth.value = selected
+                val updateIndex = handleOutcomeAtBirthChange(selected)
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            gender.id -> {
+                val selected = gender.entries?.getOrNull(index)
+                gender.value = selected
+                if (selected == gender.entries?.getOrNull(2)) {
+                    emitAlertErrorMessage(R.string.no_alert_ambiguous_sex)
+                }
+                -1
+            }
+
+            babyCriedAtBirth.id -> {
+                val selected = babyCriedAtBirth.entries?.getOrNull(index)
+                babyCriedAtBirth.value = selected
+                // "Cried after resuscitation" is index 1 — show typeOfResuscitation
+                val updateIndex = toggleDependant(
+                    source = babyCriedAtBirth,
+                    condition = selected == resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(1),
+                    showItems = listOf(typeOfResuscitation)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            hadBirthDefect.id -> {
+                val selected = hadBirthDefect.entries?.getOrNull(index)
+                hadBirthDefect.value = selected
+                // "Yes" or "Suspected" (index 0 or 2) → show birthDefect
+                val anomalyArray = resources.getStringArray(R.array.no_congenital_anomaly_array)
+                val updateIndex = toggleDependant(
+                    source = hadBirthDefect,
+                    condition = selected == anomalyArray.getOrNull(0) || selected == anomalyArray.getOrNull(2),
+                    showItems = listOf(birthDefect),
+                    hideItems = listOf(otherDefect)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            birthDefect.id -> {
+                val updateIndex = toggleDependant(
+                    source = birthDefect,
+                    condition = hasSelectedOption(birthDefect.value, getOtherOption(birthDefect.entries)),
+                    showItems = listOf(otherDefect)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            currentStatusOfBaby.id -> {
+                val selected = currentStatusOfBaby.entries?.getOrNull(index)
+                currentStatusOfBaby.value = selected
+
+                // Admitted statuses require PNC counseling alert
+                val statusArray = resources.getStringArray(R.array.no_current_status_array)
+                if (selected == statusArray.getOrNull(1) || selected == statusArray.getOrNull(2)) {
+                    emitAlertErrorMessage(R.string.no_alert_pnc_counseling)
+                }
+
+                val updateIndex = if (selected == statusArray.getOrNull(CURRENT_STATUS_DIED_INDEX)) {
+                    emitAlertErrorMessage(R.string.no_alert_neonatal_death)
+                    triggerDependants(
+                        source = currentStatusOfBaby,
+                        removeItems = listOf(
+                            otherCauseOfDeath,
+                            breastFeedingStarted,
+                            birthDoseVaccinesGiven,
+                            reasonForNoVaccines,
+                            opv0Dose,
+                            bcgDose,
+                            hepBDose,
+                            vitaminKInjectionGiven,
+                            reasonForNoVitaminK,
+                            vitkDose,
+                            birthCertificateIssued
+                        ),
+                        addItems = listOf(causeOfDeath),
+                        position = getIndexOfElement(currentStatusOfBaby) + 1
+                    )
+                } else {
+                    triggerDependants(
+                        source = currentStatusOfBaby,
+                        removeItems = listOf(causeOfDeath, otherCauseOfDeath),
+                        addItems = listOf(
+                            breastFeedingStarted,
+                            birthDoseVaccinesGiven,
+                            opv0Dose,
+                            bcgDose,
+                            hepBDose,
+                            vitaminKInjectionGiven,
+                            vitkDose,
+                            birthCertificateIssued
+                        ),
+                        position = getIndexOfElement(currentStatusOfBaby) + 1
+                    )
+                }
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            causeOfDeath.id -> {
+                val updateIndex = toggleDependant(
+                    source = causeOfDeath,
+                    condition = hasSelectedOption(causeOfDeath.value, getOtherOption(causeOfDeath.entries)),
+                    showItems = listOf(otherCauseOfDeath)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            birthDoseVaccinesGiven.id -> {
+                val realIndex = (if (index < 0) -index else index) - 1
+                val localizedEntries = birthDoseVaccinesGiven.entries
+                // Locale-neutral "None" identification.
+                val noneIndex = englishResources
+                    .getStringArray(birthDoseVaccinesGiven.arrayId)
+                    .indexOf("None")
+                val noneLocalized = localizedEntries?.getOrNull(noneIndex)
+                val clickedOption = localizedEntries?.getOrNull(realIndex)
+                val isNoneOption = noneIndex >= 0 && realIndex == noneIndex
+                val isChecked = index > 0
+
+                if (clickedOption != null && isChecked) {
+                    if (isNoneOption) {
+                        birthDoseVaccinesGiven.value = clickedOption
+                    } else {
+                        val parts = (birthDoseVaccinesGiven.value ?: "")
+                            .split(",")
+                            .map { it.trim() }
+                            .filter { it.isNotEmpty() && it != noneLocalized }
+                        birthDoseVaccinesGiven.value =
+                            if (parts.isEmpty()) null else parts.joinToString(",")
+                    }
+                    forceRefreshId(birthDoseVaccinesGiven.id)
+                }
+
+                val updateIndex = toggleDependant(
+                    source = birthDoseVaccinesGiven,
+                    condition = hasSelectedOption(birthDoseVaccinesGiven.value, noneLocalized),
+                    showItems = listOf(reasonForNoVaccines)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            vitaminKInjectionGiven.id -> {
+                val selected = vitaminKInjectionGiven.entries?.getOrNull(index)
+                vitaminKInjectionGiven.value = selected
+                val updateIndex = toggleDependant(
+                    source = vitaminKInjectionGiven,
+                    condition = selected == resources.getString(R.string.no),
+                    showItems = listOf(reasonForNoVitaminK)
+                )
+                refreshConditionalRequirements()
+                updateIndex
+            }
+
+            birthCertificateIssued.id -> {
+                val selected = birthCertificateIssued.entries?.getOrNull(index)
+                birthCertificateIssued.value = selected
+                if (selected == birthCertificateIssued.entries?.getOrNull(2)) { // "No (Not applied)"
+                    emitAlertErrorMessage(R.string.no_alert_birth_certificate_legal)
+                }
+                -1
+            }
+
+            weight.id -> {
+                val validation = validateIntMinMax(weight)
+                if (weight.errorText == null) {
+                    weight.value?.toIntOrNull()?.let { weightInGm ->
+                        when {
+                            weightInGm < 1000 -> emitAlertErrorMessage(R.string.no_alert_elbw)
+                            weightInGm < 1500 -> emitAlertErrorMessage(R.string.no_alert_vlbw)
+                            weightInGm < 2500 -> emitAlertErrorMessage(R.string.no_alert_lbw)
+                            weightInGm >= 4000 -> emitAlertErrorMessage(R.string.no_alert_macrosomia)
+                        }
+                    }
+                }
+                validation
+            }
+
+            newbornComplications.id -> {
+                val realIndex = (if (index < 0) -index else index) - 1
+                val localizedEntries = newbornComplications.entries
+                // Identify "None" by its position in the English array so the
+                // logic works in every locale (Hindi, Assamese, etc.).
+                val noneIndex = englishResources
+                    .getStringArray(newbornComplications.arrayId)
+                    .indexOf("None")
+                val noneLocalized = localizedEntries?.getOrNull(noneIndex)
+                val clickedOption = localizedEntries?.getOrNull(realIndex)
+                val isNoneOption = noneIndex >= 0 && realIndex == noneIndex
+                val isChecked = index > 0
+
+                if (clickedOption != null && isChecked) {
+                    if (isNoneOption) {
+                        // "None" just checked → clear every other selection.
+                        newbornComplications.value = clickedOption
+                    } else {
+                        // A real complication was checked → drop "None" if it was set.
+                        val parts = (newbornComplications.value ?: "")
+                            .split(",")
+                            .map { it.trim() }
+                            .filter { it.isNotEmpty() && it != noneLocalized }
+                        newbornComplications.value =
+                            if (parts.isEmpty()) null else parts.joinToString(",")
+                    }
+                    // DiffUtil cannot detect the in-place mutation (same FormElement
+                    // reference in old & new lists), so signal the fragment to call
+                    // notifyItemChanged on this row.
+                    forceRefreshId(newbornComplications.id)
+                }
+
+                if (!hasSelectedOption(newbornComplications.value, noneLocalized) &&
+                    !newbornComplications.value.isNullOrBlank()
+                ) {
+                    emitAlertErrorMessage(R.string.no_alert_complications)
+                }
+                -1
+            }
+
+            otherDefect.id -> {
+                validateAllAlphabetsSpecialOnEditText(otherDefect)
+            }
+
+            reasonForNoVaccines.id -> {
+                validateAllAlphabetsSpecialOnEditText(reasonForNoVaccines)
+            }
+
+            reasonForNoVitaminK.id -> {
+                validateAllAlphabetsSpecialOnEditText(reasonForNoVitaminK)
+            }
+
+            otherCauseOfDeath.id -> {
+                validateAllAlphabetsSpecialOnEditText(otherCauseOfDeath)
+            }
+
+            else -> -1
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as InfantRegCache).let { form ->
+            form.babyName = babyName.value
+            form.infantTerm = infantTerm.value
+            form.corticosteroidGiven = corticosteroidGiven.value
+            form.outcomeAtBirth = getEnglishValueInArray(R.array.no_outcome_at_birth_array, outcomeAtBirth.value)
+
+            form.genderID = gender.value?.let { value ->
+                 gender.entries?.indexOf(value)?.plus(1)
+            }
+
+            // Map cried immediately to existing boolean field
+            val criedValue = babyCriedAtBirth.value
+            val immediateCry = resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(0)
+            val criedAfterResuscitation = resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(1)
+            form.babyCriedAtBirth = when (criedValue) {
+                immediateCry -> true
+                criedAfterResuscitation -> false
+                else -> null
+            }
+            form.resuscitation = when (criedValue) {
+                immediateCry -> false
+                criedAfterResuscitation -> true
+                else -> null
+            }
+            form.typeOfResuscitation = if (criedValue == criedAfterResuscitation) {
+                getEnglishValuesInArray(R.array.no_type_of_resuscitation_array, typeOfResuscitation.value)
+            } else {
+                null
+            }
+
+            form.referred = referred.value
+            form.hadBirthDefect = getEnglishValueInArray(R.array.no_congenital_anomaly_array, hadBirthDefect.value)
+            form.birthDefect = getEnglishValuesInArray(R.array.no_type_of_congenital_anomaly_array, birthDefect.value)
+            form.otherDefect = otherDefect.value
+            // Convert grams to kg for DB storage (existing field is in kg)
+            form.weight = weight.value?.toDoubleOrNull()?.let { it / 1000.0 }
+            form.breastFeedingStarted = breastFeedingStarted.value == "Yes"
+
+            form.newbornComplications = getEnglishValuesInArray(R.array.no_newborn_complications_array, newbornComplications.value)
+            form.currentStatusOfBaby = getEnglishValueInArray(R.array.no_current_status_array, currentStatusOfBaby.value)
+            form.causeOfDeath = getEnglishValuesInArray(R.array.no_cause_of_death_array, causeOfDeath.value)
+            form.otherCauseOfDeath = otherCauseOfDeath.value
+            form.birthDoseVaccinesGiven = getEnglishValuesInArray(R.array.no_birth_dose_vaccines_array, birthDoseVaccinesGiven.value)
+            form.reasonForNoVaccines = reasonForNoVaccines.value
+
+            form.vitaminKInjectionGiven = when (vitaminKInjectionGiven.value) {
+                resources.getString(R.string.yes) -> true
+                resources.getString(R.string.no) -> false
+                else -> null
+            }
+            form.reasonForNoVitaminK = reasonForNoVitaminK.value
+            form.birthCertificateIssued = getEnglishValueInArray(R.array.no_birth_certificate_array, birthCertificateIssued.value)
+
+            form.opv0Dose = getLongFromDate(opv0Dose.value)
+            form.bcgDose = getLongFromDate(bcgDose.value)
+            form.hepBDose = getLongFromDate(hepBDose.value)
+            form.vitkDose = getLongFromDate(vitkDose.value)
+
+            if (isStillbirthOrDiedAtBirth(form.outcomeAtBirth)) {
+                form.genderID = null
+                form.babyCriedAtBirth = null
+                form.resuscitation = null
+                form.typeOfResuscitation = null
+                form.weight = null
+                form.hadBirthDefect = null
+                form.birthDefect = null
+                form.otherDefect = null
+                form.currentStatusOfBaby = null
+                form.causeOfDeath = null
+                form.otherCauseOfDeath = null
+                form.breastFeedingStarted = null
+                form.birthDoseVaccinesGiven = null
+                form.reasonForNoVaccines = null
+                form.opv0Dose = null
+                form.bcgDose = null
+                form.hepBDose = null
+                form.vitaminKInjectionGiven = null
+                form.reasonForNoVitaminK = null
+                form.vitkDose = null
+                form.birthCertificateIssued = null
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/Dataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/Dataset.kt
index 6385f2fd8..07cd26f52 100644
--- a/app/src/main/java/org/piramalswasthya/cho/configuration/Dataset.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/Dataset.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import android.content.res.Resources
 import android.util.Range
 import androidx.annotation.StringRes
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.helpers.Languages
@@ -40,21 +42,29 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
      * Helper function to get resource instance chosen language.
      */
 
-    protected companion object {
+    companion object {
+        const val DATE_FORMAT_DD_MM_YYYY = "dd/MM/yyyy"
+
         fun getLongFromDate(dateString: String?): Long {
             val f = SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH)
             val date = dateString?.let { f.parse(it) }
             return date?.time ?: 0L
         }
 
+        fun getLongFromDate(dateString: String?, format: String): Long {
+            val f = SimpleDateFormat(format, Locale.ENGLISH)
+            val date = dateString?.let { f.parse(it) }
+            return date?.time ?: 0L
+        }
+
         fun getFinancialYear(dateString: String?): String? {
             val f = SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH)
             val date = dateString?.let { f.parse(it) }
             return date?.let {
                 if (it.month >= 3) {
-                    "" + (it.year + 1900) + " - " + (it.year + 1902)
+                    "" + (it.year + 1900) + " - " + (it.year + 1901)
                 } else {
-                    "" + (it.year + 1899) + " - " + (it.year + 1901)
+                    "" + (it.year + 1899) + " - " + (it.year + 1900)
                 }
             }
         }
@@ -75,8 +85,14 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
             cal.timeInMillis = dateLong
             val f = SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH)
             return f.format(cal.time)
+        }
 
-
+        fun getDateFromLong(dateLong: Long, format: String): String? {
+            if (dateLong == 0L) return null
+            val cal = Calendar.getInstance()
+            cal.timeInMillis = dateLong
+            val f = SimpleDateFormat(format, Locale.ENGLISH)
+            return f.format(cal.time)
         }
 
         fun getMinDateOfReg(): Long {
@@ -98,6 +114,18 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
     private val _alertErrorMessageFlow = MutableStateFlow<String?>(null)
     val alertErrorMessageFlow = _alertErrorMessageFlow.asStateFlow()
 
+    /** Signals that a specific FormElement's row needs the adapter to call
+     *  notifyItemChanged. Used when we mutate a FormElement's `value` in place
+     *  (e.g. "None" mutual exclusion) — DiffUtil cannot detect it because the
+     *  list still holds the same reference, so the fragment must force a
+     *  rebind explicitly. */
+    private val _forceRefreshIdFlow = MutableSharedFlow<Int>(extraBufferCapacity = 8)
+    val forceRefreshIdFlow = _forceRefreshIdFlow.asSharedFlow()
+
+    protected fun forceRefreshId(id: Int) {
+        _forceRefreshIdFlow.tryEmit(id)
+    }
+
     suspend fun resetErrorMessageFlow() {
         _alertErrorMessageFlow.emit(null)
     }
@@ -119,23 +147,37 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
 
     abstract fun mapValues(cacheModel: FormDataModel, pageNumber: Int = 0)
     protected fun getIndexOfElement(element: FormElement) = list.indexOf(element)
+    protected fun getFormList(): List<FormElement> = list
     suspend fun updateList(formId: Int, index: Int) {
-        list.find { it.id == formId }?.let {
+        val formElement = list.find { it.id == formId }
+        val previousErrorText = formElement?.errorText
+        formElement?.let {
             if (it.inputType == InputType.DROPDOWN) {
                 it.errorText = null
             }
         }
         val updateIndex = handleListOnValueChanged(formId, index)
-        if (updateIndex != -1) {
+        val currentErrorText = formElement?.errorText
+        val errorStateChanged = previousErrorText != currentErrorText
+        
+        // Emit list if:
+        // 1. updateIndex != -1 (list structure changed - fields added/removed), OR
+        // 2. Error state changed (for validation feedback)
+        // NOTE: We don't emit when only value changes (not error) to prevent unnecessary rebinds
+        // that could reset EditText fields while user is typing
+        if (updateIndex != -1 || errorStateChanged) {
             val newList = list.toMutableList()
-//            if (updateUIForCurrentElement) {
-//                Timber.d("Updating UI element ...")
-//                newList[updateIndex] = list[updateIndex].cloneForm()
-//                updateUIForCurrentElement = false
-//            }
-            Timber.d("Emitting ${newList}}")
-//            _listFlow.emit(emptyList())
+            Timber.d("Emitting list (updateIndex=$updateIndex, errorChanged=$errorStateChanged)")
             _listFlow.emit(newList)
+            // The list emission alone is not enough when only errorText was
+            // mutated in place: DiffUtil's areContentsTheSame compares the same
+            // FormElement reference on both sides, so the change is invisible
+            // and the row stays visually stale. Force a rebind on this row.
+            if (errorStateChanged && updateIndex == -1 && formElement?.inputType != InputType.EDIT_TEXT) {
+                forceRefreshId(formId)
+            }
+        } else {
+            Timber.d("Skipping list emission (only value changed, no structural or error changes)")
         }
     }
 
@@ -733,12 +775,14 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
         else {
             val sys = matchResult.groupValues[1].toInt()
             val dia = matchResult.groupValues[2].toInt()
-            bp.errorText = if (sys < minSys) "Systole should not be less than $minSys"
-            else if (sys > maxSys) "Systole should not be greater than $maxSys"
-            else if (dia < minDia) "Diastole should not be less then $minDia"
-            else if (dia > maxDia) "Diastole should not be greater than $maxDia"
-            else if (dia > sys) "Diastole cannot be greater than systole"
-            else null
+            bp.errorText = when {
+                sys < minSys -> "Systolic should not be less than $minSys"
+                sys > maxSys -> "Systolic should not be greater than $maxSys"
+                dia < minDia -> "Diastolic should not be less than $minDia"
+                dia > maxDia -> "Diastolic should not be greater than $maxDia"
+                dia > sys -> "Diastolic cannot be greater than systolic"
+                else -> null
+            }
         }
         return -1
 
@@ -779,18 +823,68 @@ abstract class Dataset(context: Context, currentLanguage: Languages) {
 
     fun getLocalValueInArray(arrayId: Int, entry: String?): String? {
         entry?.let {
-            return resources.getStringArray(arrayId)[englishResources.getStringArray(arrayId)
-                .indexOf(it)]
+            val englishArray = englishResources.getStringArray(arrayId)
+            val index = englishArray.indexOf(it)
+            if (index != -1) {
+                return resources.getStringArray(arrayId)[index]
+            }
+            // Value may already be in the local language — check the local array
+            val localArray = resources.getStringArray(arrayId)
+            if (localArray.contains(it)) {
+                return it
+            }
+            return it // Fallback: return the entry as-is to avoid crash
         }
         return null
     }
 
     fun getEnglishValueInArray(arrayId: Int, entry: String?): String? {
         entry?.let {
-            return englishResources.getStringArray(arrayId)[resources.getStringArray(arrayId)
-                .indexOf(it)]
+            val localArray = resources.getStringArray(arrayId)
+            val index = localArray.indexOf(it)
+            if (index != -1) {
+                return englishResources.getStringArray(arrayId)[index]
+            }
+            // Value may already be in English — check the English array
+            val englishArray = englishResources.getStringArray(arrayId)
+            if (englishArray.contains(it)) {
+                return it
+            }
+            return it // Fallback: return the entry as-is to avoid crash
         }
         return null
     }
 
-}
\ No newline at end of file
+    /**
+     * Multi-select variant of [getLocalValueInArray]. Splits a comma-separated
+     * stored value (typically what FormElement uses for CHECKBOXES) and re-localizes
+     * each item, returning a comma-joined string in the current locale.
+     */
+    fun getLocalValuesInArray(arrayId: Int, entry: String?): String? {
+        if (entry.isNullOrBlank()) return null
+        return entry.split(",")
+            .mapNotNull { raw ->
+                getLocalValueInArray(arrayId, raw.trim())?.takeIf { it.isNotBlank() }
+            }
+            .distinct()
+            .joinToString(",")
+            .takeIf { it.isNotBlank() }
+    }
+
+    /**
+     * Multi-select variant of [getEnglishValueInArray]. Splits a comma-separated
+     * displayed value and converts each item to its English canonical form so the
+     * persisted DB value is locale-neutral.
+     */
+    fun getEnglishValuesInArray(arrayId: Int, entry: String?): String? {
+        if (entry.isNullOrBlank()) return null
+        return entry.split(",")
+            .mapNotNull { raw ->
+                getEnglishValueInArray(arrayId, raw.trim())?.takeIf { it.isNotBlank() }
+            }
+            .distinct()
+            .joinToString(",")
+            .takeIf { it.isNotBlank() }
+    }
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/DeliveryOutcomeDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/DeliveryOutcomeDataset.kt
new file mode 100644
index 000000000..ad7dd3d2b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/DeliveryOutcomeDataset.kt
@@ -0,0 +1,957 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import android.widget.LinearLayout
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.helpers.getWeeksOfPregnancy
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import java.util.Calendar
+import java.util.concurrent.TimeUnit
+
+
+class DeliveryOutcomeDataset(
+    context: Context, currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    companion object {
+        private const val WEEKS_IN_PREGNANCY = 40
+        private const val DAYS_IN_WEEK = 7
+        private const val EDD_TOLERANCE_WEEKS_BEFORE = 4
+        private const val EDD_TOLERANCE_WEEKS_AFTER = 2
+        private const val POST_TERM_THRESHOLD_DAYS = 14
+        private const val PRETERM_THRESHOLD_WEEKS = 37
+        private const val EXTREMELY_PRETERM_WEEKS = 28
+        private const val VERY_PRETERM_WEEKS = 32
+        private const val POST_TERM_WEEKS = 42
+
+        // Indices in do_place_of_delivery_array
+        private const val PLACE_PRIVATE_HOSPITAL_INDEX = 6
+        private const val PLACE_HOME_DELIVERY_INDEX = 7
+        private const val PLACE_ON_THE_WAY_INDEX = 8
+
+        // Indices in do_mode_of_delivery_array
+        private const val MODE_ASSISTED_INDEX = 1
+        private const val MODE_LSCS_INDEX = 2
+        private const val MODE_EMERGENCY_LSCS_INDEX = 3
+
+        // Indices in do_delivery_conducted_by_array
+        private const val CONDUCTED_BY_DAI_TBA_INDEX = 4
+        private const val CONDUCTED_BY_FAMILY_MEMBER_INDEX = 5
+        private const val CONDUCTED_BY_SELF_INDEX = 6
+    }
+
+    // Woman Details Section (Display-only, auto-populated)
+    private val womanName = FormElement(
+        id = 100,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.do_woman_name),
+        required = false
+    )
+
+    private val womanAge = FormElement(
+        id = 101,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.do_woman_age),
+        required = false
+    )
+
+    private val caseId = FormElement(
+        id = 102,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.do_case_id),
+        required = false
+    )
+
+    // Date of Delivery (dd/MM/yyyy per JIRA MHWC-199)
+    private val dateOfDelivery = FormElement(
+        id = 1,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.do_delivery_date),
+        arrayId = -1,
+        required = true,
+        hasDependants = true,
+        max = System.currentTimeMillis(), // Cannot be future date
+        dateFormat = DATE_FORMAT_DD_MM_YYYY
+    )
+
+    // Time of Delivery (12-hour format)
+    private val timeOfDelivery = FormElement(
+        id = 2,
+        inputType = InputType.TIME_PICKER,
+        title = resources.getString(R.string.do_delivery_time),
+        arrayId = -1,
+        required = false,
+        hasDependants = true
+    )
+
+    // Gestational Age at Delivery (Auto-calculated, display-only)
+    private val gestationalAgeAtDelivery = FormElement(
+        id = 3,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.do_gestational_age_at_delivery),
+        required = false
+    )
+
+    // Place of Delivery
+    private val placeOfDelivery = FormElement(
+        id = 4,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.do_place_of_delivery),
+        entries = resources.getStringArray(R.array.do_place_of_delivery_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Private Hospital Name (Conditional)
+    private val privateHospitalName = FormElement(
+        id = 5,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.do_private_hospital_name),
+        required = false,
+        etMaxLength = 100,
+        etInputType = android.text.InputType.TYPE_CLASS_TEXT,
+        hasDependants = false
+    )
+
+    // Delivery Conducted By
+    private val deliveryConductedBy = FormElement(
+        id = 6,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.do_delivery_conducted_by),
+        entries = resources.getStringArray(R.array.do_delivery_conducted_by_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Mode of Delivery
+    private val modeOfDelivery = FormElement(
+        id = 7,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.do_mode_of_delivery),
+        entries = resources.getStringArray(R.array.do_mode_of_delivery_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Indication for LSCS/Assisted (Multi-select checkbox)
+    private val indicationForLSCS = FormElement(
+        id = 8,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.do_indication_for_lscs),
+        entries = resources.getStringArray(R.array.do_indication_for_lscs_array),
+        required = false, // Will be set to true conditionally
+        hasDependants = true
+    )
+
+    // Indication Other (Free text if "Other" selected)
+    private val indicationForLSCSOther = FormElement(
+        id = 9,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.do_indication_for_lscs_other),
+        required = false,
+        etMaxLength = 200,
+        etInputType = android.text.InputType.TYPE_CLASS_TEXT,
+        multiLine = true,
+        hasDependants = false
+    )
+
+    // Mother's Condition (post-delivery)
+    /** 4 options: use vertical layout per requirement (vertical when >2 options). */
+    private val motherCondition = FormElement(
+        id = 10,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.do_mother_condition),
+        entries = resources.getStringArray(R.array.do_mother_condition_array),
+        required = true,
+        hasDependants = true,
+        hasAlertError = true,
+        orientation = LinearLayout.VERTICAL
+    )
+
+    private val maternalComplications = FormElement(
+        id = 11,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.do_maternal_complications),
+        entries = resources.getStringArray(R.array.do_maternal_complications_array),
+        required = true,
+        hasDependants = true,
+        hasAlertError = true
+    )
+
+    /** 2 options: use horizontal layout per requirement (horizontal when ≤2 options). */
+    private val motherCurrentlyAdmitted = FormElement(
+        id = 12,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.do_mother_currently_admitted),
+        entries = resources.getStringArray(R.array.do_mother_admitted_array),
+        required = true,
+        hasDependants = true,
+        orientation = LinearLayout.HORIZONTAL
+    )
+
+    private val dateOfDischarge = FormElement(
+        id = 13,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.do_discharge_date),
+        arrayId = -1,
+        required = true,
+        hasDependants = false,
+        max = System.currentTimeMillis()
+    )
+
+    private val timeOfDischarge = FormElement(
+        id = 14,
+        inputType = InputType.TIME_PICKER,
+        title = resources.getString(R.string.do_discharge_time),
+        arrayId = -1,
+        required = false,
+        hasDependants = false
+    )
+
+    private val deliveryOutcome = FormElement(
+        id = 15,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.do_delivery_outcome),
+        required = true,
+        hasDependants = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 1,
+        max = 6,
+        min = 0,
+        refreshSiblingsOnChange = true
+    )
+
+    private val liveBirth = FormElement(
+        id = 16,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.do_live_birth),
+        required = true,
+        hasDependants = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 1,
+        max = 6,
+        min = 0,
+        refreshSiblingsOnChange = true
+    )
+
+    private val stillBirth = FormElement(
+        id = 17,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.do_still_birth),
+        required = true,
+        hasDependants = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 1,
+        max = 6,
+        min = 0,
+        refreshSiblingsOnChange = true
+    )
+
+    // Store EDD and LMP for calculations
+    private var eddDate: Long = 0L
+    private var lmpDate: Long = 0L
+    private var patientCaseId: String? = null
+    private var deliveryDateMillis: Long = 0L
+
+    /**
+     * Set up the form page with patient and pregnancy data
+     */
+    suspend fun setUpPage(
+        pwr: PregnantWomanRegistrationCache,
+        anc: PregnantWomanAncCache?,
+        saved: DeliveryOutcomeCache?,
+        patientName: String,
+        patientAge: String,
+        caseId: String
+    ) {
+        // Validate LMP date
+        if (pwr.lmpDate <= 0) {
+            throw IllegalStateException("Invalid LMP date: ${pwr.lmpDate}")
+        }
+
+        // Store LMP and calculate EDD
+        lmpDate = pwr.lmpDate
+        eddDate = getEddFromLmp(lmpDate)
+        patientCaseId = caseId
+
+        // Note: Woman name, age, and case ID are displayed in the card header,
+        // so they are not included in the form elements list
+
+        // Set date validation constraints: EDD ± 4 weeks
+        val minDate = eddDate - TimeUnit.DAYS.toMillis(EDD_TOLERANCE_WEEKS_BEFORE * DAYS_IN_WEEK.toLong())
+        val maxDate = minOf(
+            eddDate + TimeUnit.DAYS.toMillis(EDD_TOLERANCE_WEEKS_AFTER * DAYS_IN_WEEK.toLong()),
+            System.currentTimeMillis() // Cannot be future date
+        )
+        dateOfDelivery.min = maxOf(minDate, pwr.lmpDate)
+        dateOfDelivery.max = maxDate
+
+        val formElements = mutableListOf<FormElement>(
+            dateOfDelivery,
+            timeOfDelivery,
+            gestationalAgeAtDelivery,
+            placeOfDelivery,
+            deliveryConductedBy,
+            modeOfDelivery
+        )
+
+        if (saved == null) {
+            // New record - set default date to today (dd/MM/yyyy per JIRA)
+            dateOfDelivery.value = getDateFromLong(System.currentTimeMillis(), DATE_FORMAT_DD_MM_YYYY)
+            deliveryDateMillis = System.currentTimeMillis()
+            dateOfDischarge.min = deliveryDateMillis
+            // Calculate and display initial gestational age
+            updateGestationalAge(System.currentTimeMillis())
+
+            // Initialize mother condition fields
+            motherCondition.value = null
+            motherCurrentlyAdmitted.value = null
+            maternalComplications.value = null
+            dateOfDischarge.value = null
+
+            // Initialize new outcome fields
+            stillBirth.value = "0"
+            deliveryOutcome.value = null
+            liveBirth.value = null
+            timeOfDischarge.value = null
+
+            // Add mother condition fields for new records (both halves of form)
+            formElements.add(motherCondition)
+            formElements.add(motherCurrentlyAdmitted)
+
+            // Add delivery outcome fields
+            formElements.add(deliveryOutcome)
+            formElements.add(liveBirth)
+            formElements.add(stillBirth)
+        } else {
+            // Load saved values (dd/MM/yyyy per JIRA)
+            dateOfDelivery.value = saved.dateOfDelivery?.let { getDateFromLong(it, DATE_FORMAT_DD_MM_YYYY) }
+            deliveryDateMillis = saved.dateOfDelivery ?: System.currentTimeMillis()
+            dateOfDischarge.min = deliveryDateMillis
+            dateOfDischarge.max = System.currentTimeMillis()
+
+            timeOfDelivery.value = saved.timeOfDelivery
+            placeOfDelivery.value = getLocalValueInArray(
+                R.array.do_place_of_delivery_array,
+                saved.placeOfDelivery
+            )
+            deliveryConductedBy.value = getLocalValueInArray(
+                R.array.do_delivery_conducted_by_array,
+                saved.deliveryConductedBy
+            )
+            modeOfDelivery.value = getLocalValueInArray(
+                R.array.do_mode_of_delivery_array,
+                saved.modeOfDelivery
+            )
+            // saved.* dropdown fields are stored in English; re-localize for display
+            // so the user sees the form in their current UI language regardless of
+            // which language the data was originally entered in.
+            indicationForLSCS.value = getLocalValuesInArray(
+                R.array.do_indication_for_lscs_array,
+                saved.indicationForLSCS
+            )
+            indicationForLSCSOther.value = saved.indicationForLSCSOther
+            privateHospitalName.value = saved.privateHospitalName
+
+            // Load mother condition fields
+            motherCondition.value = getLocalValueInArray(
+                R.array.do_mother_condition_array,
+                saved.motherCondition
+            )
+            motherCurrentlyAdmitted.value = when (saved.motherCurrentlyAdmitted) {
+                true -> resources.getStringArray(R.array.do_mother_admitted_array)[0]
+                false -> resources.getStringArray(R.array.do_mother_admitted_array)[1]
+                null -> null
+            }
+            maternalComplications.value = getLocalValuesInArray(
+                R.array.do_maternal_complications_array,
+                saved.maternalComplications
+            )
+            dateOfDischarge.value = saved.dateOfDischarge?.let { getDateFromLong(it) }
+            timeOfDischarge.value = saved.timeOfDischarge
+            deliveryOutcome.value = saved.deliveryOutcome?.toString()
+            liveBirth.value = saved.liveBirth?.toString()
+            stillBirth.value = saved.stillBirth?.toString()
+
+            // Update gestational age for saved date
+            saved.dateOfDelivery?.let { updateGestationalAge(it) }
+
+            // Handle conditional fields based on saved values
+            handlePlaceOfDeliveryChange(placeOfDelivery.value)
+            handleModeOfDeliveryChange(modeOfDelivery.value)
+            handleDeliveryConductedByChange(deliveryConductedBy.value)
+
+            // Add mother condition fields (second half of form)
+            formElements.add(motherCondition)
+
+            // Add maternal complications if mother condition is "Complication" or "Critical"
+            val conditionIndex = resources.getStringArray(R.array.do_mother_condition_array).indexOf(motherCondition.value)
+            if (conditionIndex == 1 || conditionIndex == 2) {
+                formElements.add(maternalComplications)
+            }
+
+            // Always add admission status field
+            formElements.add(motherCurrentlyAdmitted)
+
+            // Add discharge date if mother is discharged (not currently admitted)
+            if (motherCurrentlyAdmitted.value == resources.getStringArray(R.array.do_mother_admitted_array)[1]) {
+                formElements.add(dateOfDischarge)
+                formElements.add(timeOfDischarge)
+            }
+
+            // Add delivery outcome fields at the end
+            formElements.add(deliveryOutcome)
+            formElements.add(liveBirth)
+            formElements.add(stillBirth)
+        }
+
+        setUpPage(formElements)
+    }
+
+    /**
+     * Alternative setUpPage for simpler use case (backward compatibility)
+     */
+    suspend fun setUpPage(deliveryDateMillis: Long, saved: DeliveryOutcomeCache?, isDelivered: Boolean = false) {
+        this.deliveryDateMillis = deliveryDateMillis
+        dateOfDischarge.min = deliveryDateMillis
+        dateOfDischarge.max = System.currentTimeMillis()
+        dateOfDelivery.max = System.currentTimeMillis()
+
+        val list = mutableListOf<FormElement>(
+            dateOfDelivery,
+            motherCondition,
+            motherCurrentlyAdmitted
+        )
+
+        if (saved != null) {
+            dateOfDelivery.value = saved.dateOfDelivery?.let { getDateFromLong(it) }
+            this.deliveryDateMillis = saved.dateOfDelivery ?: deliveryDateMillis
+            dateOfDelivery.min = this.deliveryDateMillis
+            dateOfDischarge.min = this.deliveryDateMillis
+
+            motherCondition.value = getLocalValueInArray(
+                R.array.do_mother_condition_array,
+                saved.motherCondition
+            )
+            motherCurrentlyAdmitted.value = when (saved.motherCurrentlyAdmitted) {
+                true -> resources.getStringArray(R.array.do_mother_admitted_array)[0]
+                false -> resources.getStringArray(R.array.do_mother_admitted_array)[1]
+                null -> null
+            }
+            maternalComplications.value = getLocalValuesInArray(
+                R.array.do_maternal_complications_array,
+                saved.maternalComplications
+            )
+            dateOfDischarge.value = saved.dateOfDischarge?.let { getDateFromLong(it) }
+            timeOfDischarge.value = saved.timeOfDischarge
+
+            val conditionIndex = resources.getStringArray(R.array.do_mother_condition_array).indexOf(motherCondition.value)
+            if (conditionIndex == 1 || conditionIndex == 2) {
+                list.add(list.indexOf(motherCondition) + 1, maternalComplications)
+            }
+            if (motherCurrentlyAdmitted.value == resources.getStringArray(R.array.do_mother_admitted_array)[1]) {
+                list.add(list.indexOf(motherCurrentlyAdmitted) + 1, dateOfDischarge)
+                list.add(list.indexOf(dateOfDischarge) + 1, timeOfDischarge)
+            }
+        } else {
+            dateOfDelivery.value = getDateFromLong(deliveryDateMillis)
+            motherCondition.value = null
+            motherCurrentlyAdmitted.value = null
+            maternalComplications.value = null
+            dateOfDischarge.value = null
+            timeOfDischarge.value = null
+        }
+
+        setUpPage(list)
+    }
+
+    /**
+     * Calculate gestational age in weeks and days format (e.g., "38w 5d")
+     */
+    private fun calculateGestationalAge(deliveryDate: Long): String {
+        if (lmpDate <= 0) return "NA"
+
+        val daysDiff = TimeUnit.MILLISECONDS.toDays(deliveryDate - lmpDate)
+        val weeks = (daysDiff / DAYS_IN_WEEK).toInt()
+        val days = (daysDiff % DAYS_IN_WEEK).toInt()
+
+        return "${weeks}w ${days}d"
+    }
+
+    /**
+     * Get gestational age classification for alerts
+     */
+    private fun getGestationalAgeClassification(weeks: Int): String? {
+        return when {
+            weeks < EXTREMELY_PRETERM_WEEKS -> resources.getString(R.string.do_alert_extremely_preterm)
+            weeks < VERY_PRETERM_WEEKS -> resources.getString(R.string.do_alert_very_preterm)
+            weeks < PRETERM_THRESHOLD_WEEKS -> resources.getString(R.string.do_alert_moderate_preterm)
+            weeks < POST_TERM_WEEKS -> resources.getString(R.string.do_alert_term)
+            else -> resources.getString(R.string.do_alert_post_term)
+        }
+    }
+
+    /**
+     * Update gestational age display and show classification alert
+     */
+    private suspend fun updateGestationalAge(deliveryDate: Long) {
+        val gestationalAgeStr = calculateGestationalAge(deliveryDate)
+        gestationalAgeAtDelivery.value = gestationalAgeStr
+
+        if (lmpDate > 0) {
+            val weeks = TimeUnit.MILLISECONDS.toDays(deliveryDate - lmpDate).toInt() / DAYS_IN_WEEK
+
+            // Show gestational age classification alert in dialog
+            when {
+                weeks < EXTREMELY_PRETERM_WEEKS -> emitAlertErrorMessage(R.string.do_alert_extremely_preterm)
+                weeks < VERY_PRETERM_WEEKS -> emitAlertErrorMessage(R.string.do_alert_very_preterm)
+                weeks < PRETERM_THRESHOLD_WEEKS -> emitAlertErrorMessage(R.string.do_alert_moderate_preterm)
+                weeks < POST_TERM_WEEKS -> emitAlertErrorMessage(R.string.do_alert_term)
+                else -> emitAlertErrorMessage(R.string.do_alert_post_term)
+            }
+        }
+    }
+
+    /**
+     * Validate date of delivery against EDD constraints
+     */
+    private suspend fun validateDeliveryDate(): Boolean {
+        val deliveryDateLong = dateOfDelivery.value?.let { getLongFromDate(it, DATE_FORMAT_DD_MM_YYYY) } ?: return false
+
+        // Check if future date
+        if (deliveryDateLong > System.currentTimeMillis()) {
+            dateOfDelivery.errorText = resources.getString(R.string.do_error_future_date)
+            return false
+        }
+
+        // Check EDD ± 4 weeks constraint
+        val minAllowed = eddDate - TimeUnit.DAYS.toMillis(EDD_TOLERANCE_WEEKS_BEFORE * DAYS_IN_WEEK.toLong())
+        val maxAllowed = eddDate + TimeUnit.DAYS.toMillis(EDD_TOLERANCE_WEEKS_AFTER * DAYS_IN_WEEK.toLong())
+
+        if (deliveryDateLong < minAllowed || deliveryDateLong > maxAllowed) {
+            val minDateStr = getDateFromLong(minAllowed, DATE_FORMAT_DD_MM_YYYY) ?: ""
+            val maxDateStr = getDateFromLong(maxAllowed, DATE_FORMAT_DD_MM_YYYY) ?: ""
+            dateOfDelivery.errorText = resources.getString(
+                R.string.do_error_date_range,
+                minDateStr,
+                maxDateStr
+            )
+            return false
+        }
+
+        val daysFromEDD = TimeUnit.MILLISECONDS.toDays(deliveryDateLong - eddDate).toInt()
+        if (daysFromEDD >= POST_TERM_THRESHOLD_DAYS) {
+            emitAlertErrorMessage(R.string.do_alert_post_term_delivery)
+        }
+
+        // Check for preterm delivery (<37 weeks)
+        val weeks = TimeUnit.MILLISECONDS.toDays(deliveryDateLong - lmpDate).toInt() / DAYS_IN_WEEK
+        if (weeks < PRETERM_THRESHOLD_WEEKS) {
+            emitAlertErrorMessage(R.string.do_alert_preterm_delivery)
+        }
+
+        dateOfDelivery.errorText = null
+        return true
+    }
+
+    /**
+     * Handle place of delivery change - show alerts and enable/disable hospital name
+     */
+    private suspend fun handlePlaceOfDeliveryChange(selectedValue: String?) {
+        val placeArray = resources.getStringArray(R.array.do_place_of_delivery_array)
+        when (selectedValue) {
+            placeArray[PLACE_PRIVATE_HOSPITAL_INDEX] -> { // "Private Hospital"
+                val index = getIndexOfElement(placeOfDelivery)
+                if (index != -1 && getIndexOfElement(privateHospitalName) == -1) {
+                    triggerDependants(
+                        source = placeOfDelivery,
+                        removeItems = emptyList(),
+                        addItems = listOf(privateHospitalName),
+                        position = index + 1
+                    )
+                }
+                privateHospitalName.isEnabled = true
+            }
+            placeArray[PLACE_HOME_DELIVERY_INDEX] -> { // "Home delivery"
+                if (getIndexOfElement(privateHospitalName) != -1) {
+                    triggerDependants(
+                        source = placeOfDelivery,
+                        removeItems = listOf(privateHospitalName),
+                        addItems = emptyList()
+                    )
+                    privateHospitalName.value = null
+                }
+                emitAlertErrorMessage(R.string.do_alert_home_delivery)
+            }
+            placeArray[PLACE_ON_THE_WAY_INDEX] -> { // "On the way to facility"
+                if (getIndexOfElement(privateHospitalName) != -1) {
+                    triggerDependants(
+                        source = placeOfDelivery,
+                        removeItems = listOf(privateHospitalName),
+                        addItems = emptyList()
+                    )
+                    privateHospitalName.value = null
+                }
+                emitAlertErrorMessage(R.string.do_alert_on_the_way)
+            }
+            else -> {
+                if (getIndexOfElement(privateHospitalName) != -1) {
+                    triggerDependants(
+                        source = placeOfDelivery,
+                        removeItems = listOf(privateHospitalName),
+                        addItems = emptyList()
+                    )
+                    privateHospitalName.value = null
+                }
+            }
+        }
+    }
+
+    /**
+     * Handle mode of delivery change - enable/disable indication field
+     */
+    private suspend fun handleModeOfDeliveryChange(selectedValue: String?) {
+        val modeArray = resources.getStringArray(R.array.do_mode_of_delivery_array)
+        val requiresIndication = selectedValue == modeArray[MODE_ASSISTED_INDEX] || // "Vacuum/ Forceps Assisted"
+                selectedValue == modeArray[MODE_LSCS_INDEX] || // "Lower Segment Cesarean Section (LSCS)"
+                selectedValue == modeArray[MODE_EMERGENCY_LSCS_INDEX] // "Emergency LSCS"
+
+        if (requiresIndication) {
+            indicationForLSCS.required = true
+            val index = getIndexOfElement(modeOfDelivery)
+            if (index != -1 && getIndexOfElement(indicationForLSCS) == -1) {
+                triggerDependants(
+                    source = modeOfDelivery,
+                    removeItems = emptyList(),
+                    addItems = listOf(indicationForLSCS),
+                    position = index + 1
+                )
+            }
+        } else {
+            indicationForLSCS.required = false
+            val removeItems = mutableListOf<FormElement>()
+            if (getIndexOfElement(indicationForLSCS) != -1) {
+                removeItems.add(indicationForLSCS)
+                indicationForLSCS.value = null
+                indicationForLSCS.errorText = null
+            }
+            if (getIndexOfElement(indicationForLSCSOther) != -1) {
+                removeItems.add(indicationForLSCSOther)
+                indicationForLSCSOther.value = null
+            }
+            if (removeItems.isNotEmpty()) {
+                triggerDependants(
+                    source = modeOfDelivery,
+                    removeItems = removeItems,
+                    addItems = emptyList()
+                )
+            }
+        }
+    }
+
+    /** Indices in do_delivery_conducted_by_array for unskilled delivery (Dai/TBA, Family member, Self/Unassisted). */
+    private val unskilledDeliveryConductedByIndices = setOf(
+        CONDUCTED_BY_DAI_TBA_INDEX,
+        CONDUCTED_BY_FAMILY_MEMBER_INDEX,
+        CONDUCTED_BY_SELF_INDEX
+    )
+
+    /**
+     * Handle delivery conducted by change - show alert for unskilled delivery.
+     * Prefers actual value (deliveryConductedBy.value set by adapter) for reliability;
+     * index/selectedValue used as fallback (e.g. when loading saved record).
+     */
+    private suspend fun handleDeliveryConductedByChange(selectedValue: String?, selectedIndex: Int? = null) {
+        val valueToCheck = deliveryConductedBy.value?.trim() ?: selectedValue?.trim()
+        val shouldAlert = when {
+            valueToCheck != null -> {
+                val conductedByArray = resources.getStringArray(R.array.do_delivery_conducted_by_array)
+                val unskilledOptions = listOf(
+                    conductedByArray[CONDUCTED_BY_DAI_TBA_INDEX], // "Dai/TBA (Traditional Birth Attendant)"
+                    conductedByArray[CONDUCTED_BY_FAMILY_MEMBER_INDEX], // "Family member"
+                    conductedByArray[CONDUCTED_BY_SELF_INDEX]  // "Self/Unassisted"
+                )
+                valueToCheck in unskilledOptions.map { it.trim() }
+            }
+            selectedIndex != null -> selectedIndex in unskilledDeliveryConductedByIndices
+            else -> false
+        }
+        if (shouldAlert) {
+            emitAlertErrorMessage(R.string.do_alert_unskilled_delivery)
+        }
+    }
+
+    /**
+     * Handle indication for LSCS change - enable/disable "Other" text field
+     */
+    private suspend fun handleIndicationForLSCSChange() {
+        val indicationArray = resources.getStringArray(R.array.do_indication_for_lscs_array)
+        val otherOption = indicationArray[indicationArray.size - 1] // "Other (specify)"
+
+        if (indicationForLSCS.value?.contains(otherOption) == true) {
+            indicationForLSCSOther.required = true
+            val index = getIndexOfElement(indicationForLSCS)
+            if (index != -1 && getIndexOfElement(indicationForLSCSOther) == -1) {
+                triggerDependants(
+                    source = indicationForLSCS,
+                    removeItems = emptyList(),
+                    addItems = listOf(indicationForLSCSOther),
+                    position = index + 1
+                )
+            }
+        } else {
+            indicationForLSCSOther.required = false
+            if (getIndexOfElement(indicationForLSCSOther) != -1) {
+                triggerDependants(
+                    source = indicationForLSCS,
+                    removeItems = listOf(indicationForLSCSOther),
+                    addItems = emptyList()
+                )
+                indicationForLSCSOther.value = null
+                indicationForLSCSOther.errorText = null
+            }
+        }
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            dateOfDelivery.id -> handleDateOfDeliveryChange()
+            timeOfDelivery.id -> -1
+            placeOfDelivery.id -> {
+                val selectedValue = placeOfDelivery.entries?.getOrNull(index)
+                placeOfDelivery.value = selectedValue
+                handlePlaceOfDeliveryChange(selectedValue)
+                getIndexOfElement(placeOfDelivery)
+            }
+            deliveryConductedBy.id -> {
+                val selectedValue = deliveryConductedBy.entries?.getOrNull(index)
+                deliveryConductedBy.value = selectedValue
+                handleDeliveryConductedByChange(selectedValue, index)
+                -1
+            }
+            modeOfDelivery.id -> {
+                val selectedValue = modeOfDelivery.entries?.getOrNull(index)
+                modeOfDelivery.value = selectedValue
+                handleModeOfDeliveryChange(selectedValue)
+                getIndexOfElement(modeOfDelivery)
+            }
+            indicationForLSCS.id -> handleIndicationForLSCSValidation()
+            indicationForLSCSOther.id -> handleIndicationForLSCSOtherValidation()
+            privateHospitalName.id -> -1
+            motherCondition.id -> handleMotherConditionChange(index)
+            motherCurrentlyAdmitted.id -> handleMotherAdmittedChange(index)
+            dateOfDischarge.id -> handleDateOfDischargeValidation()
+            maternalComplications.id -> handleMaternalComplicationsValidation()
+            deliveryOutcome.id -> validateDeliveryOutcome(deliveryOutcome)
+            liveBirth.id -> validateDeliveryOutcome(liveBirth)
+            stillBirth.id -> validateDeliveryOutcome(stillBirth)
+            else -> -1
+        }
+    }
+
+    private suspend fun handleDateOfDeliveryChange(): Int {
+        if (validateDeliveryDate()) {
+            getLongFromDate(dateOfDelivery.value, DATE_FORMAT_DD_MM_YYYY)?.let {
+                updateGestationalAge(it)
+                deliveryDateMillis = it
+                dateOfDischarge.min = it
+                // Re-validate discharge date: if set and now before new delivery date, show error
+                dateOfDischarge.value?.let { dischargeStr ->
+                    val dischargeLong = getLongFromDate(dischargeStr)
+                    dateOfDischarge.errorText = if (dischargeLong != 0L && dischargeLong < deliveryDateMillis) {
+                        resources.getString(R.string.do_discharge_date_before_delivery)
+                    } else null
+                }
+            }
+        }
+        return -1
+    }
+
+    private suspend fun handleIndicationForLSCSValidation(): Int {
+        handleIndicationForLSCSChange()
+        // Validate indication is selected if required
+        if (indicationForLSCS.required && indicationForLSCS.value.isNullOrBlank()) {
+            indicationForLSCS.errorText = resources.getString(R.string.do_error_indication_required)
+        } else {
+            indicationForLSCS.errorText = null
+        }
+        return getIndexOfElement(indicationForLSCS)
+    }
+
+    private fun handleIndicationForLSCSOtherValidation(): Int {
+        val value = indicationForLSCSOther.value?.trim()
+        if (indicationForLSCSOther.required && value.isNullOrBlank()) {
+            indicationForLSCSOther.errorText = resources.getString(R.string.do_error_indication_other_required)
+        } else {
+            indicationForLSCSOther.errorText = null
+        }
+        return -1
+    }
+
+    private suspend fun handleMotherConditionChange(index: Int): Int {
+        maternalComplications.value = null
+        maternalComplications.errorText = null
+        return when (index) {
+            0, 3 -> { // Healthy/Stable or Maternal Death
+                triggerDependants(
+                    source = motherCondition,
+                    removeItems = listOf(maternalComplications),
+                    addItems = emptyList()
+                )
+                getIndexOfElement(motherCondition)
+            }
+            1, 2 -> { // Complication or Critical
+                val currentIndex = getIndexOfElement(motherCondition)
+                triggerDependants(
+                    source = motherCondition,
+                    removeItems = emptyList(),
+                    addItems = listOf(maternalComplications),
+                    position = if (currentIndex != -1) currentIndex + 1 else -1
+                )
+                getIndexOfElement(motherCondition)
+            }
+            else -> -1
+        }
+    }
+
+    private suspend fun handleMotherAdmittedChange(index: Int): Int {
+        dateOfDischarge.value = null
+        dateOfDischarge.errorText = null
+        timeOfDischarge.value = null
+        timeOfDischarge.errorText = null
+        val result = triggerDependants(
+            source = motherCurrentlyAdmitted,
+            passedIndex = index,
+            triggerIndex = 1, // Index 1 = "No (Discharged)"
+            target = listOf(dateOfDischarge, timeOfDischarge)
+        )
+        return result
+    }
+
+    private fun handleDateOfDischargeValidation(): Int {
+        dateOfDischarge.value?.let { dateStr ->
+            val dischargeLong = getLongFromDate(dateStr)
+            dateOfDischarge.errorText = if (dischargeLong != 0L && dischargeLong < deliveryDateMillis) {
+                resources.getString(R.string.do_discharge_date_before_delivery)
+            } else null
+        } ?: run { dateOfDischarge.errorText = null }
+        return -1
+    }
+
+    private fun handleMaternalComplicationsValidation(): Int {
+        if (!maternalComplications.value.isNullOrBlank()) {
+            maternalComplications.errorText = null
+        }
+        return -1
+    }
+
+    /**
+     * Validate delivery outcome fields: ensures deliveryOutcome = liveBirth + stillBirth
+     */
+    private fun validateDeliveryOutcome(formElement: FormElement): Int {
+        formElement.errorText = formElement.value?.takeIf { it.isNotEmpty() }?.toLongOrNull()?.let {
+            formElement.min?.let { min ->
+                formElement.max?.let { max ->
+                    if (it < min) {
+                        resources.getString(
+                            R.string.form_input_min_limit_error, formElement.title, min
+                        )
+                    } else if (it > max) {
+                        resources.getString(
+                            R.string.form_input_max_limit_error, formElement.title, max
+                        )
+                    } else null
+                }
+            }
+        }
+
+        if (!liveBirth.value.isNullOrEmpty() && !stillBirth.value.isNullOrEmpty() &&
+            !deliveryOutcome.value.isNullOrEmpty() && formElement.errorText.isNullOrEmpty()
+        ) {
+            if (deliveryOutcome.value!!.toInt() != liveBirth.value!!.toInt() + stillBirth.value!!.toInt()) {
+                formElement.errorText =
+                    "Outcome of Delivery should be equal to sum of Live and Still births"
+            } else {
+                deliveryOutcome.errorText = null
+                liveBirth.errorText = null
+                stillBirth.errorText = null
+            }
+        }
+
+        if (!deliveryOutcome.value.isNullOrEmpty()) {
+            stillBirth.max = deliveryOutcome.value?.toLongOrNull()
+            liveBirth.max = deliveryOutcome.value?.toLongOrNull()
+        }
+        return -1
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        val form = cacheModel as DeliveryOutcomeCache
+        val admittedYes = resources.getStringArray(R.array.do_mother_admitted_array)[0]
+        val conditionMaternalDeath = resources.getStringArray(R.array.do_mother_condition_array)[3]
+
+        // Map delivery details fields. Persist every dropdown / radio / checkbox
+        // value in its English canonical form so the DB stays locale-neutral.
+        // Display-time localization is handled in setUpPage.
+        form.dateOfDelivery = getLongFromDate(dateOfDelivery.value, DATE_FORMAT_DD_MM_YYYY)?.takeIf { it != 0L } ?: deliveryDateMillis
+        form.timeOfDelivery = timeOfDelivery.value
+        form.placeOfDelivery = getEnglishValueInArray(R.array.do_place_of_delivery_array, placeOfDelivery.value)
+        form.modeOfDelivery = getEnglishValueInArray(R.array.do_mode_of_delivery_array, modeOfDelivery.value)
+        form.deliveryConductedBy = getEnglishValueInArray(R.array.do_delivery_conducted_by_array, deliveryConductedBy.value)
+        form.gestationalAgeAtDelivery = gestationalAgeAtDelivery.value
+        form.indicationForLSCS = getEnglishValuesInArray(R.array.do_indication_for_lscs_array, indicationForLSCS.value)
+        form.indicationForLSCSOther = indicationForLSCSOther.value
+        form.privateHospitalName = privateHospitalName.value
+
+        // Map mother condition fields
+        form.motherCondition = getEnglishValueInArray(R.array.do_mother_condition_array, motherCondition.value)
+        form.maternalComplications = getEnglishValuesInArray(R.array.do_maternal_complications_array, maternalComplications.value)?.takeIf { s -> s.isNotBlank() }
+        form.motherCurrentlyAdmitted = motherCurrentlyAdmitted.value == admittedYes
+        form.dateOfDischarge = dateOfDischarge.value?.let { getLongFromDate(it) }.takeIf { it != 0L }
+        form.timeOfDischarge = timeOfDischarge.value
+        form.deliveryOutcome = deliveryOutcome.value?.toIntOrNull()
+        form.liveBirth = liveBirth.value?.toIntOrNull()
+        form.stillBirth = stillBirth.value?.toIntOrNull()
+        // motherCondition.value is local; conditionMaternalDeath is also local — same-locale compare.
+        form.isDeath = motherCondition.value == conditionMaternalDeath
+        if (form.isDeath == true) {
+            form.isDeathValue = "Maternal Death"
+        }
+    }
+
+    /** Index of Maternal Complications element (for showing intensive PNC / hysterectomy alerts). */
+    fun getIndexOfMaternalComplications() = getIndexById(maternalComplications.id)
+
+    /** True if Mother's Condition is Complication (specify) or Critical/ICU. */
+    fun isComplicationOrCritical(): Boolean {
+        val v = motherCondition.value ?: return false
+        val arr = resources.getStringArray(R.array.do_mother_condition_array)
+        return v == arr.getOrNull(1) || v == arr.getOrNull(2)
+    }
+
+    /** True if Mother's Condition is Maternal Death. */
+    fun isMaternalDeath(): Boolean {
+        val v = motherCondition.value ?: return false
+        return v == resources.getStringArray(R.array.do_mother_condition_array).getOrNull(3)
+    }
+
+    /** True if selected complications include PPH or Uterine rupture (intensive PNC alert). */
+    fun hasPphOrUterineRupture(): Boolean {
+        val raw = maternalComplications.value ?: return false
+        val pph = resources.getStringArray(R.array.do_maternal_complications_array).getOrNull(0) ?: "Post-Partum Hemorrhage (PPH)"
+        val uterine = resources.getStringArray(R.array.do_maternal_complications_array).getOrNull(4) ?: "Uterine rupture"
+        return raw.contains(pph) || raw.contains(uterine)
+    }
+
+    /** True if Hysterectomy performed is selected (family planning / EC update). */
+    fun hasHysterectomy(): Boolean {
+        val raw = maternalComplications.value ?: return false
+        val hyst = resources.getStringArray(R.array.do_maternal_complications_array).getOrNull(8) ?: "Hysterectomy performed"
+        return raw.contains(hyst)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/EarDiagnosisDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/EarDiagnosisDataset.kt
new file mode 100644
index 000000000..6a842c7e5
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/EarDiagnosisDataset.kt
@@ -0,0 +1,262 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+
+class EarDiagnosisDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private lateinit var cache: EarDiagnosisAssessment
+
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val optionYes = context.getString(R.string.yes_option)
+    private val optionNo = context.getString(R.string.no_option)
+
+    private val difficultyHearing = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.ear_difficulty_hearing),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasDependants = true
+    )
+
+    private val whisperTestResponse = FormElement(
+        id = 2,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.ear_whisper_test_response),
+        entries = arrayOf(
+            context.getString(R.string.ear_whisper_correct),
+            context.getString(R.string.ear_whisper_incorrect)
+        ),
+        required = true
+    )
+
+    private val hearingTestOutcome = FormElement(
+        id = 3,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.ear_hearing_test_outcome),
+        entries = arrayOf(
+            context.getString(R.string.ear_hearing_normal),
+            context.getString(R.string.ear_hearing_slight_loss),
+            context.getString(R.string.ear_hearing_moderate),
+            context.getString(R.string.ear_hearing_severe),
+            context.getString(R.string.ear_hearing_deaf)
+        ),
+        required = true,
+        hasAlertError = true
+    )
+
+    private val earPain = FormElement(
+        id = 4,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.ear_pain),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val earDischarge = FormElement(
+        id = 5,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.ear_discharge_present),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val optionForeignBodySuperficial = context.getString(R.string.ear_foreign_body_superficial)
+    private val optionForeignBodyDeep = context.getString(R.string.ear_foreign_body_deep)
+
+    private val foreignBody = FormElement(
+        id = 6,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.ear_foreign_body),
+        entries = arrayOf(optionForeignBodySuperficial, optionForeignBodyDeep, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val earConditionType = FormElement(
+        id = 7,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.ear_condition_type),
+        entries = arrayOf(
+            context.getString(R.string.ear_otomycosis),
+            context.getString(R.string.ear_otitis_externa),
+            context.getString(R.string.ear_acute_discharge),
+            context.getString(R.string.ear_chronic_discharge),
+            context.getString(R.string.ear_wax)
+        ),
+        required = false
+    )
+
+    private val congenitalMalformation = FormElement(
+        id = 8,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.ear_congenital_malformation),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+
+    suspend fun setUpPage(savedRecord: EarDiagnosisAssessment?) {
+        cache = savedRecord ?: createDefaultCache()
+
+        populateFromCache(cache)
+
+        val list = mutableListOf<FormElement>()
+        list.add(difficultyHearing)
+
+        if (difficultyHearing.value == optionYes) {
+            list.add(whisperTestResponse)
+            list.add(hearingTestOutcome)
+        }
+
+        list.addAll(
+            listOf(
+                earPain,
+                earDischarge,
+                foreignBody,
+                earConditionType,
+                congenitalMalformation
+            )
+        )
+
+        setUpPage(list)
+    }
+
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+
+            difficultyHearing.id -> {
+                if (index == 0) {
+                    triggerDependants(
+                        source = difficultyHearing,
+                        addItems = listOf(whisperTestResponse, hearingTestOutcome),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    whisperTestResponse.value = null
+                    hearingTestOutcome.value = null
+                    triggerDependants(
+                        source = difficultyHearing,
+                        addItems = emptyList(),
+                        removeItems = listOf(whisperTestResponse, hearingTestOutcome)
+                    )
+                }
+                difficultyHearing.id
+            }
+
+            hearingTestOutcome.id -> {
+                val normalOption = context.getString(R.string.ear_hearing_normal)
+                if (hearingTestOutcome.value != normalOption) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.ear_alert_abnormal_hearing)
+                    )
+                }
+                -1
+            }
+            foreignBody.id -> {
+                if (foreignBody.value == optionForeignBodyDeep) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.ear_alert_deep_foreign_body)
+                    )
+                }
+                -1
+            }
+            congenitalMalformation.id -> {
+                if (congenitalMalformation.value == optionYes) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.ear_alert_congenital_malformation)
+                    )
+                }
+                -1
+            }
+        else -> -1
+        }
+    }
+
+    private fun createDefaultCache(): EarDiagnosisAssessment {
+        return EarDiagnosisAssessment(
+            patientId = "",
+            benVisitNo = null
+        )
+    }
+
+    private fun populateFromCache(cache: EarDiagnosisAssessment) {
+        difficultyHearing.value = when (cache.difficultyHearing) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        whisperTestResponse.value = cache.whisperTestResponse
+        hearingTestOutcome.value = cache.hearingTestOutcome
+        earPain.value = when (cache.earPain) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        earDischarge.value = when (cache.earDischargePresent) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        foreignBody.value = cache.foreignBodyInEar
+        earConditionType.value = cache.earConditionType
+
+        congenitalMalformation.value = when (cache.congenitalEarMalformation) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+    }
+
+
+
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as EarDiagnosisAssessment).let {
+
+            it.difficultyHearing = when (difficultyHearing.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            it.whisperTestResponse = whisperTestResponse.value
+            it.hearingTestOutcome = hearingTestOutcome.value
+            it.earPain = when (earPain.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.earDischargePresent = when (earDischarge.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            it.foreignBodyInEar = foreignBody.value
+            it.earConditionType = earConditionType.value
+
+            it.congenitalEarMalformation = when (congenitalMalformation.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/ElderlyHealthAssessmentDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/ElderlyHealthAssessmentDataset.kt
new file mode 100644
index 000000000..e265cef68
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/ElderlyHealthAssessmentDataset.kt
@@ -0,0 +1,724 @@
+package org.piramalswasthya.cho.configuration
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+
+
+class ElderlyHealthAssessmentDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : ReferralFollowUpDataset(context, currentLanguage) {
+
+    private lateinit var cache: ElderlyHealthAssessment
+
+    private var patientAge: Int? = null
+
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val optionYes = context.getString(R.string.yes_option)
+    private val optionNo = context.getString(R.string.no_option)
+    private val optionIndependent = context.getString(R.string.elderly_independent)
+    private val optionDependent = context.getString(R.string.elderly_dependent)
+
+    private val optionNoDecline = context.getString(R.string.elderly_status_no_decline)
+    private val optionPartialDependence = context.getString(R.string.elderly_status_partial_dependence)
+    private val optionFunctionalDependence = context.getString(R.string.elderly_status_functional_dependence)
+    private val optionHighlyDependent = context.getString(R.string.elderly_status_highly_dependent)
+    private val optionUnknown = context.getString(R.string.elderly_status_unknown)
+
+    private val optionSuspected = context.getString(R.string.elderly_outcome_suspected)
+    private val optionNotSuspected = context.getString(R.string.elderly_outcome_not_suspected)
+
+    private val geriatricComplaints = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_geriatric_complaints),
+        entries = arrayOf(optionYes, optionNo),
+        required = true
+    )
+
+    private val multipleChronicConditions = FormElement(
+        id = 2,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_multiple_chronic),
+        entries = arrayOf(optionYes),
+        required = false
+    )
+
+    private val recentFalls = FormElement(
+        id = 3,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_recent_falls),
+        entries = arrayOf(optionYes),
+        required = false
+    )
+
+    private val difficultyWalkingBalance = FormElement(
+        id = 4,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_difficulty_walking),
+        entries = arrayOf(optionYes),
+        required = false
+    )
+
+    private val visualHearingDifficulty = FormElement(
+        id = 5,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_visual_hearing),
+        entries = arrayOf(optionYes),
+        required = false
+    )
+
+    private val functionalDecline = FormElement(
+        id = 6,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_functional_decline),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasAlertError = true,
+        hasDependants = true
+    )
+
+    // ADL Assessment Fields
+    private val functionalassesmentHeadline = FormElement(
+        id = 32,
+        inputType = InputType.HEADLINE,
+        title = context.getString(R.string.elderly_functional_assessment_headline),
+        required = false
+    )
+    private var bathing = FormElement(
+        id = 7,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_bathing),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var dressing = FormElement(
+        id = 8,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_dressing),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var toileting = FormElement(
+        id = 9,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_toileting),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var transferring = FormElement(
+        id = 10,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_transferring),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var continence = FormElement(
+        id = 11,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_continence),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var feeding = FormElement(
+        id = 12,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_feeding),
+        entries = arrayOf(optionIndependent, optionDependent),
+        required = true,
+        hasDependants = true
+    )
+
+    private var totalScore = FormElement(
+        id = 13,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.elderly_total_score),
+        required = false
+    )
+
+    private var functionalStatus = FormElement(
+        id = 14,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.elderly_functional_status),
+        required = false
+    )
+
+    private var functionalDeclineFlag = FormElement(
+        id = 15,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.elderly_functional_decline_flag),
+        required = false
+    )
+
+    private val memoryLoss = FormElement(
+        id = 16,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.elderly_memory_loss),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasAlertError = true,
+        hasDependants = true
+    )
+
+    // ---- Section B: Dementia Screening Checklist ----
+
+    private val dementiaSectionHeadline = FormElement(
+        id = 17,
+        inputType = InputType.HEADLINE,
+        title = context.getString(R.string.elderly_dementia_headline),
+        required = false
+    )
+
+    private val dementiaMemoryLoss = FormElement(
+        id = 18,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_dementia_memory_loss),
+        entries = arrayOf(optionYes),
+        required = false,
+        hasDependants = true
+    )
+
+    private val dementiaDisorientation = FormElement(
+        id = 19,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_dementia_disorientation),
+        entries = arrayOf(optionYes),
+        required = false,
+        hasDependants = true
+    )
+
+    private val dementiaBehaviouralChanges = FormElement(
+        id = 20,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_dementia_behavioural),
+        entries = arrayOf(optionYes),
+        required = false,
+        hasDependants = true
+    )
+
+    private val dementiaSelfCareDecline = FormElement(
+        id = 21,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.elderly_dementia_self_care),
+        entries = arrayOf(optionYes),
+        required = false,
+        hasDependants = true
+    )
+
+    private var dementiaScreeningOutcome = FormElement(
+        id = 22,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.elderly_screening_outcome),
+        required = false
+    )
+
+    private var dementiaReferralRequired = FormElement(
+        id = 23,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.elderly_referral_required),
+        required = false
+    )
+
+
+    suspend fun setUpPage(
+        savedRecord: ElderlyHealthAssessment?,
+        patientAge: Int? = null
+    ) {
+        this.patientAge = patientAge
+        cache = savedRecord ?: createDefaultCache()
+
+        val list = mutableListOf<FormElement>()
+
+        populateFromCache(cache)
+
+        list.add(geriatricComplaints)
+        list.add(multipleChronicConditions)
+        list.add(recentFalls)
+        list.add(difficultyWalkingBalance)
+        list.add(visualHearingDifficulty)
+        list.add(functionalDecline)
+
+        if (functionalDecline.value == optionYes) {
+            list.addAll(getADLFields())
+            computeADLScore()
+        }
+
+        list.add(memoryLoss)
+
+        // Section B: Dementia Screening – enabled only if Memory loss = Yes AND age >= 60
+        if (memoryLoss.value == optionYes && patientAge != null && patientAge >= 60) {
+            list.addAll(getDementiaSectionFields())
+            computeDementiaOutcome()
+        }
+        addReferralFollowUpElements(list)
+
+        setUpPage(list)
+    }
+
+    private fun getOptionalComplaintFields(): List<FormElement> {
+        return listOf(
+            multipleChronicConditions,
+            recentFalls,
+            difficultyWalkingBalance,
+            visualHearingDifficulty
+        )
+    }
+
+    private fun getADLFields(): List<FormElement> {
+        return listOf(
+            functionalassesmentHeadline,
+            bathing,
+            dressing,
+            toileting,
+            transferring,
+            continence,
+            feeding,
+            totalScore,
+            functionalStatus,
+            functionalDeclineFlag
+        )
+    }
+
+    private fun getADLAnswerFields(): List<FormElement> {
+        return listOf(
+            bathing,
+            dressing,
+            toileting,
+            transferring,
+            continence,
+            feeding
+        )
+    }
+
+    private fun getDementiaCheckboxFields(): List<FormElement> {
+        return listOf(
+            dementiaMemoryLoss,
+            dementiaDisorientation,
+            dementiaBehaviouralChanges,
+            dementiaSelfCareDecline
+        )
+    }
+
+    private fun getDementiaSectionFields(): List<FormElement> {
+        return listOf(
+            dementiaSectionHeadline,
+            dementiaMemoryLoss,
+            dementiaDisorientation,
+            dementiaBehaviouralChanges,
+            dementiaSelfCareDecline,
+            dementiaScreeningOutcome,
+            dementiaReferralRequired
+        )
+    }
+    override val referralRequired = createReferralRequired(24)
+    override val referralLevel = createReferralLevel(25)
+    override val reasonForReferral = createReasonForReferral(26)
+    override val followUpRequired = createFollowUpRequired(27)
+    override val followUpDate = createFollowUpDate(28)
+    override val caseStatus = createCaseStatus(29)
+    override val dateOfDeath = createDateOfDeath(30)
+    override val remarks = createRemarks(31)
+
+    private suspend fun computeDementiaOutcome() {
+        val anySelected = listOf(
+            dementiaMemoryLoss,
+            dementiaDisorientation,
+            dementiaBehaviouralChanges,
+            dementiaSelfCareDecline
+        ).any { it.value == optionYes }
+
+        val newOutcomeValue = if (anySelected) optionSuspected else optionNotSuspected
+        val newReferralValue = if (anySelected) optionYes else optionNo
+
+        // Find existing indices in the actual list BEFORE updating the references
+        val oldOutcomeIndex = getIndexById(dementiaScreeningOutcome.id)
+        val oldReferralIndex = getIndexById(dementiaReferralRequired.id)
+
+        dementiaScreeningOutcome = dementiaScreeningOutcome.copy(value = newOutcomeValue)
+        dementiaReferralRequired = dementiaReferralRequired.copy(value = newReferralValue)
+
+        // If these elements are currently visible in the list, update them in place
+        // This ensures DiffUtil detects the new objects without adding duplicates
+        if (oldOutcomeIndex != -1) {
+            setUpPage(
+                mList = getFormList().toMutableList().apply {
+                    this[oldOutcomeIndex] = dementiaScreeningOutcome
+                    if (oldReferralIndex != -1) {
+                        this[oldReferralIndex] = dementiaReferralRequired
+                    }
+                }
+            )
+        }
+    }
+
+    private suspend fun computeADLScore() {
+        // Find existing indices in the actual list BEFORE updating the references
+        val oldTotalIndex = getIndexById(totalScore.id)
+        val oldStatusIndex = getIndexById(functionalStatus.id)
+        val oldFlagIndex = getIndexById(functionalDeclineFlag.id)
+
+        val adlFields = getADLAnswerFields()
+        val allAnswered = adlFields.all { !it.value.isNullOrBlank() }
+
+        if (!allAnswered) {
+            totalScore = totalScore.copy(value = null)
+            functionalStatus = functionalStatus.copy(value = null)
+            functionalDeclineFlag = functionalDeclineFlag.copy(value = null)
+        } else {
+            val scores = adlFields.map { field ->
+                when (field.value) {
+                    optionIndependent -> 1
+                    optionDependent -> 0
+                    else -> 0
+                }
+            }
+            val total = scores.sum()
+
+            val status = when (total) {
+                6 -> optionNoDecline
+                in 4..5 -> optionPartialDependence
+                in 2..3 -> optionFunctionalDependence
+                in 0..1 -> optionHighlyDependent
+                else -> optionUnknown
+            }
+
+            val flag = if (total <= 5) optionYes else optionNo
+
+            totalScore = totalScore.copy(value = total.toString())
+            functionalStatus = functionalStatus.copy(value = status)
+            functionalDeclineFlag = functionalDeclineFlag.copy(value = flag)
+        }
+
+        if (oldTotalIndex != -1) {
+            setUpPage(
+                mList = getFormList().toMutableList().apply {
+                    this[oldTotalIndex] = totalScore
+                    if (oldStatusIndex != -1) {
+                        this[oldStatusIndex] = functionalStatus
+                    }
+                    if (oldFlagIndex != -1) {
+                        this[oldFlagIndex] = functionalDeclineFlag
+                    }
+                }
+            )
+        }
+    }
+
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        val referralFollowUpResult = handleReferralFollowUpChange(formId, index)
+        if (referralFollowUpResult != -1) return referralFollowUpResult
+        return when (formId) {
+
+            functionalDecline.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(context.getString(R.string.elderly_alert_functional_decline))
+                }
+                handleFunctionalDeclineChange(index)
+            }
+
+            bathing.id, dressing.id, toileting.id, transferring.id, continence.id, feeding.id -> {
+                computeADLScore()
+                getIndexById(totalScore.id)
+            }
+
+            memoryLoss.id -> handleMemoryLossChange(index)
+
+            dementiaMemoryLoss.id,
+            dementiaDisorientation.id,
+            dementiaBehaviouralChanges.id,
+            dementiaSelfCareDecline.id -> {
+                computeDementiaOutcome()
+                getIndexById(dementiaScreeningOutcome.id)
+            }
+
+            else -> -1
+        }
+    }
+
+
+
+    private suspend fun handleMemoryLossChange(index: Int): Int {
+        if (index == 0) {
+            onShowAlert?.invoke(context.getString(R.string.elderly_alert_memory_loss))
+        }
+
+        val isEligible = patientAge != null && patientAge!! >= 60
+
+        return if (index == 0 && isEligible) {
+            // Memory loss = Yes and age >= 60 → show Section B
+            triggerDependants(
+                source = memoryLoss,
+                addItems = getDementiaSectionFields(),
+                removeItems = emptyList()
+            )
+            computeDementiaOutcome()
+            memoryLoss.id
+        } else {
+            // Memory loss = No or age < 60 → hide Section B and clear values
+            getDementiaSectionFields().forEach {
+                it.value = null
+            }
+            triggerDependants(
+                source = memoryLoss,
+                addItems = emptyList(),
+                removeItems = getDementiaSectionFields()
+            )
+            memoryLoss.id
+        }
+    }
+
+    private suspend fun handleFunctionalDeclineChange(index: Int): Int {
+        return if (index == 0) {
+            // Functional decline = Yes → show ADL fields
+            triggerDependants(
+                source = functionalDecline,
+                addItems = getADLFields(),
+                removeItems = emptyList()
+            )
+            computeADLScore()
+            functionalDecline.id
+        } else {
+
+            getADLFields().forEach {
+                it.value = null
+            }
+            triggerDependants(
+                source = functionalDecline,
+                addItems = emptyList(),
+                removeItems = getADLFields()
+            )
+            functionalDecline.id
+        }
+    }
+
+    private fun createDefaultCache(): ElderlyHealthAssessment {
+        return ElderlyHealthAssessment(
+            patientId = "",
+            benVisitNo = 0,
+            geriatricComplaints = null,
+            multipleChronicConditions = null,
+            recentFalls = null,
+            difficultyWalkingBalance = null,
+            visualHearingDifficulty = null,
+            functionalDecline = null,
+            bathing = null,
+            dressing = null,
+            toileting = null,
+            transferring = null,
+            continence = null,
+            feeding = null,
+            totalScore = null,
+            functionalStatus = null,
+            functionalDeclineFlag = null,
+            memoryLoss = null,
+            dementiaMemoryLoss = null,
+            dementiaDisorientation = null,
+            dementiaBehaviouralChanges = null,
+            dementiaSelfCareDecline = null,
+            dementiaScreeningOutcome = null,
+            dementiaReferralRequired = null
+        )
+    }
+
+    private fun populateFromCache(cache: ElderlyHealthAssessment) {
+        geriatricComplaints.value = when(cache.geriatricComplaints) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        multipleChronicConditions.value =
+            if (cache.multipleChronicConditions == true) optionYes else null
+
+        recentFalls.value =
+            if (cache.recentFalls == true) optionYes else null
+
+        difficultyWalkingBalance.value =
+            if (cache.difficultyWalkingBalance == true) optionYes else null
+
+        visualHearingDifficulty.value =
+            if (cache.visualHearingDifficulty == true) optionYes else null
+
+        functionalDecline.value = when(cache.functionalDecline) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        bathing.value = when(cache.bathing) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        dressing.value = when(cache.dressing) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        toileting.value = when(cache.toileting) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        transferring.value = when(cache.transferring) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        continence.value = when(cache.continence) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        feeding.value = when(cache.feeding) {
+            1 -> optionIndependent
+            0 -> optionDependent
+            else -> null
+        }
+
+        totalScore.value = cache.totalScore?.toString()
+        functionalStatus.value = cache.functionalStatus
+        functionalDeclineFlag.value = when(cache.functionalDeclineFlag) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        memoryLoss.value = when(cache.memoryLoss) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        // Dementia fields
+        dementiaMemoryLoss.value =
+            if (cache.dementiaMemoryLoss == true) optionYes else null
+
+        dementiaDisorientation.value =
+            if (cache.dementiaDisorientation == true) optionYes else null
+
+        dementiaBehaviouralChanges.value =
+            if (cache.dementiaBehaviouralChanges == true) optionYes else null
+
+        dementiaSelfCareDecline.value =
+            if (cache.dementiaSelfCareDecline == true) optionYes else null
+
+        dementiaScreeningOutcome.value = cache.dementiaScreeningOutcome
+        dementiaReferralRequired.value = when(cache.dementiaReferralRequired) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        populateReferralFollowUpFromCache(cache)
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as ElderlyHealthAssessment).let {
+
+            it.geriatricComplaints =
+                geriatricComplaints.value == optionYes
+
+            it.multipleChronicConditions =
+                multipleChronicConditions.value == optionYes
+
+            it.recentFalls =
+                recentFalls.value == optionYes
+
+            it.difficultyWalkingBalance =
+                difficultyWalkingBalance.value == optionYes
+
+            it.visualHearingDifficulty =
+                visualHearingDifficulty.value == optionYes
+
+            it.functionalDecline =
+                functionalDecline.value == optionYes
+
+            it.bathing = when(bathing.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.dressing = when(dressing.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.toileting = when(toileting.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.transferring = when(transferring.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.continence = when(continence.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.feeding = when(feeding.value) {
+                optionIndependent -> 1
+                optionDependent -> 0
+                else -> null
+            }
+
+            it.totalScore = totalScore.value?.toIntOrNull()
+            it.functionalStatus = functionalStatus.value
+            it.functionalDeclineFlag = when (functionalDeclineFlag.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            it.memoryLoss =
+                memoryLoss.value == optionYes
+
+            // Dementia fields
+            it.dementiaMemoryLoss =
+                dementiaMemoryLoss.value == optionYes
+
+            it.dementiaDisorientation =
+                dementiaDisorientation.value == optionYes
+
+            it.dementiaBehaviouralChanges =
+                dementiaBehaviouralChanges.value == optionYes
+
+            it.dementiaSelfCareDecline =
+                dementiaSelfCareDecline.value == optionYes
+
+            it.dementiaScreeningOutcome =
+                dementiaScreeningOutcome.value
+
+            it.dementiaReferralRequired =
+                dementiaReferralRequired.value == optionYes
+            mapReferralFollowUpValues(it)
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/EligibleCoupleTrackingDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/EligibleCoupleTrackingDataset.kt
index da28d3d29..a41c32b19 100644
--- a/app/src/main/java/org/piramalswasthya/cho/configuration/EligibleCoupleTrackingDataset.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/EligibleCoupleTrackingDataset.kt
@@ -2,14 +2,11 @@ package org.piramalswasthya.cho.configuration
 
 import android.content.Context
 import org.piramalswasthya.cho.R
-import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.helpers.Languages
 import org.piramalswasthya.cho.helpers.setToStartOfTheDay
-//import org.piramalswasthya.cho.model.BenRegCache
 import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
 import org.piramalswasthya.cho.model.FormElement
 import org.piramalswasthya.cho.model.InputType
-import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.PatientDisplay
 import java.util.Calendar
 
@@ -17,15 +14,42 @@ class EligibleCoupleTrackingDataset(
     context: Context, currentLanguage: Languages
 ) : Dataset(context, currentLanguage) {
 
+    companion object {
+        // Method of Contraception indices
+        const val INDEX_SELF = 0
+        const val INDEX_ANTRA = 1
+        const val INDEX_COPPER_T = 2
+        const val INDEX_CONDOM = 3
+        const val INDEX_MALA_N = 4
+        const val INDEX_CHAYA = 5
+        const val INDEX_ECP = 6
+        const val INDEX_MALE_STERILIZATION = 7
+        const val INDEX_FEMALE_STERILIZATION = 8
+        const val INDEX_MINILAP = 9
+        const val INDEX_ANY_OTHER = 10
+
+        // ANTRA constants
+        const val ANTRA_INJECTION = "ANTRA Injection"
+        const val MALE_STERILIZATION_VAL = "Male Sterilization"
+        const val FEMALE_STERILIZATION_VAL = "Female Sterilization"
+        const val MINILAP_VAL = "MiniLap"
+        const val ANTRA_MIN_GAP_DAYS = 75
+        const val ANTRA_MAX_GAP_DAYS = 120
+
+        // Backdating limits in days
+        const val LMP_BACKDATE_LIMIT_DAYS = 180 // 6 months
+        const val STERILIZATION_BACKDATE_LIMIT_DAYS = 60 // 2 months
+        const val ANTRA_BACKDATE_LIMIT_DAYS = 60 // 2 months
+    }
+
     private var dateOfVisit = FormElement(
         id = 1,
         inputType = InputType.DATE_PICKER,
-        title = context.getString(R.string.tracking_date),
+        title = resources.getString(R.string.tracking_date),
         arrayId = -1,
         required = true,
         max = System.currentTimeMillis(),
         hasDependants = true
-
     )
 
     private val financialYear = FormElement(
@@ -41,67 +65,200 @@ class EligibleCoupleTrackingDataset(
         title = "Month",
         arrayId = R.array.visit_months,
         entries = resources.getStringArray(R.array.visit_months),
-        required = false
+        required = false,
     )
 
-    private val isPregnancyTestDone = FormElement(
+    private val lmpDate = FormElement(
         id = 4,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.lmp_date),
+        required = true,
+        max = System.currentTimeMillis(),
+        min = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_YEAR, -LMP_BACKDATE_LIMIT_DAYS)
+        }.timeInMillis
+    )
+
+    private val isPregnancyTestDone = FormElement(
+        id = 5,
         inputType = InputType.RADIO,
-        title = "Is Pregnancy Test done?",
-        entries = arrayOf("Yes", "No", "Don't Know"),
+        title = resources.getString(R.string.is_pregnancy_test_done),
+        entries = arrayOf("Yes", "No"),
         required = false,
         hasDependants = true
     )
 
     private val pregnancyTestResult = FormElement(
-        id = 5,
+        id = 6,
         inputType = InputType.RADIO,
-        title = "Pregnancy Test Result",
+        title = resources.getString(R.string.pregnancy_test_result),
         entries = arrayOf("Positive", "Negative"),
         required = true,
         hasDependants = true
     )
 
     private val isPregnant = FormElement(
-        id = 6,
+        id = 7,
         inputType = InputType.RADIO,
-        title = "Is the woman pregnant?",
-        entries = arrayOf("Yes", "No", "Don't Know"),
+        title = resources.getString(R.string.is_woman_pregnant),
+        entries = arrayOf("Yes", "No"),
         required = false,
         hasDependants = true
     )
 
     private val usingFamilyPlanning = FormElement(
-        id = 7,
+        id = 8,
         inputType = InputType.RADIO,
-        title = "Are you using Family Planning Method?",
+        title = resources.getString(R.string.using_family_planning),
         entries = arrayOf("Yes", "No"),
         required = false,
         hasDependants = true
     )
 
     private val methodOfContraception = FormElement(
-        id = 8,
+        id = 9,
         inputType = InputType.DROPDOWN,
-        title = "Method of Contraception",
+        title = resources.getString(R.string.method_of_contraception_label),
         arrayId = R.array.method_of_contraception,
         entries = resources.getStringArray(R.array.method_of_contraception),
-        required = false,
+        required = true,
         hasDependants = true
-
     )
 
     private val anyOtherMethod = FormElement(
-        id = 9,
+        id = 10,
         inputType = InputType.EDIT_TEXT,
-        title = "Any Other Method",
+        title = resources.getString(R.string.any_other_method),
         required = true,
         etInputType = android.text.InputType.TYPE_CLASS_TEXT,
         etMaxLength = 50
     )
 
+    private val antraDose = FormElement(
+        id = 11,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.antra_dose),
+        arrayId = R.array.antra_doses,
+        entries = resources.getStringArray(R.array.antra_doses),
+        required = true,
+        hasDependants = true
+    )
+
+    private val antraInjectionDate = FormElement(
+        id = 12,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.antra_injection_date),
+        required = true,
+        max = System.currentTimeMillis(),
+        min = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_YEAR, -ANTRA_BACKDATE_LIMIT_DAYS)
+        }.timeInMillis,
+        hasDependants = true
+    )
+
+    private val antraDueDate = FormElement(
+        id = 13,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.antra_due_date),
+        required = false
+    )
+
+    private val dateOfSterilization = FormElement(
+        id = 14,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.date_of_sterilization),
+        required = true,
+        max = System.currentTimeMillis(),
+        min = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_YEAR, -STERILIZATION_BACKDATE_LIMIT_DAYS)
+        }.timeInMillis
+    )
+
+    // Store number of children to filter sterilization options
+    private var numberOfChildren: Int = 0
+
+    // Store last ANTRA injection info for dose calculation
+    private var lastAntraInjectionDate: Long? = null
+    private var lastAntraDose: String? = null
 
     fun getIndexOfIsPregnant() = getIndexById(isPregnant.id)
+    fun getContraceptionMethodId() = methodOfContraception.id
+
+    fun setNumberOfChildren(count: Int) {
+        numberOfChildren = count
+        updateContraceptionOptions()
+    }
+
+    fun setLastAntraInfo(injectionDate: Long?, dose: String?) {
+        lastAntraInjectionDate = injectionDate
+        lastAntraDose = dose
+    }
+
+    private fun clearFamilyPlanningFields() {
+        usingFamilyPlanning.value = null
+        methodOfContraception.value = null
+        anyOtherMethod.value = null
+        antraDose.value = null
+        antraInjectionDate.value = null
+        antraDueDate.value = null
+        dateOfSterilization.value = null
+    }
+
+    private fun clearPregnancyFields() {
+        pregnancyTestResult.value = null
+        isPregnant.value = null
+        isPregnant.isEnabled = true
+    }
+
+    private fun updateContraceptionOptions() {
+        val allOptions = resources.getStringArray(R.array.method_of_contraception).toMutableList()
+
+        // If No. of Children = 0, hide sterilization options
+        if (numberOfChildren == 0) {
+            allOptions.removeAt(INDEX_MINILAP)
+            allOptions.removeAt(INDEX_FEMALE_STERILIZATION)
+            allOptions.removeAt(INDEX_MALE_STERILIZATION)
+        }
+
+        methodOfContraception.entries = allOptions.toTypedArray()
+    }
+
+    private fun calculateNextAntraDose(visitDate: Long): String {
+        if (lastAntraInjectionDate == null || lastAntraDose == null) {
+            return resources.getStringArray(R.array.antra_doses)[0] // 1st Dose
+        }
+
+        val daysSinceLastInjection = ((visitDate - lastAntraInjectionDate!!) / (1000 * 60 * 60 * 24)).toInt()
+
+        // If gap is more than 120 days between any 2 doses then restart from "Dose-1"
+        if (daysSinceLastInjection > ANTRA_MAX_GAP_DAYS) {
+            return resources.getStringArray(R.array.antra_doses)[0]
+        }
+
+        // Get next dose
+        val doses = resources.getStringArray(R.array.antra_doses)
+        val currentDoseIndex = doses.indexOf(lastAntraDose)
+        return if (currentDoseIndex >= 0 && currentDoseIndex < doses.size - 1) {
+            doses[currentDoseIndex + 1]
+        } else {
+            // After 10th dose, stay on 10th or loop? Usually stays/repeats.
+            doses.last()
+        }
+    }
+
+    private fun calculateAntraDueDateRange(injectionDate: Long): String {
+        val cal = Calendar.getInstance()
+        cal.timeInMillis = injectionDate
+
+        cal.add(Calendar.DAY_OF_YEAR, 76)
+        val startDate = getDateFromLong(cal.timeInMillis)
+
+        cal.timeInMillis = injectionDate
+        cal.add(Calendar.DAY_OF_YEAR, 120)
+        val endDate = getDateFromLong(cal.timeInMillis)
+
+        return "$startDate to $endDate"
+    }
 
     suspend fun setUpPage(
         ben: PatientDisplay?,
@@ -113,19 +270,14 @@ class EligibleCoupleTrackingDataset(
             dateOfVisit,
             financialYear,
             month,
+            lmpDate,
             isPregnancyTestDone,
-            isPregnant,
-//            usingFamilyPlanning,
         )
-        if (saved == null) {
-            dateOfVisit.value = getDateFromLong(System.currentTimeMillis())
-            dateOfVisit.value?.let {
-                financialYear.value = getFinancialYear(it)
-                month.value =
-                    resources.getStringArray(R.array.visit_months)[Companion.getMonth(it)!!]
-            }
 
-            dateOfVisit.min = lastTrack?.let {
+        val now = System.currentTimeMillis()
+        if (saved == null) {
+            // Set minimum date for visit (next month after last visit or registration date)
+            val minDate = lastTrack?.let {
                 Calendar.getInstance().apply {
                     timeInMillis = it.visitDate
                     val currentMonth = get(Calendar.MONTH)
@@ -139,131 +291,424 @@ class EligibleCoupleTrackingDataset(
                     setToStartOfTheDay()
                 }.timeInMillis
             } ?: dateOfReg
+
+            dateOfVisit.min = minDate
+            // Ensure max is never less than min to avoid DatePicker crash
+            dateOfVisit.max = if (now < minDate) minDate else now
+
+            // Set initial value within [min, max] range
+            val initialValue = if (now < minDate) minDate else now
+            dateOfVisit.value = getDateFromLong(initialValue)
+            dateOfVisit.value?.let {
+                financialYear.value = getFinancialYear(it)
+                month.value = resources.getStringArray(R.array.visit_months)[getMonth(it)!!]
+            }
+
+            // ANTRA dose restart alert is handled in ViewModel/Fragment level
         } else {
+            // Restore saved values
             dateOfVisit.value = getDateFromLong(saved.visitDate)
-            financialYear.value = getFinancialYear(dateString = dateOfVisit.value)
-            month.value =
-                resources.getStringArray(R.array.visit_months)[Companion.getMonth(dateOfVisit.value)!!]
+            financialYear.value = saved.financialYear ?: getFinancialYear(dateOfVisit.value)
+            month.value = saved.visitMonth ?: resources.getStringArray(R.array.visit_months)[getMonth(dateOfVisit.value)!!]
+
+            // Still refresh max to avoid stale current time
+            dateOfVisit.max = if (now < (dateOfVisit.min ?: 0L)) dateOfVisit.min else now
+
+            saved.lmpDate?.let {
+                lmpDate.value = getDateFromLong(it)
+            }
+
             isPregnancyTestDone.value = saved.isPregnancyTestDone
             if (isPregnancyTestDone.value == "Yes") {
                 list.add(list.indexOf(isPregnancyTestDone) + 1, pregnancyTestResult)
                 pregnancyTestResult.value = saved.pregnancyTestResult
+
+                if (pregnancyTestResult.value == "Positive") {
+                    list.add(isPregnant)
+                    isPregnant.value = "Yes"
+                    isPregnant.isEnabled = false
+                }
             }
-            isPregnant.value = saved.isPregnant
-            if (isPregnant.value == "No") {
-                list.add(usingFamilyPlanning)
+
+            if (isPregnancyTestDone.value == "No" || pregnancyTestResult.value == "Negative") {
+                if (!list.contains(usingFamilyPlanning)) {
+                    list.add(usingFamilyPlanning)
+                }
                 saved.usingFamilyPlanning?.let {
                     usingFamilyPlanning.value = if (it) "Yes" else "No"
                 }
-                usingFamilyPlanning.value = if (saved.usingFamilyPlanning == true) "Yes" else "No"
-                if (saved.usingFamilyPlanning == true) {
+
+                if (usingFamilyPlanning.value == "Yes") {
                     list.add(methodOfContraception)
-                    if (saved.methodOfContraception in resources.getStringArray(R.array.method_of_contraception)) {
-                        methodOfContraception.value = saved.methodOfContraception
-                    } else if (saved.methodOfContraception != null) {
-                        methodOfContraception.value =
-                            resources.getStringArray(R.array.method_of_contraception).last()
+                    methodOfContraception.value = saved.methodOfContraception
+
+                    // Handle ANTRA fields
+                    if (methodOfContraception.value == ANTRA_INJECTION) {
+                        list.add(antraDose)
+                        list.add(antraInjectionDate)
+                        list.add(antraDueDate)
+                        antraDose.value = saved.antraDose
+                        saved.antraInjectionDate?.let {
+                            antraInjectionDate.value = getDateFromLong(it)
+                            antraDueDate.value = calculateAntraDueDateRange(it)
+                        }
+                    }
+
+                    // Handle Sterilization fields
+                    if (methodOfContraception.value in listOf(MALE_STERILIZATION_VAL, FEMALE_STERILIZATION_VAL, MINILAP_VAL)) {
+                        list.add(dateOfSterilization)
+                        saved.dateOfSterilization?.let {
+                            dateOfSterilization.value = getDateFromLong(it)
+                        }
+                    }
+
+                    // Handle Any Other Method
+                    val contraceptionOptions = resources.getStringArray(R.array.method_of_contraception)
+                    if (methodOfContraception.value != null && methodOfContraception.value !in contraceptionOptions && methodOfContraception.value != ANTRA_INJECTION) {
+                        methodOfContraception.value = contraceptionOptions.last()
+                        list.add(anyOtherMethod)
+                        anyOtherMethod.value = saved.anyOtherMethod ?: saved.methodOfContraception
+                    } else if (methodOfContraception.value == contraceptionOptions.last()) {
                         list.add(anyOtherMethod)
-                        anyOtherMethod.value = saved.methodOfContraception
+                        anyOtherMethod.value = saved.anyOtherMethod
                     }
                 }
             }
-
         }
-        setUpPage(list)
 
+        setUpPage(list)
     }
 
     override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
         return when (formId) {
-            dateOfVisit.id -> {
-                financialYear.value = Companion.getFinancialYear(dateOfVisit.value)
-                month.value =
-                    resources.getStringArray(R.array.visit_months)[Companion.getMonth(dateOfVisit.value)!!]
-                -1
+            dateOfVisit.id -> handleDateOfVisitChange()
+            isPregnancyTestDone.id -> handleIsPregnancyTestDoneChange()
+            pregnancyTestResult.id -> handlePregnancyTestResultChange()
+            isPregnant.id -> handleIsPregnantChange(index)
+            usingFamilyPlanning.id -> handleUsingFamilyPlanningChange(index)
+            methodOfContraception.id -> handleMethodOfContraceptionChange()
+            antraInjectionDate.id -> handleAntraInjectionDateChange()
+            anyOtherMethod.id -> {
+                validateAllAlphabetsSpaceOnEditText(anyOtherMethod)
             }
 
-            isPregnancyTestDone.id -> {
-                isPregnant.isEnabled = true
+            else -> -1
+        }
+    }
+
+    private suspend fun handleDateOfVisitChange(): Int {
+        financialYear.value = getFinancialYear(dateOfVisit.value)
+        month.value =
+            resources.getStringArray(R.array.visit_months)[getMonth(dateOfVisit.value)!!]
+        return triggerDependants(
+            source = dateOfVisit,
+            removeItems = emptyList(),
+            addItems = listOf(financialYear, month)
+        )
+    }
+
+    private suspend fun handleIsPregnancyTestDoneChange(): Int {
+        return when (isPregnancyTestDone.value) {
+            "Yes" -> {
+                clearFamilyPlanningFields()
                 triggerDependants(
                     source = isPregnancyTestDone,
-                    passedIndex = index,
-                    triggerIndex = 0,
-                    target = pregnancyTestResult
+                    removeItems = listOf(
+                        usingFamilyPlanning,
+                        methodOfContraception,
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    ),
+                    addItems = listOf(pregnancyTestResult)
                 )
             }
 
-            pregnancyTestResult.id -> {
-                if (pregnancyTestResult.value == "Positive") {
-                    isPregnant.value = "Yes"
-                    isPregnant.isEnabled = false
-                } else {
-                    isPregnant.value = null
-                    isPregnant.isEnabled = true
-                }
-                handleListOnValueChanged(isPregnant.id, 0)
+            "No" -> {
+                clearPregnancyFields()
+                triggerDependants(
+                    source = isPregnancyTestDone,
+                    removeItems = listOf(pregnancyTestResult, isPregnant),
+                    addItems = listOf(usingFamilyPlanning)
+                )
+            }
 
+            else -> -1
+        }
+    }
+
+    private suspend fun handlePregnancyTestResultChange(): Int {
+        return when (pregnancyTestResult.value) {
+            "Positive" -> {
+                isPregnant.value = "Yes"
+                isPregnant.isEnabled = false
+                clearFamilyPlanningFields()
+                triggerDependants(
+                    source = pregnancyTestResult,
+                    removeItems = listOf(
+                        usingFamilyPlanning,
+                        methodOfContraception,
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    ),
+                    addItems = listOf(isPregnant)
+                )
             }
 
-            isPregnant.id -> {
+            "Negative" -> {
+                isPregnant.value = "No"
+                clearFamilyPlanningFields()
+                triggerDependants(
+                    source = pregnancyTestResult,
+                    removeItems = listOf(isPregnant),
+                    addItems = listOf(usingFamilyPlanning)
+                )
+            }
+
+            else -> -1
+        }
+    }
+
+    private suspend fun handleIsPregnantChange(index: Int): Int {
+        return when (isPregnant.value) {
+            "Yes" -> {
+                clearFamilyPlanningFields()
+                triggerDependants(
+                    source = isPregnant,
+                    removeItems = listOf(
+                        usingFamilyPlanning,
+                        methodOfContraception,
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    ),
+                    addItems = emptyList()
+                )
+            }
+
+            "No" -> {
                 triggerDependants(
                     source = isPregnant,
                     passedIndex = index,
                     triggerIndex = 1,
                     target = usingFamilyPlanning,
-                    targetSideEffect = listOf(methodOfContraception, anyOtherMethod)
+                    targetSideEffect = listOf(
+                        methodOfContraception,
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    )
+                )
+            }
+
+            else -> -1
+        }
+    }
+
+    private suspend fun handleUsingFamilyPlanningChange(index: Int): Int {
+        return triggerDependants(
+            source = usingFamilyPlanning,
+            passedIndex = index,
+            triggerIndex = 0,
+            target = methodOfContraception,
+            targetSideEffect = listOf(
+                anyOtherMethod,
+                antraDose,
+                antraInjectionDate,
+                antraDueDate,
+                dateOfSterilization
+            )
+        )
+    }
+
+    private suspend fun handleMethodOfContraceptionChange(): Int {
+        return when (methodOfContraception.value) {
+            ANTRA_INJECTION -> {
+                anyOtherMethod.value = null
+                dateOfSterilization.value = null
+                antraDose.value = calculateNextAntraDose(getLongFromDate(dateOfVisit.value))
+
+                val now = System.currentTimeMillis()
+                if (antraDose.value == resources.getStringArray(R.array.antra_doses)[0]) {
+                    antraInjectionDate.min = Calendar.getInstance().apply {
+                        add(Calendar.DAY_OF_YEAR, -ANTRA_BACKDATE_LIMIT_DAYS)
+                    }.timeInMillis
+                } else {
+                    antraInjectionDate.min = lastAntraInjectionDate ?: 0L
+                }
+                antraInjectionDate.max =
+                    if (now < (antraInjectionDate.min ?: 0L)) antraInjectionDate.min else now
+
+                triggerDependants(
+                    source = methodOfContraception,
+                    removeItems = listOf(anyOtherMethod, dateOfSterilization),
+                    addItems = listOf(antraDose, antraInjectionDate, antraDueDate)
                 )
             }
 
-            usingFamilyPlanning.id -> {
+            MALE_STERILIZATION_VAL, FEMALE_STERILIZATION_VAL, MINILAP_VAL -> {
+                anyOtherMethod.value = null
+                antraDose.value = null
+                antraInjectionDate.value = null
+                antraDueDate.value = null
+
+                val now = System.currentTimeMillis()
+                dateOfSterilization.max =
+                    if (now < (dateOfSterilization.min ?: 0L)) dateOfSterilization.min else now
+
                 triggerDependants(
-                    source = usingFamilyPlanning,
-                    passedIndex = index,
-                    triggerIndex = 0,
-                    target = methodOfContraception,
-                    targetSideEffect = listOf(anyOtherMethod)
+                    source = methodOfContraception,
+                    removeItems = listOf(
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate
+                    ),
+                    addItems = listOf(dateOfSterilization)
                 )
             }
 
-            methodOfContraception.id -> {
+            "Any Other Method" -> {
+                antraDose.value = null
+                antraInjectionDate.value = null
+                antraDueDate.value = null
+                dateOfSterilization.value = null
                 triggerDependants(
                     source = methodOfContraception,
-                    passedIndex = index,
-                    triggerIndex = methodOfContraception.entries!!.lastIndex,
-                    target = anyOtherMethod
+                    removeItems = listOf(
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    ),
+                    addItems = listOf(anyOtherMethod)
                 )
             }
 
-            anyOtherMethod.id -> {
-                validateAllAlphabetsSpaceOnEditText(anyOtherMethod)
+            else -> {
+                anyOtherMethod.value = null
+                antraDose.value = null
+                antraInjectionDate.value = null
+                antraDueDate.value = null
+                dateOfSterilization.value = null
+                triggerDependants(
+                    source = methodOfContraception,
+                    removeItems = listOf(
+                        anyOtherMethod,
+                        antraDose,
+                        antraInjectionDate,
+                        antraDueDate,
+                        dateOfSterilization
+                    ),
+                    addItems = emptyList()
+                )
             }
+        }
+    }
 
-            else -> -1
+    private suspend fun handleAntraInjectionDateChange(): Int {
+        antraInjectionDate.value?.let {
+            val injectionDateLong = getLongFromDate(it)
+            antraDueDate.value = calculateAntraDueDateRange(injectionDateLong)
+
+            if (antraDose.value != resources.getStringArray(R.array.antra_doses)[0] && lastAntraInjectionDate != null) {
+                val gap =
+                    ((injectionDateLong - lastAntraInjectionDate!!) / (1000 * 60 * 60 * 24)).toInt()
+                if (gap < 75 || gap > 120) {
+                    antraInjectionDate.errorText = "Gap between doses should be 75-120 days"
+                } else {
+                    antraInjectionDate.errorText = null
+                }
+            }
         }
+        return triggerDependants(
+            source = antraInjectionDate,
+            removeItems = emptyList(),
+            addItems = listOf(antraDueDate)
+        )
     }
 
     override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
         (cacheModel as EligibleCoupleTrackingCache).let { form ->
             form.visitDate = getLongFromDate(dateOfVisit.value)
+            form.financialYear = financialYear.value
+            form.visitMonth = month.value
+            form.lmpDate = lmpDate.value?.let { getLongFromDate(it) }
             form.isPregnancyTestDone = isPregnancyTestDone.value
             form.pregnancyTestResult = pregnancyTestResult.value
-            form.isPregnant = isPregnant.value
+
+            // Explicitly set isPregnant based on test status since it might be removed from the UI and cleared
+            form.isPregnant = if (pregnancyTestResult.value == "Negative" || isPregnancyTestDone.value == "No") {
+                "No"
+            } else {
+                isPregnant.value
+            }
+
             form.usingFamilyPlanning = usingFamilyPlanning.value?.let { it == "Yes" }
+
+            // Handle method of contraception
             if (methodOfContraception.value == "Any Other Method") {
                 form.methodOfContraception = anyOtherMethod.value
+                form.anyOtherMethod = anyOtherMethod.value
             } else {
                 form.methodOfContraception = methodOfContraception.value
+                form.anyOtherMethod = null
+            }
+
+            // Handle ANTRA fields
+            if (methodOfContraception.value == ANTRA_INJECTION) {
+                form.antraDose = antraDose.value
+                form.antraInjectionDate = antraInjectionDate.value?.let { getLongFromDate(it) }
+                // Save the first date of the range to database
+                form.antraDueDate = antraDueDate.value?.let {
+                    val firstDateStr = it.split(" to ")[0]
+                    getLongFromDate(firstDateStr)
+                }
+            } else {
+                form.antraDose = null
+                form.antraInjectionDate = null
+                form.antraDueDate = null
+            }
+
+            // Handle Sterilization fields
+            if (methodOfContraception.value in listOf(MALE_STERILIZATION_VAL, FEMALE_STERILIZATION_VAL, MINILAP_VAL)) {
+                form.dateOfSterilization = dateOfSterilization.value?.let { getLongFromDate(it) }
+            } else {
+                form.dateOfSterilization = null
             }
         }
     }
 
-//    fun updateBen(benRegCache: BenRegCache) {
-//        benRegCache.genDetails?.let {
-//            it.reproductiveStatus =
-//                englishResources.getStringArray(R.array.nbr_reproductive_status_array)[1]
-//            it.reproductiveStatusId = 2
-//        }
-//        if (benRegCache.processed != "N") benRegCache.processed = "U"
-//        benRegCache.syncState = SyncState.UNSYNCED
-//    }
+    fun isPregnancyPositive(): Boolean {
+        return isPregnant.value == "Yes" || pregnancyTestResult.value == "Positive"
+    }
+
+    fun shouldOpenPregnantWomanRegistration(): Boolean {
+        return pregnancyTestResult.value == "Positive" && isPregnant.value == "Yes"
+    }
+
+    fun isSterilizationSelected(): Boolean {
+        return methodOfContraception.value in listOf(MALE_STERILIZATION_VAL, FEMALE_STERILIZATION_VAL, MINILAP_VAL)
+    }
+
+    fun isAntraSelected(): Boolean {
+        return methodOfContraception.value == ANTRA_INJECTION
+    }
+
+    fun getAntraDueDate(): Long? {
+        return antraDueDate.value?.let { getLongFromDate(it) }
+    }
+
+    fun getSterilizationMethod(): String? {
+        return if (isSterilizationSelected()) methodOfContraception.value else null
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/MentalHealthScreeningDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/MentalHealthScreeningDataset.kt
new file mode 100644
index 000000000..abdcf9498
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/MentalHealthScreeningDataset.kt
@@ -0,0 +1,1865 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+import org.piramalswasthya.cho.R
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+class MentalHealthScreeningDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private lateinit var phq9Options: Array<String>
+    private lateinit var substanceFrequencyOptions: Array<String>
+    private lateinit var suicideRiskOptions: Array<String>
+    private lateinit var epilepsyDurationOptions: Array<String>
+    private lateinit var yesNoOptions: Array<String>
+    private lateinit var alcoholSystemActionOptions: Array<String>
+
+    private lateinit var phq9SeverityOptions: Array<String>
+    private lateinit var phq9SystemActionOptions: Array<String>
+    private lateinit var tobaccoOutcomeOptions: Array<String>
+    private lateinit var tobaccoSystemActionOptions: Array<String>
+    private lateinit var alcoholClassificationOptions: Array<String>
+    private lateinit var mhEdOutcomeOptions: Array<String>
+    private lateinit var mhEdReasonNeurological: String
+    private lateinit var mhSuspected: String
+    private lateinit var mhDeAddiction: String
+    private lateinit var mhDeAddictionCentre: String
+    private lateinit var mhDateFormatPattern: String
+
+    private lateinit var referralLevelDmhpOptions: Array<String>
+    private lateinit var referralLevelAlcoholOptions: Array<String>
+    private lateinit var referralLevelRbskOptions: Array<String>
+    private lateinit var referralLevelChildOptions: Array<String>
+    private lateinit var referralLevelAdultOptions: Array<String>
+    private lateinit var referralLevelStandardMhOptions: Array<String>
+
+    private lateinit var cache: MentalHealthScreeningCache
+    private var lastPhq9AlertLevel = 0
+    private var lastSuicideRiskLevel = ""
+    private var genderID: Int? = null
+    private var age: Int? = null
+    private var wasAutoReferralForced = false
+    private val _phq9AlertMessageFlow = MutableStateFlow<CharSequence?>(null)
+    val phq9AlertMessageFlow = _phq9AlertMessageFlow.asStateFlow()
+
+    init {
+        loadResourceStrings()
+    }
+
+    fun resetPhq9AlertMessageFlow() {
+        _phq9AlertMessageFlow.value = null
+    }
+
+    private fun loadResourceStrings() {
+        context.resources.apply {
+            phq9Options = getStringArray(R.array.phq9_options)
+            substanceFrequencyOptions = getStringArray(R.array.substance_frequency_options)
+            suicideRiskOptions = getStringArray(R.array.suicide_risk_options)
+            epilepsyDurationOptions = getStringArray(R.array.epilepsy_duration_options)
+            yesNoOptions = getStringArray(R.array.yes_no_options)
+            alcoholSystemActionOptions = getStringArray(R.array.alcohol_system_action_options)
+
+            phq9SeverityOptions = getStringArray(R.array.phq9_severity_options)
+            phq9SystemActionOptions = getStringArray(R.array.phq9_system_action_options)
+            tobaccoOutcomeOptions = getStringArray(R.array.mh_tobacco_outcome_options)
+            tobaccoSystemActionOptions = getStringArray(R.array.mh_tobacco_system_action_options)
+            alcoholClassificationOptions = getStringArray(R.array.mh_alcohol_classification_options)
+            mhEdOutcomeOptions = getStringArray(R.array.mh_ed_outcome_options)
+            mhEdReasonNeurological = getString(R.string.mh_ed_reason_neurological)
+
+            referralLevelDmhpOptions = getStringArray(R.array.mh_referral_level_dmhp_options)
+            referralLevelAlcoholOptions = getStringArray(R.array.mh_referral_level_alcohol_options)
+            referralLevelRbskOptions = getStringArray(R.array.mh_referral_level_rbsk_options)
+            referralLevelChildOptions = getStringArray(R.array.mh_referral_level_child_options)
+            referralLevelAdultOptions = getStringArray(R.array.mh_referral_level_adult_options)
+            referralLevelStandardMhOptions = getStringArray(R.array.mh_referral_level_standard_mh_options)
+
+            mhSuspected = getString(R.string.mh_suspected)
+            mhDeAddiction = getString(R.string.mh_de_addiction)
+            mhDeAddictionCentre = getString(R.string.mh_de_addiction_centre)
+            mhDateFormatPattern = getString(R.string.mh_date_format_pattern)
+        }
+    }
+
+
+
+    private fun createYesNoRadioWithDependantsElement(elementId: Int, titleResId: Int): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.RADIO,
+            title = context.getString(titleResId),
+            entries = yesNoOptions,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val emotionalBehaviouralConcerns: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(101, R.string.emotional_behavioural_concerns)
+    }
+
+    private val substanceUseConcerns: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(102, R.string.substance_use_concerns)
+    }
+
+    private val selfHarmSuicideThoughts: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(103, R.string.self_harm_suicide_thoughts)
+    }
+
+    // Q4
+    private val memoryLossConfusion: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(104, R.string.memory_loss_confusion)
+    }
+
+    private val seizuresFitsLoc: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(105, R.string.seizures_fits_loc)
+    }
+
+
+    private val isPostpartum: FormElement by lazy {
+        FormElement(
+            id = 106,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.postpartum_woman),
+            entries = yesNoOptions,
+            required = false,
+            hasDependants = true
+        )
+    }
+
+    private fun createHeadlineElement(elementId: Int, titleResId: Int): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.HEADLINE,
+            title = context.getString(titleResId),
+            required = false
+        )
+    }
+
+    private fun createTextViewElement(elementId: Int, titleStr: String): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.TEXT_VIEW,
+            title = titleStr,
+            required = false
+        )
+    }
+
+    private fun createDropDownElement(
+        elementId: Int,
+        titleStr: String,
+        options: Array<String>,
+        hasDependants: Boolean = false
+    ): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.DROPDOWN,
+            title = titleStr,
+            entries = options,
+            required = false,
+            hasDependants = hasDependants
+        )
+    }
+    private val mhReferralRequired: FormElement by lazy {
+        FormElement(
+            id = 107,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.mh_referral_required_title),
+            entries = yesNoOptions,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val mhReferralLevel: FormElement by lazy {
+        FormElement(
+            id = 108,
+            inputType = InputType.DROPDOWN,
+            title = context.getString(R.string.mh_referral_level_title),
+            entries = context.resources.getStringArray(R.array.mh_referral_level_options),
+            required = true
+        )
+    }
+
+    private val mhReasonForReferral: FormElement by lazy {
+        FormElement(
+            id = 109,
+            inputType = InputType.DROPDOWN,
+            title = context.getString(R.string.mh_reason_for_referral_title),
+            entries = context.resources.getStringArray(R.array.mh_reason_for_referral_options),
+            required = true
+        )
+    }
+
+    private var mhReferralDate = FormElement(
+        id = 110,
+        inputType = InputType.TEXT_VIEW,
+        title = context.getString(R.string.mh_referral_date_title),
+        required = false
+    )
+
+    // ── Follow-up & Closure fields ───────────────────────────────────
+    private val mhFollowUpRequired: FormElement by lazy {
+        FormElement(
+            id = 111,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.mh_follow_up_required_title),
+            entries = yesNoOptions,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val mhFollowUpDate: FormElement by lazy {
+        FormElement(
+            id = 112,
+            inputType = InputType.DATE_PICKER,
+            title = context.getString(R.string.mh_follow_up_date_title),
+            required = true
+        )
+    }
+
+    private val mhImprovementNoted: FormElement by lazy {
+        FormElement(
+            id = 113,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.mh_improvement_noted_title),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+
+    private val mhAdherenceToAdvice: FormElement by lazy {
+        FormElement(
+            id = 117,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.mh_adherence_to_advice_title),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+
+    private val mhRepeatPhq9Header: FormElement by lazy {
+        FormElement(
+            id = 114,
+            inputType = InputType.HEADLINE,
+            title = context.getString(R.string.mh_repeat_phq9_title),
+            required = false
+        )
+    }
+
+    private val mhReferralEscalation: FormElement by lazy {
+        FormElement(
+            id = 115,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.mh_referral_escalation_title),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+    private val mhCaseClosureReason: FormElement by lazy {
+        FormElement(
+            id = 116,
+            inputType = InputType.DROPDOWN,
+            title = context.getString(R.string.mh_case_closure_reason_title),
+            entries = context.resources.getStringArray(R.array.mh_case_closure_reason_options),
+            required = true
+        )
+    }
+
+    private val phq9Header: FormElement by lazy {
+        createHeadlineElement(200, R.string.phq9_section_title)
+    }
+
+    private fun createPhq9RadioElement(elementId: Int, titleResId: Int): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.RADIO,
+            title = context.getString(titleResId),
+            entries = phq9Options,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val phq9LittleInterest: FormElement by lazy {
+        createPhq9RadioElement(201, R.string.phq9_little_interest)
+    }
+
+    private val phq9FeelingDown: FormElement by lazy {
+        createPhq9RadioElement(202, R.string.phq9_feeling_down)
+    }
+
+    private val phq9SleepTrouble: FormElement by lazy {
+        createPhq9RadioElement(203, R.string.phq9_sleep_trouble)
+    }
+
+    private val phq9FeelingTired: FormElement by lazy {
+        createPhq9RadioElement(204, R.string.phq9_feeling_tired)
+    }
+
+    private val phq9Appetite: FormElement by lazy {
+        createPhq9RadioElement(205, R.string.phq9_appetite)
+    }
+
+    private val phq9FeelingBad: FormElement by lazy {
+        createPhq9RadioElement(206, R.string.phq9_feeling_bad)
+    }
+
+    private val phq9Concentration: FormElement by lazy {
+        createPhq9RadioElement(207, R.string.phq9_concentration)
+    }
+
+    private val phq9MovingSlowly: FormElement by lazy {
+        createPhq9RadioElement(208, R.string.phq9_moving_slowly)
+    }
+
+    private val phq9SelfHarmThoughts: FormElement by lazy {
+        createPhq9RadioElement(209, R.string.phq9_self_harm_thoughts)
+    }
+
+    private var phq9TotalScore = createTextViewElement(210, context.getString(R.string.phq9_total_score))
+
+    private var phq9DepressionSeverity = createTextViewElement(211, context.getString(R.string.mh_depression_severity))
+
+    private var phq9SystemAction = createTextViewElement(212, context.getString(R.string.mh_system_action))
+
+    private val substanceHeader: FormElement by lazy {
+        createHeadlineElement(300, R.string.substance_section_title)
+    }
+
+    private val substanceTobaccoHeader: FormElement by lazy {
+        createHeadlineElement(312, R.string.substance_tobacco_title)
+    }
+
+    private val substanceAlcoholHeader: FormElement by lazy {
+        createHeadlineElement(313, R.string.substance_alcohol_title)
+    }
+    private val substanceCurrentTobaccoUse = FormElement(
+        id = 307,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.mh_current_tobacco_use),
+        entries = yesNoOptions,
+        required = true,
+        hasDependants = true
+    )
+
+    private val substanceTobaccoType = FormElement(
+        id = 308,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.mh_tobacco_type),
+        entries = arrayOf(
+            context.getString(R.string.mh_tobacco_smoking),
+            context.getString(R.string.mh_tobacco_smokeless),
+            context.getString(R.string.mh_tobacco_both)
+        ),
+        required = true
+    )
+
+    private val substanceTobaccoFrequency = FormElement(
+        id = 309,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.mh_tobacco_frequency),
+        entries = arrayOf(
+            context.getString(R.string.mh_tobacco_occasional),
+            context.getString(R.string.mh_tobacco_daily)
+        ),
+        required = true
+    )
+
+    private var substanceTobaccoOutcome = createTextViewElement(310, context.getString(R.string.mh_tobacco_outcome))
+
+    private var substanceSystemAction = createTextViewElement(311, context.getString(R.string.mh_tobacco_system_action))
+
+    private val substanceAlcoholUse: FormElement by lazy {
+        FormElement(
+            id = 301,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.substance_alcohol_use),
+            entries = yesNoOptions,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val substanceTobaccoUse: FormElement by lazy {
+        FormElement(
+            id = 302,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.substance_tobacco_use),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+
+    private val substance_alcohol_loss: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(303, R.string.substance_alcohol_loss)
+    }
+
+    private val substanceAlcoholImpact: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(314, R.string.substance_alcohol_impact)
+    }
+
+    private val substanceAlcoholWithdrawal: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(315, R.string.substance_alcohol_withdrawal)
+    }
+
+    private val substanceAlcoholProblematic: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(316, R.string.substance_alcohol_problematic)
+    }
+
+    private val substanceOtherSpecify: FormElement by lazy {
+        FormElement(
+            id = 304,
+            inputType = InputType.EDIT_TEXT,
+            title = context.getString(R.string.substance_other_specify),
+            required = true,
+            etMaxLength = 200,
+            etInputType = android.text.InputType.TYPE_CLASS_TEXT
+        )
+    }
+
+    private val substanceAlcoholClassification = createTextViewElement(317, context.getString(R.string.substance_alcohol_classification))
+
+    // Auto-filled by the system based on the alcohol classification (see computeAlcoholClassification)
+    private val substanceAlcoholSystemAction = createTextViewElement(318, context.getString(R.string.substance_alcohol_system_action))
+
+    private val substance_alcohol_frequency: FormElement by lazy {
+        FormElement(
+            id = 305,
+            inputType = InputType.DROPDOWN,
+            title = context.getString(R.string.substance_alcohol_frequency),
+            entries = substanceFrequencyOptions,
+            required = true
+        )
+    }
+
+    private val briefInterventionGiven: FormElement by lazy {
+        FormElement(
+            id = 306,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.brief_intervention_given),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+
+
+
+    private val suicideHeader: FormElement by lazy {
+        createHeadlineElement(400, R.string.suicide_section_title)
+    }
+
+    private val suicideCurrentThoughts: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(401, R.string.suicide_current_thoughts)
+    }
+
+    private val suicidePlan: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(402, R.string.suicide_plan)
+    }
+
+    private val suicidePreviousAttempt: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(403, R.string.suicide_previous_attempt)
+    }
+
+    private val suicideHopelessness: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(404, R.string.suicide_hopelessness)
+    }
+
+    private var suicideRiskLevel = createTextViewElement(405, context.getString(R.string.suicide_risk_level))
+
+    private val suicideImmediateAssess: FormElement by lazy {
+        createYesNoRadioWithDependantsElement(406, R.string.suicide_immediate_assess)
+    }
+
+
+
+    private val dementiaHeader: FormElement by lazy {
+        createHeadlineElement(500, R.string.dementia_section_title)
+    }
+
+    private fun createEpilepsyDementiaRadioElement(elementId: Int, titleResId: Int): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.RADIO,
+            title = context.getString(titleResId),
+            entries = yesNoOptions,
+            required = true
+        )
+    }
+
+    private val dementiaProgressiveMemoryLoss: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(501, R.string.dementia_progressive_memory_loss)
+    }
+
+    private val dementiaForgettingRecent: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(502, R.string.dementia_forgetting_recent)
+    }
+
+    private val dementiaDisorientation: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(503, R.string.dementia_disorientation)
+    }
+
+    private val dementiaDailyActivities: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(504, R.string.dementia_daily_activities)
+    }
+
+    private val dementiaBehaviouralChanges: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(505, R.string.dementia_behavioural_changes)
+    }
+
+
+
+    private val epilepsyHeader: FormElement by lazy {
+        createHeadlineElement(600, R.string.epilepsy_section_title)
+    }
+
+    private val epilepsyRecurrentSeizures: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(601, R.string.epilepsy_recurrent_seizures)
+    }
+
+    private val epilepsyJerkyMovements: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(602, R.string.epilepsy_jerky_movements)
+    }
+
+    private val epilepsyTongueBite: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(603, R.string.epilepsy_tongue_bite)
+    }
+
+    private val epilepsyConfusionAfter: FormElement by lazy {
+        createEpilepsyDementiaRadioElement(604, R.string.epilepsy_confusion_after)
+    }
+
+    private val epilepsyLocDuration: FormElement by lazy {
+        FormElement(
+            id = 605,
+            inputType = InputType.DROPDOWN,
+            title = context.getString(R.string.epilepsy_loc_duration),
+            entries = epilepsyDurationOptions,
+            required = true
+        )
+    }
+    private val edChecklistHeader: FormElement by lazy {
+        createHeadlineElement(700, R.string.epilepsy_dementia_checklist_title)
+    }
+
+
+    private fun createEdCheckboxElement(elementId: Int, titleResId: Int): FormElement {
+        return FormElement(
+            id = elementId,
+            inputType = InputType.CHECKBOXES,
+            title = context.getString(titleResId),
+            entries = arrayOf(yesNoOptions[0]),
+            required = false
+        )
+    }
+
+    private val edRecurrentJerkyMovements: FormElement by lazy {
+        createEdCheckboxElement(701, R.string.ed_recurrent_jerky_movements)
+    }
+
+    private val edProgressiveMemoryLoss: FormElement by lazy {
+        createEdCheckboxElement(702, R.string.ed_progressive_memory_loss)
+    }
+
+    private val edConfusionDisorientation: FormElement by lazy {
+        createEdCheckboxElement(703, R.string.ed_confusion_disorientation)
+    }
+
+    private val edFunctionalDecline: FormElement by lazy {
+        createEdCheckboxElement(704, R.string.ed_functional_decline)
+    }
+
+    private val edAge60Years: FormElement by lazy {
+        FormElement(
+            id = 714,
+            inputType = InputType.TEXT_VIEW,
+            title = context.getString(R.string.ed_age_60_years),
+            entries = yesNoOptions,
+            required = false,
+            isEnabled = false
+
+        )
+    }
+
+    private var edScreeningOutcome = createTextViewElement(705, context.getString(R.string.ed_screening_outcome))
+
+    private val edReferralRequired: FormElement by lazy {
+        FormElement(
+            id = 706,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.ed_referral_required),
+            entries = yesNoOptions,
+            required = false
+        )
+    }
+    private var edReason = createTextViewElement(715, context.getString(R.string.ed_reason))
+    private val edRecurrentEpisodeloss: FormElement by lazy {
+        createEdCheckboxElement(707, R.string.ed_edRecurrentEpisodeloss)
+    }
+    private val edConfusionordrowsiness: FormElement by lazy {
+        createEdCheckboxElement(713, R.string.ed_edConfusionordrowsiness)
+    }
+
+    private val edPsychosocialIntervention: FormElement by lazy {
+        FormElement(
+            id = 708,
+            inputType = InputType.RADIO,
+            title = context.getString(R.string.ed_psychosocial_intervention_provided),
+            entries = yesNoOptions,
+            required = true,
+            hasDependants = true
+        )
+    }
+
+    private val edInterventionType: FormElement by lazy {
+        FormElement(
+            id = 709,
+            inputType = InputType.CHECKBOXES,
+            title = context.getString(R.string.ed_intervention_type),
+            entries = arrayOf(
+                context.getString(R.string.mh_intervention_psychoeducation),
+                context.getString(R.string.mh_intervention_counselling),
+                context.getString(R.string.mh_intervention_stress_mgmt),
+                context.getString(R.string.mh_intervention_family_counselling)
+            ),
+            required = true
+        )
+    }
+
+    private val edSessionDate: FormElement by lazy {
+        FormElement(
+            id = 710,
+            inputType = InputType.DATE_PICKER,
+            title = context.getString(R.string.ed_session_date),
+            required = true
+        )
+    }
+
+    private val edDurationMinutes: FormElement by lazy {
+        FormElement(
+            id = 711,
+            inputType = InputType.EDIT_TEXT,
+            title = context.getString(R.string.ed_duration_minutes),
+            required = true,
+            etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+            min = 10,
+            max = 60
+        )
+    }
+
+    private val edRemarks: FormElement by lazy {
+        FormElement(
+            id = 712,
+            inputType = InputType.EDIT_TEXT,
+            title = context.getString(R.string.ed_remarks),
+            required = false,
+            etMaxLength = 250
+        )
+    }
+
+
+
+
+    // ── Setup Page ───────────────────────────────────────────────────
+
+    suspend fun setUpPage(
+        savedRecord: MentalHealthScreeningCache?,
+        isPostpartumFromRmncha: Boolean? = null,
+        genderID: Int? = null,
+        age: Int? = null
+    ) {
+        this.genderID = genderID
+        this.age = age
+        cache = savedRecord ?: MentalHealthScreeningCache(
+            patientId = "",
+            benVisitNo = null
+        )
+
+        if (cache.isPostpartum == null && isPostpartumFromRmncha != null && genderID == 2 && age in 15..49) {
+            cache.isPostpartum = isPostpartumFromRmncha
+        }
+
+        populateFromCache(cache)
+
+        setUpPage(buildFormElementList())
+    }
+
+    private fun shouldShowPhq9(): Boolean {
+        return isYes(emotionalBehaviouralConcerns.value) ||
+                isYes(selfHarmSuicideThoughts.value) ||
+                isYes(isPostpartum.value)
+    }
+    private fun todayDateString(): String =
+        SimpleDateFormat(mhDateFormatPattern, Locale.ENGLISH).format(Date())
+
+    private fun shouldAutoSuggestReferral(): Boolean {
+        return dementiaDailyActivities.value == yesNoOptions[0] ||
+                substanceAlcoholClassification.value == alcoholClassificationOptions.getOrNull(1)
+    }
+
+    private fun shouldShowReferralRequiredField(): Boolean {
+        return isYes(emotionalBehaviouralConcerns.value) ||
+                isYes(substanceUseConcerns.value) ||
+                isYes(selfHarmSuicideThoughts.value) ||
+                isYes(memoryLossConfusion.value) ||
+                isYes(seizuresFitsLoc.value) ||
+                isYes(isPostpartum.value) ||
+                shouldAutoReferFromPhq9() ||
+                shouldAutoReferFromHighSuicideRisk()
+    }
+
+    private fun shouldAutoReferUnder11(): Boolean {
+        val isUnder11 = (age ?: Int.MAX_VALUE) < 11
+        if (!isUnder11) return false
+
+        return isYes(emotionalBehaviouralConcerns.value) ||
+                isYes(substanceUseConcerns.value) ||
+                isYes(selfHarmSuicideThoughts.value) ||
+                isYes(memoryLossConfusion.value) ||
+                isYes(seizuresFitsLoc.value)
+    }
+
+    private fun shouldAutoReferFromPhq9(): Boolean {
+        return (phq9TotalScore.value?.toIntOrNull() ?: 0) >= 15
+    }
+
+    private fun shouldAutoReferFromHighSuicideRisk(): Boolean {
+        val highRiskLabel = suicideRiskOptions.getOrNull(2)
+        return isYes(selfHarmSuicideThoughts.value) &&
+                (suicideRiskLevel.value == highRiskLabel)
+    }
+
+    private fun shouldAutoReferFromEdSuspectedOutcome(): Boolean {
+        val suspectedEpilepsy = mhEdOutcomeOptions.getOrNull(0)
+        val suspectedDementia = mhEdOutcomeOptions.getOrNull(1)
+        val suspected = mhEdOutcomeOptions.getOrNull(2)
+        return edScreeningOutcome.value in setOf(
+            suspected,
+            suspectedDementia,
+            suspectedEpilepsy
+        )
+    }
+
+    private fun shouldAutoReferFromProblematicAlcohol(): Boolean {
+        return substanceAlcoholClassification.value == alcoholClassificationOptions.getOrNull(1)
+    }
+
+    private fun isLowSuicideRisk(): Boolean {
+        val lowRiskLabel = suicideRiskOptions.getOrNull(0)
+        return isYes(selfHarmSuicideThoughts.value) &&
+                (suicideRiskLevel.value == lowRiskLabel)
+    }
+
+    private fun isAge11OrBelow(): Boolean {
+        val currentAge = age
+        return currentAge != null && currentAge <= 11
+    }
+
+    private fun isAge11PlusSuicideContext(): Boolean {
+        val currentAge = age
+        return currentAge != null && currentAge > 11 && isYes(selfHarmSuicideThoughts.value)
+    }
+
+    private fun isAge11OrBelowSuicideContext(): Boolean {
+        val currentAge = age
+        return currentAge != null && currentAge <= 11 && isYes(selfHarmSuicideThoughts.value)
+    }
+
+    private fun shouldForceAutoReferralRequired(): Boolean {
+        // For low suicide risk:
+        // - age <= 11: keep referral locked to Yes
+        // - age > 11: keep referral manual-select
+        if (isLowSuicideRisk() && !isAge11OrBelow() && !shouldAutoReferFromProblematicAlcohol()) {
+            return false
+        }
+
+        return shouldAutoReferUnder11() ||
+                shouldAutoReferFromPhq9() ||
+                shouldAutoReferFromHighSuicideRisk() ||
+                shouldAutoReferFromEdSuspectedOutcome() ||
+                shouldAutoReferFromProblematicAlcohol()
+    }
+
+    private fun applyAutoReferralRules() {
+        if (isLowSuicideRisk() && !isAge11OrBelow()) {
+            // Low suicide risk must remain manual. If the field was previously auto-forced,
+            // clear forced values so the user can re-select Yes/No.
+            if (wasAutoReferralForced || (mhReferralRequired.entries?.size ?: 0) == 1) {
+                mhReferralRequired.value = null
+                mhReferralLevel.value = null
+                mhReasonForReferral.value = null
+                mhReferralDate.value = null
+            }
+            wasAutoReferralForced = false
+            return
+        }
+
+        val isAutoReferralForced = shouldForceAutoReferralRequired()
+        if (isAutoReferralForced) {
+            mhReferralRequired.value = yesNoOptions[0]
+            if (mhReferralDate.value.isNullOrEmpty()) {
+                mhReferralDate.value = todayDateString()
+            }
+        } else if (wasAutoReferralForced) {
+            // Auto-force removed (e.g. suicide risk High -> Medium): clear stale forced values
+            // so UI updates immediately without requiring manual scroll/rebind.
+            mhReferralRequired.value = null
+            mhReferralLevel.value = null
+            mhReasonForReferral.value = null
+            mhReferralDate.value = null
+        }
+        wasAutoReferralForced = isAutoReferralForced
+    }
+
+    private fun updateReferralRequiredOptions() {
+        mhReferralRequired.entries = if (shouldForceAutoReferralRequired()) {
+            arrayOf(yesNoOptions[0])
+        } else {
+            yesNoOptions
+        }
+    }
+
+    private fun getReferralLevelOptionsByAge(): Array<String> {
+        val currentAge = age
+        return when {
+            currentAge != null && currentAge >= 11 && isAge11PlusSuicideContext() ->
+                referralLevelDmhpOptions
+            isAlcoholReferralContext() -> referralLevelAlcoholOptions
+            currentAge != null && currentAge < 6 -> referralLevelRbskOptions
+            currentAge != null && currentAge in 6..10 -> referralLevelChildOptions
+            currentAge != null && currentAge >= 11 -> referralLevelAdultOptions
+            else -> context.resources.getStringArray(R.array.referral_level_options)
+        }
+    }
+
+    private fun isAlcoholReferralContext(): Boolean {
+        return isYes(substanceUseConcerns.value)
+    }
+
+    private fun mentalHealthReferralContext(): Boolean {
+        return isYes(emotionalBehaviouralConcerns.value) ||
+                isYes(selfHarmSuicideThoughts.value) ||
+                isYes(memoryLossConfusion.value) ||
+                isYes(seizuresFitsLoc.value) ||
+                isYes(isPostpartum.value)
+    }
+
+    private fun updateReferralLevelOptions() {
+        val currentAge = age
+        val options = if (currentAge != null && currentAge < 6) {
+            referralLevelRbskOptions
+        } else if (currentAge != null && currentAge in 6..10) {
+            referralLevelChildOptions
+        } else if (isAlcoholReferralContext()) {
+            referralLevelAlcoholOptions
+        } else if (mentalHealthReferralContext()) {
+            referralLevelStandardMhOptions
+        } else {
+            getReferralLevelOptionsByAge()
+        }
+        mhReferralLevel.entries = options
+
+        val deAddictionLabel = referralLevelAdultOptions.getOrNull(4)
+        if ((mhReferralLevel.value == mhDeAddictionCentre || mhReferralLevel.value == mhDeAddiction) && deAddictionLabel != null && options.contains(deAddictionLabel)) {
+            mhReferralLevel.value = deAddictionLabel
+        }
+
+        if (mhReferralLevel.value != null && !options.contains(mhReferralLevel.value)) {
+            mhReferralLevel.value = null
+        }
+    }
+
+    private fun updateReferralReasonOptions() {
+        val options = if ((age ?: Int.MAX_VALUE) < 11) {
+            context.resources.getStringArray(R.array.mh_reason_for_referral_options_under_11)
+        } else {
+            context.resources.getStringArray(R.array.mh_reason_for_referral_options)
+        }
+        mhReasonForReferral.entries = options
+        if (mhReasonForReferral.value != null && !options.contains(mhReasonForReferral.value)) {
+            mhReasonForReferral.value = null
+        }
+    }
+
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            emotionalBehaviouralConcerns.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            substanceUseConcerns.id -> {
+                if (!isYes(substanceUseConcerns.value)) {
+                    clearSubstanceValues()
+                }
+                rebuildConditionalSections()
+                formId
+            }
+
+            selfHarmSuicideThoughts.id -> {
+                if (!isYes(selfHarmSuicideThoughts.value)) {
+                    clearSuicideValues()
+                }
+                rebuildConditionalSections()
+                formId
+            }
+
+            memoryLossConfusion.id -> {
+                if (!isYes(memoryLossConfusion.value)) {
+                    clearDementiaValues()
+                    if (!isYes(seizuresFitsLoc.value)) clearEdChecklistValues()
+                }
+                rebuildConditionalSections()
+                formId
+            }
+
+            seizuresFitsLoc.id -> {
+                if (!isYes(seizuresFitsLoc.value)) {
+                    clearEpilepsyValues()
+                    if (!isYes(memoryLossConfusion.value)) clearEdChecklistValues()
+                }
+                rebuildConditionalSections()
+                formId
+            }
+            isPostpartum.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+            mhReferralRequired.id -> {
+                if (mhReferralRequired.value != yesNoOptions[0]) {
+                    mhReferralLevel.value = null
+                    mhReasonForReferral.value = null
+                    mhReferralDate.value = null
+                }
+                rebuildConditionalSections()
+                formId
+            }
+
+            mhFollowUpRequired.id -> {
+                if (mhFollowUpRequired.value != yesNoOptions[0]) {
+                    mhFollowUpDate.value = null
+                    mhImprovementNoted.value = null
+                    mhReferralEscalation.value = null
+                    mhCaseClosureReason.value = null
+                }
+                rebuildConditionalSections()
+                formId
+            }
+
+            substanceTobaccoUse.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            substanceCurrentTobaccoUse.id, substanceTobaccoType.id,
+            substanceTobaccoFrequency.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            substanceAlcoholUse.id, substance_alcohol_loss.id,
+            substanceAlcoholImpact.id, substanceAlcoholWithdrawal.id,
+            substanceAlcoholProblematic.id, substance_alcohol_frequency.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            phq9LittleInterest.id, phq9FeelingDown.id, phq9SleepTrouble.id,
+            phq9FeelingTired.id, phq9Appetite.id, phq9FeelingBad.id,
+            phq9Concentration.id, phq9MovingSlowly.id, phq9SelfHarmThoughts.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            suicidePreviousAttempt.id, suicidePlan.id,
+            suicideCurrentThoughts.id, suicideHopelessness.id,
+            suicideImmediateAssess.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            edRecurrentEpisodeloss.id, edRecurrentJerkyMovements.id, edConfusionordrowsiness.id, edProgressiveMemoryLoss.id,
+            edConfusionDisorientation.id, edFunctionalDecline.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+            edPsychosocialIntervention.id -> {
+                rebuildConditionalSections()
+                formId
+            }
+
+            edDurationMinutes.id -> {
+                validateIntMinMax(edDurationMinutes)
+            }
+
+            edSessionDate.id, edRemarks.id -> {
+                formId
+            }
+
+            else -> {
+                -1
+            }
+        }
+    }
+
+
+    private fun buildFormElementList(): MutableList<FormElement> {
+        val list = mutableListOf<FormElement>()
+        updateEdDerivedFields()
+        applyAutoReferralRules()
+        updateReferralRequiredOptions()
+        updateReferralLevelOptions()
+        updateReferralReasonOptions()
+
+        // Initial screening questions
+        list.add(emotionalBehaviouralConcerns)
+        list.add(substanceUseConcerns)
+        list.add(selfHarmSuicideThoughts)
+        list.add(memoryLossConfusion)
+        list.add(seizuresFitsLoc)
+        if (genderID == 2 && age in 15..49) {
+            list.add(isPostpartum)
+        }
+
+
+        // PHQ-9 section
+        if (shouldShowPhq9()) {
+            list.addAll(listOf(
+                phq9Header, phq9LittleInterest, phq9FeelingDown, phq9SleepTrouble,
+                phq9FeelingTired, phq9Appetite, phq9FeelingBad, phq9Concentration,
+                phq9MovingSlowly, phq9SelfHarmThoughts,
+                phq9TotalScore.copy(), phq9DepressionSeverity.copy(), phq9SystemAction.copy()
+            ))
+        } else {
+            clearPhq9Values()
+        }
+
+        // Substance use section
+        if (isYes(substanceUseConcerns.value)) {
+            list.addAll(listOf(
+                substanceHeader, substanceTobaccoHeader, substanceCurrentTobaccoUse
+            ))
+            if (isYes(substanceCurrentTobaccoUse.value)) {
+                list.add(substanceTobaccoType)
+                list.add(substanceTobaccoFrequency)
+                // Reveal the system action only after both tobacco type and frequency are selected.
+                if (substanceTobaccoType.value != null && substanceTobaccoFrequency.value != null) {
+                    list.add(substanceSystemAction.copy())
+                }
+            }
+            list.addAll(listOf(substanceAlcoholHeader, substanceAlcoholUse))
+            if (isYes(substanceAlcoholUse.value)) {
+                list.add(substance_alcohol_frequency)
+                list.add(substance_alcohol_loss)
+                list.add(substanceAlcoholImpact)
+                list.add(substanceAlcoholWithdrawal)
+                list.add(substanceAlcoholProblematic)
+                val allAlcoholInputsFilled =
+                    substance_alcohol_frequency.value != null &&
+                    substance_alcohol_loss.value != null &&
+                    substanceAlcoholImpact.value != null &&
+                    substanceAlcoholWithdrawal.value != null &&
+                    substanceAlcoholProblematic.value != null
+                if (allAlcoholInputsFilled) {
+                    list.add(substanceAlcoholClassification.copy())
+                    list.add(substanceAlcoholSystemAction)
+                }
+            } else {
+                clearAlcoholSubFields()
+                list.add(substanceAlcoholProblematic)
+                if (substanceAlcoholProblematic.value != null) {
+                    list.add(substanceAlcoholClassification.copy())
+                    // Hide the system action when there is no alcohol use and no problematic use reported.
+                    val hideAlcoholSystemAction =
+                        isNo(substanceAlcoholUse.value) && isNo(substanceAlcoholProblematic.value)
+                    if (!hideAlcoholSystemAction) {
+                        list.add(substanceAlcoholSystemAction)
+                    }
+                }
+            }
+        }
+
+        // Suicide risk section
+        if (isYes(selfHarmSuicideThoughts.value)) {
+            list.addAll(listOf(
+                suicideHeader, suicidePreviousAttempt, suicidePlan,
+                suicideHopelessness, suicideImmediateAssess, suicideRiskLevel.copy()
+            ))
+        }
+
+        // Epilepsy & Dementia checklist
+        if (isYes(memoryLossConfusion.value) || isYes(seizuresFitsLoc.value)) {
+            list.addAll(
+                listOf(
+                    edChecklistHeader,
+                    edRecurrentEpisodeloss,
+                    edRecurrentJerkyMovements,
+                    edConfusionordrowsiness,
+                    edProgressiveMemoryLoss,
+                    edConfusionDisorientation,
+                    edFunctionalDecline,
+                    edAge60Years,
+                    edScreeningOutcome.copy()
+                )
+            )
+        }
+
+        // Psychosocial intervention
+        val lockPsychosocialToNo = isYes(substanceUseConcerns.value) &&
+                isNo(substanceAlcoholUse.value) && isNo(substanceAlcoholProblematic.value)
+        if (lockPsychosocialToNo) {
+            edPsychosocialIntervention.value = yesNoOptions[1]
+            edPsychosocialIntervention.isEnabled = false
+            list.add(edPsychosocialIntervention)
+            clearEdPsychosocialDependants()
+        } else if (list.contains(substanceAlcoholSystemAction) &&
+            isBriefIntervention(substanceAlcoholSystemAction.value)) {
+            edPsychosocialIntervention.isEnabled = true
+            list.add(edPsychosocialIntervention)
+            if (isYes(edPsychosocialIntervention.value)) {
+                list.add(edInterventionType)
+                edSessionDate.max = System.currentTimeMillis()
+                list.add(edSessionDate)
+                list.add(edDurationMinutes)
+                list.add(edRemarks)
+            } else {
+                clearEdPsychosocialDependants()
+            }
+        } else {
+            edPsychosocialIntervention.isEnabled = true
+            clearEdPsychosocialValues()
+        }
+
+        if (shouldShowReferralRequiredField()) {
+            if (mhReferralRequired.value == null && shouldAutoSuggestReferral()) {
+                mhReferralRequired.value = yesNoOptions[0]
+            }
+            list.add(mhReferralRequired)
+            if (mhReferralRequired.value == yesNoOptions[0]) {
+                list.add(mhReferralLevel)
+                list.add(mhReasonForReferral)
+                if (mhReferralDate.value.isNullOrEmpty()) {
+                    mhReferralDate.value = todayDateString()
+                }
+                list.add(mhReferralDate)
+
+                mhFollowUpDate.min = System.currentTimeMillis()
+                mhFollowUpDate.max = System.currentTimeMillis() + java.util.concurrent.TimeUnit.DAYS.toMillis(365)
+                list.add(mhFollowUpDate)
+                list.add(mhImprovementNoted)
+                list.add(mhAdherenceToAdvice)
+                list.add(mhReferralEscalation)
+            } else {
+                mhFollowUpRequired.value = null
+                mhFollowUpDate.value = null
+                mhImprovementNoted.value = null
+                mhAdherenceToAdvice.value = null
+                mhReferralEscalation.value = null
+                mhCaseClosureReason.value = null
+            }
+        } else {
+            mhReferralRequired.value = null
+            mhReferralLevel.value = null
+            mhReasonForReferral.value = null
+            mhReferralDate.value = null
+
+            mhFollowUpRequired.value = null
+            mhFollowUpDate.value = null
+            mhImprovementNoted.value = null
+            mhAdherenceToAdvice.value = null
+            mhReferralEscalation.value = null
+            mhCaseClosureReason.value = null
+        }
+//
+//        // Follow-up & Closure
+//        list.add(mhFollowUpRequired)
+//        if (mhFollowUpRequired.value == yesNoOptions[0]) {
+//            mhFollowUpDate.min = System.currentTimeMillis()
+//            mhFollowUpDate.max = System.currentTimeMillis() + java.util.concurrent.TimeUnit.DAYS.toMillis(365)
+//            list.add(mhFollowUpDate)
+//        }
+//        list.add(mhImprovementNoted)
+//        if (shouldShowPhq9()) {
+//            list.add(mhRepeatPhq9Header)
+//        }
+//        list.add(mhReferralEscalation)
+//        list.add(mhCaseClosureReason)
+
+
+        return list
+    }
+
+
+    private suspend fun rebuildConditionalSections() {
+
+        updatePhq9Outcome()
+        updateTobaccoOutcome()
+        computeSuicideRiskLevel()
+        computeAlcoholClassification()
+        computeEdScreeningOutcome()
+
+        setUpPage(buildFormElementList())
+    }
+
+
+    private suspend fun updatePhq9Outcome() {
+        val score = listOfNotNull(
+            extractPhq9Score(phq9LittleInterest.value),
+            extractPhq9Score(phq9FeelingDown.value),
+            extractPhq9Score(phq9SleepTrouble.value),
+            extractPhq9Score(phq9FeelingTired.value),
+            extractPhq9Score(phq9Appetite.value),
+            extractPhq9Score(phq9FeelingBad.value),
+            extractPhq9Score(phq9Concentration.value),
+            extractPhq9Score(phq9MovingSlowly.value),
+            extractPhq9Score(phq9SelfHarmThoughts.value)
+        ).sum()
+
+        // Alert Logic
+        val currentLevel = when {
+            score >= 20 -> 3
+            score >= 15 -> 2
+            score >= 10 -> 1
+            else -> 0
+        }
+
+        if (currentLevel > 0 && currentLevel != lastPhq9AlertLevel) {
+            val alertMsg = when (currentLevel) {
+                3 -> R.string.phq9_alert_emergency
+                2 -> R.string.phq9_alert_urgent
+                else -> R.string.phq9_alert_referral_mo_phc
+            }
+            _phq9AlertMessageFlow.value = resources.getText(alertMsg)
+        }
+        lastPhq9AlertLevel = currentLevel
+
+        phq9TotalScore.value = score.toString()
+        phq9DepressionSeverity.value = when (score) {
+            in 0..4 -> phq9SeverityOptions.getOrNull(0)
+            in 5..9 -> phq9SeverityOptions.getOrNull(1)
+            in 10..14 -> phq9SeverityOptions.getOrNull(2)
+            in 15..19 -> phq9SeverityOptions.getOrNull(3)
+            else -> phq9SeverityOptions.getOrNull(4)
+        }
+        phq9SystemAction.value = when (score) {
+            in 0..9 -> phq9SystemActionOptions.getOrNull(0)
+            in 10..14 -> phq9SystemActionOptions.getOrNull(1)
+            in 15..19 -> phq9SystemActionOptions.getOrNull(2)
+            else -> phq9SystemActionOptions.getOrNull(3)
+        }
+        phq9SystemAction.errorText = when {
+            score >= 20 -> context.getString(R.string.phq9_alert_emergency)
+            score >= 15 -> context.getString(R.string.phq9_alert_urgent)
+            score >= 10 -> context.getString(R.string.phq9_alert_referral_mo_phc)
+            else -> null
+        }
+
+    }
+
+    private fun updateTobaccoOutcome() {
+        if (!isYes(substanceCurrentTobaccoUse.value)) {
+            substanceTobaccoType.value = null
+            substanceTobaccoFrequency.value = null
+        }
+        val currentUse = substanceCurrentTobaccoUse.value
+
+        substanceTobaccoOutcome.value = when {
+            currentUse == yesNoOptions[0] -> tobaccoOutcomeOptions.getOrNull(0)
+            currentUse == yesNoOptions[1] -> tobaccoOutcomeOptions.getOrNull(1)
+            else                          -> null
+        }
+
+        substanceSystemAction.value = when (substanceTobaccoOutcome.value) {
+            tobaccoOutcomeOptions.getOrNull(0)    -> tobaccoSystemActionOptions.getOrNull(0)
+            tobaccoOutcomeOptions.getOrNull(1) -> tobaccoSystemActionOptions.getOrNull(1)
+            else                -> null
+        }
+    }
+
+    private fun computeAlcoholClassification() {
+        val use = substanceAlcoholUse.value
+        val frequency = substance_alcohol_frequency.value
+        val loss = substance_alcohol_loss.value
+        val impact = substanceAlcoholImpact.value
+        val withdrawal = substanceAlcoholWithdrawal.value
+        val problematic = substanceAlcoholProblematic.value
+
+        if (use == null && frequency == null && loss == null && impact == null && withdrawal == null && problematic == null) {
+            substanceAlcoholClassification.value = null
+            substanceAlcoholSystemAction.value = null
+            return
+        }
+
+        val hasRiskFactor = isYes(loss) ||
+                isYes(impact) ||
+                isYes(withdrawal) ||
+                isYes(problematic) ||
+                frequency == substanceFrequencyOptions.getOrNull(1) || // Regular
+                frequency == substanceFrequencyOptions.getOrNull(2)   // Daily
+
+        val noAlcoholUse = isNo(use)
+        val occasionalWithNoRisks = (frequency == substanceFrequencyOptions.getOrNull(0)) && // Occasionally
+                !isYes(loss) &&
+                !isYes(impact) &&
+                !isYes(withdrawal)
+
+
+        if (noAlcoholUse) {
+            if (isYes(problematic)) {
+                substanceAlcoholClassification.value = alcoholClassificationOptions.getOrNull(1)
+                substanceAlcoholSystemAction.value = alcoholSystemActionOptions.getOrNull(0)
+            } else {
+                substanceAlcoholClassification.value = alcoholClassificationOptions.getOrNull(0)
+                substanceAlcoholSystemAction.value = null
+            }
+            return
+        }
+
+        substanceAlcoholClassification.value = when {
+            hasRiskFactor -> alcoholClassificationOptions.getOrNull(1)
+            occasionalWithNoRisks -> alcoholClassificationOptions.getOrNull(0)
+            else -> null
+        }
+
+        // System action is auto-filled from the classification:
+        // "No problematic alcohol use identified" -> "Brief intervention"
+        // "Problematic alcohol use suspected"     -> "Referral"
+        substanceAlcoholSystemAction.value = when (substanceAlcoholClassification.value) {
+            alcoholClassificationOptions.getOrNull(0) -> alcoholSystemActionOptions.getOrNull(0)
+            alcoholClassificationOptions.getOrNull(1) -> alcoholSystemActionOptions.getOrNull(1)
+            else -> null
+        }
+    }
+
+    private fun computeEdScreeningOutcome() {
+        if (!isYes(memoryLossConfusion.value) && !isYes(seizuresFitsLoc.value)) {
+            edScreeningOutcome.value = null
+            edReferralRequired.value = null
+            edReason.value = null
+            return
+        }
+
+        val suspectedEpilepsy =
+            isYes(edRecurrentJerkyMovements.value) || isYes(edRecurrentEpisodeloss.value)
+
+        val age60OrMore = (age ?: 0) >= 60
+        val memoryOrFunctionalSelected =
+            isYes(edProgressiveMemoryLoss.value) || isYes(edFunctionalDecline.value)
+        val suspectedDementia = age60OrMore && memoryOrFunctionalSelected
+        val anyChecklistSelected =
+            isYes(edRecurrentEpisodeloss.value) ||
+                    isYes(edRecurrentJerkyMovements.value) ||
+                    isYes(edConfusionordrowsiness.value) ||
+                    isYes(edProgressiveMemoryLoss.value) ||
+                    isYes(edConfusionDisorientation.value) ||
+                    isYes(edFunctionalDecline.value)
+
+        edScreeningOutcome.value = when {
+            suspectedEpilepsy -> mhEdOutcomeOptions.getOrNull(0)
+            suspectedDementia -> mhEdOutcomeOptions.getOrNull(1)
+            anyChecklistSelected -> mhEdOutcomeOptions.getOrNull(2)
+            else -> mhEdOutcomeOptions.getOrNull(3)
+        }
+
+        val suspectedLabelPrefix = mhSuspected
+        val isSuspected = edScreeningOutcome.value?.contains(suspectedLabelPrefix) == true
+        edReferralRequired.value = if (isSuspected) yesNoOptions[0] else yesNoOptions[1]
+        edReason.value = if (isSuspected) mhEdReasonNeurological else null
+    }
+    private suspend fun computeSuicideRiskLevel() {
+        val thoughtsSelfHarm = selfHarmSuicideThoughts.value
+        val previousAttempt = suicidePreviousAttempt.value
+        val currentIntentPlan = suicidePlan.value
+        val accessToMeans = suicideHopelessness.value
+        val choImmediateRisk = suicideImmediateAssess.value
+
+        val fields = listOf(
+            thoughtsSelfHarm,
+            previousAttempt,
+            currentIntentPlan,
+            accessToMeans,
+            choImmediateRisk
+        )
+
+        if (fields.all { it == null }) {
+            suicideRiskLevel.value = null
+            suicideRiskLevel.hasAlertError = false
+            suicideRiskLevel.errorText = null
+            return
+        }
+
+        val low = suicideRiskOptions.getOrNull(0)
+        val moderate = suicideRiskOptions.getOrNull(1)
+        val high = suicideRiskOptions.getOrNull(2)
+
+        val isThoughtsYes = isYes(thoughtsSelfHarm)
+        val isThoughtsNo = isNo(thoughtsSelfHarm)
+        val isPreviousYes = isYes(previousAttempt)
+        val isPreviousNo = isNo(previousAttempt)
+        val isIntentYes = isYes(currentIntentPlan)
+        val isIntentNo = isNo(currentIntentPlan)
+        val isMeansNo = isNo(accessToMeans)
+        val isImmediateYes = isYes(choImmediateRisk)
+        val isImmediateNo = isNo(choImmediateRisk)
+
+        suicideRiskLevel.value = when {
+
+            isImmediateYes -> high
+
+            isThoughtsYes && isIntentYes -> high
+
+            isThoughtsYes && isPreviousYes && isIntentNo && isMeansNo && isImmediateNo -> moderate
+
+            isThoughtsYes && isPreviousNo && isIntentNo && isMeansNo && isImmediateNo -> low
+
+            isThoughtsNo && isPreviousNo && isIntentNo && isMeansNo && isImmediateNo -> low
+
+            else -> low
+        }
+
+        val riskValue = suicideRiskLevel.value ?: ""
+
+        when (riskValue) {
+            high -> {
+                suicideRiskLevel.hasAlertError = true
+                suicideRiskLevel.errorText = context.getString(R.string.suicide_risk_alert_high)
+                if (lastSuicideRiskLevel != high) {
+                    emitAlertErrorMessage(R.string.suicide_risk_alert_high)
+                }
+            }
+            moderate -> {
+                suicideRiskLevel.hasAlertError = true
+                suicideRiskLevel.errorText = context.getString(R.string.suicide_risk_alert_moderate)
+                if (lastSuicideRiskLevel != moderate) {
+                    emitAlertErrorMessage(R.string.suicide_risk_alert_moderate)
+                }
+            }
+            else -> {
+                suicideRiskLevel.hasAlertError = false
+                suicideRiskLevel.errorText = null
+            }
+        }
+        lastSuicideRiskLevel = riskValue
+    }
+
+    private fun clearPhq9Values() {
+        phq9LittleInterest.value = null
+        phq9FeelingDown.value = null
+        phq9SleepTrouble.value = null
+        phq9FeelingTired.value = null
+        phq9Appetite.value = null
+        phq9FeelingBad.value = null
+        phq9Concentration.value = null
+        phq9MovingSlowly.value = null
+        phq9SelfHarmThoughts.value = null
+        phq9TotalScore.value = null
+        phq9DepressionSeverity.value = null
+        phq9SystemAction.value = null
+    }
+
+    private fun clearSubstanceValues() {
+        substanceCurrentTobaccoUse.value = null
+        substanceTobaccoType.value = null
+        substanceTobaccoFrequency.value = null
+        substanceTobaccoOutcome.value = null
+        substanceSystemAction.value = null
+        substanceAlcoholUse.value = null
+        substanceTobaccoUse.value = null
+        clearAlcoholSubFields()
+        substanceAlcoholSystemAction.value = null
+        briefInterventionGiven.value = null
+    }
+    private fun clearEdPsychosocialValues() {
+        edPsychosocialIntervention.value = null
+        clearEdPsychosocialDependants()
+    }
+
+    private fun clearEdPsychosocialDependants() {
+        edInterventionType.value = null
+        edSessionDate.value = null
+        edDurationMinutes.value = null
+        edRemarks.value = null
+    }
+
+    private fun clearAlcoholSubFields() {
+        substance_alcohol_frequency.value = null
+        substance_alcohol_loss.value = null
+        substanceAlcoholImpact.value = null
+        substanceAlcoholWithdrawal.value = null
+    }
+
+    private fun clearSuicideValues() {
+        suicideCurrentThoughts.value = null
+        suicidePlan.value = null
+        suicidePreviousAttempt.value = null
+        suicideHopelessness.value = null
+        suicideImmediateAssess.value =null
+        suicideRiskLevel.value = null
+
+    }
+
+    private fun clearDementiaValues() {
+        dementiaProgressiveMemoryLoss.value = null
+        dementiaForgettingRecent.value = null
+        dementiaDisorientation.value = null
+        dementiaDailyActivities.value = null
+        dementiaBehaviouralChanges.value = null
+    }
+
+    private fun clearEpilepsyValues() {
+        epilepsyRecurrentSeizures.value = null
+        epilepsyJerkyMovements.value = null
+        epilepsyTongueBite.value = null
+        epilepsyConfusionAfter.value = null
+        epilepsyLocDuration.value = null
+    }
+
+    private fun clearEdChecklistValues() {
+        edRecurrentEpisodeloss.value = null
+        edRecurrentJerkyMovements.value = null
+        edConfusionordrowsiness.value = null
+        edProgressiveMemoryLoss.value = null
+        edConfusionDisorientation.value = null
+        edFunctionalDecline.value = null
+        edAge60Years.value = null
+        edScreeningOutcome.value = null
+        edReferralRequired.value = null
+        edReason.value = null
+    }
+
+    private fun updateEdDerivedFields() {
+        edAge60Years.value = if ((age ?: 0) >= 60) yesNoOptions[0] else yesNoOptions[1]
+    }
+
+
+    // ── Populate from Cache ──────────────────────────────────────────
+
+    private fun populateFromCache(cache: MentalHealthScreeningCache) {
+        // Initial screening questions
+        emotionalBehaviouralConcerns.value = boolToYesNo(cache.emotionalBehaviouralConcerns)
+        substanceUseConcerns.value = boolToYesNo(cache.substanceUseConcerns)
+        selfHarmSuicideThoughts.value = boolToYesNo(cache.selfHarmSuicideThoughts)
+        memoryLossConfusion.value = boolToYesNo(cache.memoryLossConfusion)
+        seizuresFitsLoc.value = boolToYesNo(cache.seizuresFitsLoc)
+        isPostpartum.value = boolToYesNo(cache.isPostpartum)
+        // Referral
+        mhReferralRequired.value =
+            cache.referralRequired?.let { if (it) yesNoOptions[0] else yesNoOptions[1] }
+        mhReferralLevel.value = cache.referralLevel
+        mhReasonForReferral.value = cache.reasonForReferral
+
+        if (cache.referralRequired == true) {
+            mhReferralDate.value = cache.referralDate ?: todayDateString()
+        } else {
+            mhReferralDate.value = null
+        }
+
+        // Follow-up & Closure
+        mhFollowUpRequired.value =
+            cache.followUpRequired?.let { if (it) yesNoOptions[0] else yesNoOptions[1] }
+        mhFollowUpDate.value = cache.followUpDate
+        mhImprovementNoted.value = cache.improvementNoted
+        mhAdherenceToAdvice.value = cache.adherenceToAdvice
+        mhReferralEscalation.value =
+            cache.referralEscalationRequired?.let { if (it) yesNoOptions[0] else yesNoOptions[1] }
+        mhCaseClosureReason.value = cache.caseClosureReason
+
+        // PHQ-9
+        phq9LittleInterest.value = cache.phq9LittleInterest?.let { phq9Options.getOrNull(it) }
+        phq9FeelingDown.value = cache.phq9FeelingDown?.let { phq9Options.getOrNull(it) }
+        phq9SleepTrouble.value = cache.phq9SleepTrouble?.let { phq9Options.getOrNull(it) }
+        phq9FeelingTired.value = cache.phq9FeelingTired?.let { phq9Options.getOrNull(it) }
+        phq9Appetite.value = cache.phq9Appetite?.let { phq9Options.getOrNull(it) }
+        phq9FeelingBad.value = cache.phq9FeelingBad?.let { phq9Options.getOrNull(it) }
+        phq9Concentration.value = cache.phq9Concentration?.let { phq9Options.getOrNull(it) }
+        phq9MovingSlowly.value = cache.phq9MovingSlowly?.let { phq9Options.getOrNull(it) }
+        phq9SelfHarmThoughts.value = cache.phq9SelfHarmThoughts?.let { phq9Options.getOrNull(it) }
+        phq9TotalScore.value = cache.phq9TotalScore?.toString()
+        phq9DepressionSeverity.value = cache.phq9DepressionSeverity
+        phq9SystemAction.value = cache.phq9SystemAction
+
+        // Substance Use
+        substanceCurrentTobaccoUse.value = boolToYesNo(cache.substanceCurrentTobaccoUse)
+        substanceTobaccoType.value = cache.substanceTobaccoType
+        substanceTobaccoFrequency.value = cache.substanceTobaccoFrequency
+        substanceTobaccoOutcome.value = cache.substanceTobaccoOutcome
+        substanceSystemAction.value = cache.substanceSystemAction
+        substanceAlcoholUse.value = boolToYesNo(cache.substanceAlcoholUse)
+        substanceTobaccoUse.value = boolToYesNo(cache.substanceTobaccoUse)
+        substance_alcohol_loss.value = boolToYesNo(cache.substance_alcohol_loss)
+        substanceAlcoholImpact.value = boolToYesNo(cache.substanceAlcoholImpact)
+        substanceAlcoholWithdrawal.value = boolToYesNo(cache.substanceAlcoholWithdrawal)
+        substanceAlcoholProblematic.value = boolToYesNo(cache.substanceAlcoholProblematic)
+        substanceAlcoholClassification.value = cache.substanceAlcoholClassification
+        substanceAlcoholSystemAction.value = cache.substanceAlcoholSystemAction
+        substanceOtherSpecify.value = cache.substanceOtherSpecify
+        substance_alcohol_frequency.value = cache.substance_alcohol_frequency
+
+        // Suicide Risk
+        suicideCurrentThoughts.value = boolToYesNo(cache.suicideCurrentThoughts)
+        suicidePlan.value = boolToYesNo(cache.suicidePlan)
+        suicidePreviousAttempt.value = boolToYesNo(cache.suicidePreviousAttempt)
+        suicideHopelessness.value = boolToYesNo(cache.suicideHopelessness)
+        suicideImmediateAssess.value = boolToYesNo(cache.suicideImmediateAssess)
+        suicideRiskLevel.value = cache.suicideRiskLevel
+
+        // Dementia
+        dementiaProgressiveMemoryLoss.value = boolToYesNo(cache.dementiaProgressiveMemoryLoss)
+        dementiaForgettingRecent.value = boolToYesNo(cache.dementiaForgettingRecent)
+        dementiaDisorientation.value = boolToYesNo(cache.dementiaDisorientation)
+        dementiaDailyActivities.value = boolToYesNo(cache.dementiaDailyActivities)
+        dementiaBehaviouralChanges.value = boolToYesNo(cache.dementiaBehaviouralChanges)
+
+        // Epilepsy
+        epilepsyRecurrentSeizures.value = boolToYesNo(cache.epilepsyRecurrentSeizures)
+        epilepsyJerkyMovements.value = boolToYesNo(cache.epilepsyJerkyMovements)
+        epilepsyTongueBite.value = boolToYesNo(cache.epilepsyTongueBite)
+        epilepsyConfusionAfter.value = boolToYesNo(cache.epilepsyConfusionAfter)
+        epilepsyLocDuration.value = cache.epilepsyLocDuration
+
+        // Epilepsy & Dementia Checklist
+        edRecurrentEpisodeloss.value = boolToChecked(cache.edRecurrentEpisodeloss)
+        edRecurrentJerkyMovements.value = boolToChecked(cache.edRecurrentJerkyMovements)
+        edConfusionordrowsiness.value = boolToChecked(cache.edConfusionordrowsiness)
+        edProgressiveMemoryLoss.value = boolToChecked(cache.edProgressiveMemoryLoss)
+        edConfusionDisorientation.value = boolToChecked(cache.edConfusionDisorientation)
+        edFunctionalDecline.value = boolToChecked(cache.edFunctionalDecline)
+        edScreeningOutcome.value = cache.edScreeningOutcome
+        edReferralRequired.value = cache.edReferralRequired
+        edReason.value = cache.edReason
+        edPsychosocialIntervention.value = boolToYesNo(cache.edPsychosocialInterventionProvided)
+        edInterventionType.value = cache.edInterventionType
+        edSessionDate.value = cache.edSessionDate
+        edDurationMinutes.value = cache.edDurationMinutes?.toString()
+        edRemarks.value = cache.edRemarks
+
+
+    }
+
+    // ── Map Values ───────────────────────────────────────────────────
+
+    private fun extractPhq9Score(value: String?): Int? {
+        return value?.firstOrNull()?.digitToIntOrNull()
+    }
+
+    private fun isYes(value: String?): Boolean {
+        return value == yesNoOptions[0]
+    }
+    private fun isBriefIntervention(value: String?): Boolean {
+        return value == alcoholSystemActionOptions.getOrNull(0)
+    }
+
+    private fun isNo(value: String?): Boolean =
+        value == yesNoOptions.getOrNull(1)
+
+    private fun yesNoToBoolean(value: String?): Boolean? =
+        when {
+            value == yesNoOptions.getOrNull(0) -> true
+            value == yesNoOptions.getOrNull(1) -> false
+            else -> null
+        }
+
+    private fun boolToYesNo(value: Boolean?): String? =
+        value?.let { if (it) yesNoOptions[0] else yesNoOptions[1] }
+
+    private fun boolToChecked(value: Boolean?): String? =
+        value?.let { if (it) yesNoOptions[0] else null }
+
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as MentalHealthScreeningCache).let {
+            // Initial screening
+            it.emotionalBehaviouralConcerns = yesNoToBoolean(emotionalBehaviouralConcerns.value)
+            it.substanceUseConcerns = yesNoToBoolean(substanceUseConcerns.value)
+            it.selfHarmSuicideThoughts = yesNoToBoolean(selfHarmSuicideThoughts.value)
+            it.memoryLossConfusion = yesNoToBoolean(memoryLossConfusion.value)
+            it.seizuresFitsLoc = yesNoToBoolean(seizuresFitsLoc.value)
+            it.isPostpartum = yesNoToBoolean(isPostpartum.value)
+
+            // PHQ-9
+            if (shouldShowPhq9()) {
+                it.phq9LittleInterest = extractPhq9Score(phq9LittleInterest.value)
+                it.phq9FeelingDown = extractPhq9Score(phq9FeelingDown.value)
+                it.phq9SleepTrouble = extractPhq9Score(phq9SleepTrouble.value)
+                it.phq9FeelingTired = extractPhq9Score(phq9FeelingTired.value)
+                it.phq9Appetite = extractPhq9Score(phq9Appetite.value)
+                it.phq9FeelingBad = extractPhq9Score(phq9FeelingBad.value)
+                it.phq9Concentration = extractPhq9Score(phq9Concentration.value)
+                it.phq9MovingSlowly = extractPhq9Score(phq9MovingSlowly.value)
+                it.phq9SelfHarmThoughts = extractPhq9Score(phq9SelfHarmThoughts.value)
+
+                // Calculate total PHQ-9 score
+                it.phq9TotalScore = listOfNotNull(
+                    it.phq9LittleInterest, it.phq9FeelingDown, it.phq9SleepTrouble,
+                    it.phq9FeelingTired, it.phq9Appetite, it.phq9FeelingBad,
+                    it.phq9Concentration, it.phq9MovingSlowly, it.phq9SelfHarmThoughts
+                ).sum()
+                it.phq9DepressionSeverity = phq9DepressionSeverity.value
+                it.phq9SystemAction = phq9SystemAction.value
+            } else {
+                it.phq9LittleInterest = null
+                it.phq9FeelingDown = null
+                it.phq9SleepTrouble = null
+                it.phq9FeelingTired = null
+                it.phq9Appetite = null
+                it.phq9FeelingBad = null
+                it.phq9Concentration = null
+                it.phq9MovingSlowly = null
+                it.phq9SelfHarmThoughts = null
+                it.phq9TotalScore = null
+            }
+
+
+            // Substance Use
+            if (isYes(substanceUseConcerns.value)) {
+                it.substanceCurrentTobaccoUse = isYes(substanceCurrentTobaccoUse.value)
+                it.substanceTobaccoType = if (it.substanceCurrentTobaccoUse == true) substanceTobaccoType.value else null
+                it.substanceTobaccoFrequency = if (it.substanceCurrentTobaccoUse == true) substanceTobaccoFrequency.value else null
+                it.substanceTobaccoOutcome = substanceTobaccoOutcome.value
+                it.substanceSystemAction = substanceSystemAction.value
+                it.substanceAlcoholUse = isYes(substanceAlcoholUse.value)
+                // substanceTobaccoUse is a legacy hidden field; derive from the visible replacement
+                it.substanceTobaccoUse = yesNoToBoolean(substanceCurrentTobaccoUse.value)
+                it.substance_alcohol_loss = isYes(substance_alcohol_loss.value)
+                it.substanceAlcoholImpact = isYes(substanceAlcoholImpact.value)
+                it.substanceAlcoholWithdrawal = isYes(substanceAlcoholWithdrawal.value)
+                it.substanceAlcoholProblematic = isYes(substanceAlcoholProblematic.value)
+                it.substanceAlcoholClassification = substanceAlcoholClassification.value
+                it.substanceAlcoholSystemAction = substanceAlcoholSystemAction.value
+                it.substance_alcohol_frequency = substance_alcohol_frequency.value
+                // briefInterventionGiven is a legacy hidden field with no visible replacement; omit
+                it.briefInterventionGiven = null
+            } else {
+                it.substanceCurrentTobaccoUse = null
+                it.substanceTobaccoType = null
+                it.substanceTobaccoFrequency = null
+                it.substanceTobaccoOutcome = null
+                it.substanceSystemAction = null
+                it.substanceAlcoholUse = null
+                it.substanceTobaccoUse = null
+                it.substance_alcohol_loss = null
+                it.substanceAlcoholImpact = null
+                it.substanceAlcoholWithdrawal = null
+                it.substanceAlcoholProblematic = null
+                it.substanceAlcoholClassification = null
+                it.substanceAlcoholSystemAction = null
+                it.substanceOtherSpecify = null
+                it.substance_alcohol_frequency = null
+                it.briefInterventionGiven = null
+            }
+
+
+            // Suicide Risk
+            if (isYes(selfHarmSuicideThoughts.value)) {
+                it.suicideCurrentThoughts = isYes(suicideCurrentThoughts.value)
+                it.suicidePlan = isYes(suicidePlan.value)
+                it.suicidePreviousAttempt = isYes(suicidePreviousAttempt.value)
+                it.suicideHopelessness = isYes(suicideHopelessness.value)
+                it.suicideImmediateAssess = isYes(suicideImmediateAssess.value)
+                it.suicideRiskLevel = suicideRiskLevel.value
+            } else {
+                it.suicideCurrentThoughts = null
+                it.suicidePlan = null
+                it.suicidePreviousAttempt = null
+                it.suicideHopelessness = null
+                it.suicideImmediateAssess = null
+                it.suicideRiskLevel = null
+            }
+
+            if (isYes(memoryLossConfusion.value)) {
+                it.dementiaProgressiveMemoryLoss = isYes(dementiaProgressiveMemoryLoss.value)
+                it.dementiaForgettingRecent = isYes(dementiaForgettingRecent.value)
+                it.dementiaDisorientation = isYes(dementiaDisorientation.value)
+                it.dementiaDailyActivities = isYes(dementiaDailyActivities.value)
+                it.dementiaBehaviouralChanges = isYes(dementiaBehaviouralChanges.value)
+            } else {
+                it.dementiaProgressiveMemoryLoss = null
+                it.dementiaForgettingRecent = null
+                it.dementiaDisorientation = null
+                it.dementiaDailyActivities = null
+                it.dementiaBehaviouralChanges = null
+            }
+
+            if (isYes(seizuresFitsLoc.value)) {
+                it.epilepsyRecurrentSeizures = isYes(epilepsyRecurrentSeizures.value)
+                it.epilepsyJerkyMovements = isYes(epilepsyJerkyMovements.value)
+                it.epilepsyTongueBite = isYes(epilepsyTongueBite.value)
+                it.epilepsyConfusionAfter = isYes(epilepsyConfusionAfter.value)
+                it.epilepsyLocDuration = epilepsyLocDuration.value
+            } else {
+                it.epilepsyRecurrentSeizures = null
+                it.epilepsyJerkyMovements = null
+                it.epilepsyTongueBite = null
+                it.epilepsyConfusionAfter = null
+                it.epilepsyLocDuration = null
+            }
+
+            it.edRecurrentEpisodeloss = isYes(edRecurrentEpisodeloss.value)
+            it.edRecurrentJerkyMovements = isYes(edRecurrentJerkyMovements.value)
+            it.edConfusionordrowsiness = isYes(edConfusionordrowsiness.value)
+            it.edProgressiveMemoryLoss = isYes(edProgressiveMemoryLoss.value)
+            it.edConfusionDisorientation = isYes(edConfusionDisorientation.value)
+            it.edFunctionalDecline = isYes(edFunctionalDecline.value)
+            it.edScreeningOutcome = edScreeningOutcome.value
+            val suspectedEpilepsy = mhEdOutcomeOptions.getOrNull(0)
+            val suspectedDementia = mhEdOutcomeOptions.getOrNull(1)
+            val suspected = mhEdOutcomeOptions.getOrNull(2)
+            val isEdSuspectedOutcome = it.edScreeningOutcome in setOf(
+                suspected,
+                suspectedDementia,
+                suspectedEpilepsy
+            )
+            it.edReferralRequired =
+                if (isEdSuspectedOutcome) yesNoOptions[0] else edReferralRequired.value
+            it.edReason =
+                if (isEdSuspectedOutcome) mhEdReasonNeurological else null
+            it.edPsychosocialInterventionProvided = yesNoToBoolean(edPsychosocialIntervention.value)
+            it.edInterventionType = if (it.edPsychosocialInterventionProvided == true) edInterventionType.value else null
+            it.edSessionDate = if (it.edPsychosocialInterventionProvided == true) edSessionDate.value else null
+            it.edDurationMinutes = if (it.edPsychosocialInterventionProvided == true) edDurationMinutes.value?.toIntOrNull() else null
+            it.edRemarks = edRemarks.value
+            it.referralRequired = if (shouldForceAutoReferralRequired()) {
+                true
+            } else {
+                yesNoToBoolean(mhReferralRequired.value)
+            }
+            if (it.referralRequired == true) {
+                it.referralLevel = mhReferralLevel.value
+                it.reasonForReferral = mhReasonForReferral.value
+                it.referralDate = mhReferralDate.value ?: todayDateString()
+            } else {
+                it.referralLevel = null
+                it.reasonForReferral = null
+                it.referralDate = null
+            }
+
+            it.followUpRequired = if (it.referralRequired == true) true else null
+            if (it.referralRequired == true) {
+                it.followUpDate = mhFollowUpDate.value
+                it.improvementNoted = mhImprovementNoted.value
+                it.adherenceToAdvice = mhAdherenceToAdvice.value
+                it.referralEscalationRequired = yesNoToBoolean(mhReferralEscalation.value)
+                it.caseClosureReason = mhCaseClosureReason.value
+            } else {
+                it.followUpDate = null
+                it.improvementNoted = null
+                it.adherenceToAdvice = null
+                it.referralEscalationRequired = null
+                it.caseClosureReason = null
+            }
+        }
+    }
+}
+
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/NeonatalOutcomeDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/NeonatalOutcomeDataset.kt
new file mode 100644
index 000000000..58a172c6e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/NeonatalOutcomeDataset.kt
@@ -0,0 +1,509 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.configuration.FormDataModel
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
+
+/**
+ * Dataset for Neonatal Outcome form per MHWC-200 requirements
+ * Handles all fields for newborn registration including complications,
+ * congenital anomalies, birth doses, and current status.
+ */
+class NeonatalOutcomeDataset(
+    context: Context, currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    companion object {
+        private const val WEIGHT_MIN = 500
+        private const val WEIGHT_MAX = 6000
+    }
+
+    // Q2: Outcome at Birth
+    private val outcomeAtBirth = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_outcome_at_birth),
+        arrayId = R.array.no_outcome_at_birth_array,
+        entries = resources.getStringArray(R.array.no_outcome_at_birth_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q3: Sex
+    private val sex = FormElement(
+        id = 2,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_sex),
+        arrayId = R.array.no_sex_array,
+        entries = resources.getStringArray(R.array.no_sex_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q4: Cried immediately after birth?
+    private val criedImmediately = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_cried_immediately),
+        arrayId = R.array.no_cried_immediately_array,
+        entries = resources.getStringArray(R.array.no_cried_immediately_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q5: Type of resuscitation
+    private val typeOfResuscitation = FormElement(
+        id = 4,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_type_of_resuscitation),
+        arrayId = R.array.no_type_of_resuscitation_array,
+        entries = resources.getStringArray(R.array.no_type_of_resuscitation_array),
+        required = false,
+        hasDependants = false
+    )
+
+    // Q6: Birth Weight
+    private val birthWeight = FormElement(
+        id = 5,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_birth_weight),
+        required = true,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 4,
+        min = WEIGHT_MIN.toLong(),
+        max = WEIGHT_MAX.toLong(),
+        hasDependants = false
+    )
+
+    // Q7: Any congenital anomaly detected?
+    private val congenitalAnomalyDetected = FormElement(
+        id = 6,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_congenital_anomaly_detected),
+        arrayId = R.array.no_congenital_anomaly_array,
+        entries = resources.getStringArray(R.array.no_congenital_anomaly_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q8: Type of congenital anomaly
+    private val typeOfCongenitalAnomaly = FormElement(
+        id = 7,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_type_of_congenital_anomaly),
+        arrayId = R.array.no_type_of_congenital_anomaly_array,
+        entries = resources.getStringArray(R.array.no_type_of_congenital_anomaly_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q9: Other congenital anomaly
+    private val otherCongenitalAnomaly = FormElement(
+        id = 8,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_other_congenital_anomaly),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 300
+    )
+
+    // Q10: Newborn Complications
+    private val newbornComplications = FormElement(
+        id = 9,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_newborn_complications),
+        arrayId = R.array.no_newborn_complications_array,
+        entries = resources.getStringArray(R.array.no_newborn_complications_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q11: Current Status of Baby
+    private val currentStatusOfBaby = FormElement(
+        id = 10,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_current_status_of_baby),
+        arrayId = R.array.no_current_status_array,
+        entries = resources.getStringArray(R.array.no_current_status_array),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q12: Cause of Death
+    private val causeOfDeath = FormElement(
+        id = 11,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_cause_of_death),
+        arrayId = R.array.no_cause_of_death_array,
+        entries = resources.getStringArray(R.array.no_cause_of_death_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q13: Other cause of death
+    private val otherCauseOfDeath = FormElement(
+        id = 12,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_other_cause_of_death),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 300
+    )
+
+    // Q14: Birth dose vaccines given
+    private val birthDoseVaccinesGiven = FormElement(
+        id = 13,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.no_birth_dose_vaccines_given),
+        arrayId = R.array.no_birth_dose_vaccines_array,
+        entries = resources.getStringArray(R.array.no_birth_dose_vaccines_array),
+        required = false,
+        hasDependants = true
+    )
+
+    // Q15: Reason for no vaccines
+    private val reasonForNoVaccines = FormElement(
+        id = 14,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_reason_for_no_vaccines),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 200
+    )
+
+    // Q16: Vitamin K injection given?
+    private val vitaminKInjectionGiven = FormElement(
+        id = 15,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_vitamin_k_injection_given),
+        entries = arrayOf(resources.getString(R.string.yes), resources.getString(R.string.no)),
+        required = true,
+        hasDependants = true
+    )
+
+    // Q17: Reason for no Vitamin K
+    private val reasonForNoVitaminK = FormElement(
+        id = 16,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.no_reason_for_no_vitamin_k),
+        required = false,
+        hasDependants = false,
+        etMaxLength = 200
+    )
+
+    // Q18: Birth Certificate issued?
+    private val birthCertificateIssued = FormElement(
+        id = 17,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.no_birth_certificate_issued),
+        entries = resources.getStringArray(R.array.no_birth_certificate_array),
+        required = true,
+        hasDependants = false,
+        hasAlertError = true
+    )
+
+    // ─── Helper: restore conditional (dependant) fields into the list ──
+    private fun restoreConditionalFields(
+        saved: NeonatalOutcomeCache,
+        formElements: MutableList<FormElement>
+    ) {
+        // saved.* fields are persisted in English; compare against the English array
+        // so this works regardless of the user's current UI locale.
+        val englishCried = englishResources.getStringArray(R.array.no_cried_immediately_array)
+        val englishAnomaly = englishResources.getStringArray(R.array.no_congenital_anomaly_array)
+        val englishStatus = englishResources.getStringArray(R.array.no_current_status_array)
+
+        if (saved.criedImmediately == englishCried.getOrNull(1) && saved.typeOfResuscitation != null) {
+            val criedIdx = formElements.indexOf(criedImmediately)
+            if (criedIdx >= 0) {
+                formElements.add(criedIdx + 1, typeOfResuscitation)
+            }
+        }
+        if (saved.congenitalAnomalyDetected == englishAnomaly.getOrNull(0)) { // Yes
+            formElements.add(formElements.indexOf(congenitalAnomalyDetected) + 1, typeOfCongenitalAnomaly)
+            if (saved.typeOfCongenitalAnomaly?.contains("Other") == true) {
+                formElements.add(formElements.indexOf(typeOfCongenitalAnomaly) + 1, otherCongenitalAnomaly)
+            }
+        }
+        if (saved.currentStatusOfBaby == englishStatus.getOrNull(3)) { // Died
+            formElements.add(formElements.indexOf(currentStatusOfBaby) + 1, causeOfDeath)
+            if (saved.causeOfDeath?.contains("Other") == true) {
+                formElements.add(formElements.indexOf(causeOfDeath) + 1, otherCauseOfDeath)
+            }
+        }
+        if (saved.birthDoseVaccinesGiven?.contains("None") == true) {
+            formElements.add(formElements.indexOf(birthDoseVaccinesGiven) + 1, reasonForNoVaccines)
+        }
+        if (saved.vitaminKInjectionGiven == false) {
+            formElements.add(formElements.indexOf(vitaminKInjectionGiven) + 1, reasonForNoVitaminK)
+        }
+    }
+
+    suspend fun setUpPage(saved: NeonatalOutcomeCache?) {
+        val formElements = mutableListOf(
+            outcomeAtBirth,
+            sex,
+            criedImmediately,
+            birthWeight,
+            congenitalAnomalyDetected,
+            newbornComplications,
+            currentStatusOfBaby,
+            birthDoseVaccinesGiven,
+            vitaminKInjectionGiven,
+            birthCertificateIssued
+        )
+
+        saved?.let {
+            // saved.* fields are stored in English; re-localize for display so the
+            // user always sees the form in their current UI language regardless of
+            // which language the data was originally entered in.
+            outcomeAtBirth.value = getLocalValueInArray(R.array.no_outcome_at_birth_array, saved.outcomeAtBirth)
+            sex.value = getLocalValueInArray(R.array.no_sex_array, saved.sex)
+            criedImmediately.value = getLocalValueInArray(R.array.no_cried_immediately_array, saved.criedImmediately)
+            birthWeight.value = saved.birthWeight?.toString()
+            congenitalAnomalyDetected.value = getLocalValueInArray(R.array.no_congenital_anomaly_array, saved.congenitalAnomalyDetected)
+            typeOfCongenitalAnomaly.value = getLocalValuesInArray(R.array.no_type_of_congenital_anomaly_array, saved.typeOfCongenitalAnomaly)
+            otherCongenitalAnomaly.value = saved.otherCongenitalAnomaly
+            newbornComplications.value = getLocalValuesInArray(R.array.no_newborn_complications_array, saved.newbornComplications)
+            currentStatusOfBaby.value = getLocalValueInArray(R.array.no_current_status_array, saved.currentStatusOfBaby)
+            causeOfDeath.value = getLocalValuesInArray(R.array.no_cause_of_death_array, saved.causeOfDeath)
+            otherCauseOfDeath.value = saved.otherCauseOfDeath
+            birthDoseVaccinesGiven.value = getLocalValuesInArray(R.array.no_birth_dose_vaccines_array, saved.birthDoseVaccinesGiven)
+            reasonForNoVaccines.value = saved.reasonForNoVaccines
+            vitaminKInjectionGiven.value = when (saved.vitaminKInjectionGiven) {
+                true -> resources.getString(R.string.yes)
+                false -> resources.getString(R.string.no)
+                else -> null
+            }
+            reasonForNoVitaminK.value = saved.reasonForNoVitaminK
+            birthCertificateIssued.value = getLocalValueInArray(R.array.no_birth_certificate_array, saved.birthCertificateIssued)
+
+            restoreConditionalFields(saved, formElements)
+        }
+
+        setUpPage(formElements)
+    }
+
+    // ─── Helper: toggle dependant fields based on a condition ──────────
+    private fun toggleDependant(
+        source: FormElement,
+        condition: Boolean,
+        showItems: List<FormElement>,
+        hideItems: List<FormElement> = emptyList()
+    ): Int {
+        return if (condition) {
+            triggerDependants(source = source, removeItems = hideItems, addItems = showItems)
+        } else {
+            triggerDependants(source = source, removeItems = showItems + hideItems, addItems = emptyList())
+        }
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            sex.id -> {
+                val selectedValue = sex.entries?.getOrNull(index)
+                sex.value = selectedValue
+                if (selectedValue == sex.entries?.getOrNull(2)) {
+                    emitAlertErrorMessage(R.string.no_alert_ambiguous_sex)
+                }
+                -1
+            }
+            criedImmediately.id -> {
+                val selectedValue = criedImmediately.entries?.getOrNull(index)
+                criedImmediately.value = selectedValue
+                // "Cried after resuscitation" is index 1 — show typeOfResuscitation
+                toggleDependant(
+                    source = criedImmediately,
+                    condition = selectedValue == resources.getStringArray(R.array.no_cried_immediately_array).getOrNull(1),
+                    showItems = listOf(typeOfResuscitation)
+                )
+            }
+            congenitalAnomalyDetected.id -> {
+                val selectedValue = congenitalAnomalyDetected.entries?.getOrNull(index)
+                congenitalAnomalyDetected.value = selectedValue
+                toggleDependant(
+                    source = congenitalAnomalyDetected,
+                    condition = selectedValue == resources.getStringArray(R.array.no_congenital_anomaly_array)[0], // Yes
+                    showItems = listOf(typeOfCongenitalAnomaly),
+                    hideItems = listOf(otherCongenitalAnomaly)
+                )
+            }
+            typeOfCongenitalAnomaly.id -> {
+                // handle multi-select and "Other" — convert to English first so the
+                // check works in every locale, not just when UI is English.
+                val englishValues = getEnglishValuesInArray(
+                    R.array.no_type_of_congenital_anomaly_array,
+                    typeOfCongenitalAnomaly.value
+                )
+                toggleDependant(
+                    source = typeOfCongenitalAnomaly,
+                    condition = englishValues?.contains("Other") == true,
+                    showItems = listOf(otherCongenitalAnomaly)
+                )
+            }
+            currentStatusOfBaby.id -> {
+                val selectedValue = currentStatusOfBaby.entries?.getOrNull(index)
+                currentStatusOfBaby.value = selectedValue
+                toggleDependant(
+                    source = currentStatusOfBaby,
+                    condition = selectedValue == resources.getStringArray(R.array.no_current_status_array)[3], // Died
+                    showItems = listOf(causeOfDeath),
+                    hideItems = listOf(otherCauseOfDeath)
+                )
+            }
+            causeOfDeath.id -> {
+                val englishValues = getEnglishValuesInArray(
+                    R.array.no_cause_of_death_array,
+                    causeOfDeath.value
+                )
+                toggleDependant(
+                    source = causeOfDeath,
+                    condition = englishValues?.contains("Other") == true,
+                    showItems = listOf(otherCauseOfDeath)
+                )
+            }
+            newbornComplications.id -> {
+                val realIndex = (if (index < 0) -index else index) - 1
+                val localizedEntries = newbornComplications.entries
+                // Identify "None" by its position in the English array so the
+                // logic works in every locale (Hindi, Assamese, etc.).
+                val noneIndex = englishResources
+                    .getStringArray(newbornComplications.arrayId)
+                    .indexOf("None")
+                val noneLocalized = localizedEntries?.getOrNull(noneIndex)
+                val clickedOption = localizedEntries?.getOrNull(realIndex) ?: return -1
+                val isNoneOption = noneIndex >= 0 && realIndex == noneIndex
+                val isChecked = index > 0
+
+                if (isChecked) {
+                    if (isNoneOption) {
+                        // "None" just checked — clear every other selection.
+                        newbornComplications.value = clickedOption
+                    } else {
+                        // A real complication was checked — drop "None" if it was set.
+                        val parts = (newbornComplications.value ?: "")
+                            .split(",")
+                            .map { it.trim() }
+                            .filter { it.isNotEmpty() && it != noneLocalized }
+                        newbornComplications.value =
+                            if (parts.isEmpty()) null else parts.joinToString(",")
+                    }
+                    forceRefreshId(newbornComplications.id)
+                }
+                -1
+            }
+            birthDoseVaccinesGiven.id -> {
+                val realIndex = (if (index < 0) -index else index) - 1
+                val localizedEntries = birthDoseVaccinesGiven.entries
+                // Locale-neutral "None" identification.
+                val noneIndex = englishResources
+                    .getStringArray(birthDoseVaccinesGiven.arrayId)
+                    .indexOf("None")
+                val noneLocalized = localizedEntries?.getOrNull(noneIndex)
+                val clickedOption = localizedEntries?.getOrNull(realIndex)
+                val isNoneOption = noneIndex >= 0 && realIndex == noneIndex
+                val isChecked = index > 0
+
+                if (clickedOption != null && isChecked) {
+                    if (isNoneOption) {
+                        birthDoseVaccinesGiven.value = clickedOption
+                    } else {
+                        val parts = (birthDoseVaccinesGiven.value ?: "")
+                            .split(",")
+                            .map { it.trim() }
+                            .filter { it.isNotEmpty() && it != noneLocalized }
+                        birthDoseVaccinesGiven.value =
+                            if (parts.isEmpty()) null else parts.joinToString(",")
+                    }
+                    forceRefreshId(birthDoseVaccinesGiven.id)
+                }
+
+                val noneIsSelected = noneLocalized != null && (birthDoseVaccinesGiven.value ?: "")
+                    .split(",")
+                    .map { it.trim() }
+                    .any { it == noneLocalized }
+                toggleDependant(
+                    source = birthDoseVaccinesGiven,
+                    condition = noneIsSelected,
+                    showItems = listOf(reasonForNoVaccines)
+                )
+            }
+            vitaminKInjectionGiven.id -> {
+                val selectedValue = vitaminKInjectionGiven.entries?.getOrNull(index)
+                vitaminKInjectionGiven.value = selectedValue
+                toggleDependant(
+                    source = vitaminKInjectionGiven,
+                    condition = selectedValue == resources.getString(R.string.no),
+                    showItems = listOf(reasonForNoVitaminK)
+                )
+            }
+            birthWeight.id -> {
+                validateIntMinMax(birthWeight)
+                if (birthWeight.errorText == null) {
+                    birthWeight.value?.toIntOrNull()?.let { weightInGm ->
+                        when {
+                            weightInGm < 1000 -> emitAlertErrorMessage(R.string.no_alert_elbw)
+                            weightInGm < 1500 -> emitAlertErrorMessage(R.string.no_alert_vlbw)
+                            weightInGm < 2500 -> emitAlertErrorMessage(R.string.no_alert_lbw)
+                            weightInGm >= 4000 -> emitAlertErrorMessage(R.string.no_alert_macrosomia)
+                        }
+                    }
+                }
+                -1
+            }
+            birthCertificateIssued.id -> {
+                val selected = birthCertificateIssued.entries?.getOrNull(index)
+                birthCertificateIssued.value = selected
+                if (selected == birthCertificateIssued.entries?.getOrNull(2)) { // "No (Not applied)"
+                    emitAlertErrorMessage(R.string.no_alert_birth_certificate_legal)
+                }
+                -1
+            }
+            else -> -1
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as NeonatalOutcomeCache).let { form ->
+            // Persist every dropdown / radio / checkbox value in its English canonical
+            // form so the DB is locale-neutral. Display-time localization is handled
+            // in setUpPage by re-converting via getLocalValueInArray.
+            form.outcomeAtBirth = getEnglishValueInArray(R.array.no_outcome_at_birth_array, outcomeAtBirth.value)
+            form.outcomeAtBirthId = outcomeAtBirth.getPosition()
+            form.sex = getEnglishValueInArray(R.array.no_sex_array, sex.value)
+            form.sexId = sex.getPosition()
+            form.criedImmediately = getEnglishValueInArray(R.array.no_cried_immediately_array, criedImmediately.value)
+            form.criedImmediatelyId = criedImmediately.getPosition()
+            form.typeOfResuscitation = getEnglishValuesInArray(R.array.no_type_of_resuscitation_array, typeOfResuscitation.value)
+            form.birthWeight = birthWeight.value?.toIntOrNull()
+            form.congenitalAnomalyDetected = getEnglishValueInArray(R.array.no_congenital_anomaly_array, congenitalAnomalyDetected.value)
+            form.congenitalAnomalyDetectedId = congenitalAnomalyDetected.getPosition()
+            form.typeOfCongenitalAnomaly = getEnglishValuesInArray(R.array.no_type_of_congenital_anomaly_array, typeOfCongenitalAnomaly.value)
+            form.otherCongenitalAnomaly = otherCongenitalAnomaly.value
+            form.newbornComplications = getEnglishValuesInArray(R.array.no_newborn_complications_array, newbornComplications.value)
+            form.currentStatusOfBaby = getEnglishValueInArray(R.array.no_current_status_array, currentStatusOfBaby.value)
+            form.currentStatusOfBabyId = currentStatusOfBaby.getPosition()
+            form.causeOfDeath = getEnglishValuesInArray(R.array.no_cause_of_death_array, causeOfDeath.value)
+            form.otherCauseOfDeath = otherCauseOfDeath.value
+            form.birthDoseVaccinesGiven = getEnglishValuesInArray(R.array.no_birth_dose_vaccines_array, birthDoseVaccinesGiven.value)
+            form.reasonForNoVaccines = reasonForNoVaccines.value
+            form.vitaminKInjectionGiven = when (vitaminKInjectionGiven.value) {
+                resources.getString(R.string.yes) -> true
+                resources.getString(R.string.no) -> false
+                else -> null
+            }
+            form.reasonForNoVitaminK = reasonForNoVitaminK.value
+            form.birthCertificateIssued = getEnglishValueInArray(R.array.no_birth_certificate_array, birthCertificateIssued.value)
+            form.birthCertificateIssuedId = birthCertificateIssued.getPosition()
+
+            // Audit flags read off the just-persisted English values so they don't
+            // depend on the UI locale at the moment of save.
+            form.isStillbirth = form.outcomeAtBirth?.contains("Still Birth") == true
+            form.isNeonatalDeath = form.currentStatusOfBaby == englishResources.getStringArray(R.array.no_current_status_array)[3]
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/NoseDiagnosisDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/NoseDiagnosisDataset.kt
new file mode 100644
index 000000000..1419af2a9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/NoseDiagnosisDataset.kt
@@ -0,0 +1,306 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+
+
+class NoseDiagnosisDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private lateinit var cache: NoseDiagnosisAssessment
+
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val optionYes = context.getString(R.string.yes)
+    private val optionNo = context.getString(R.string.no)
+    private val foreignBodyOptions = context.resources.getStringArray(R.array.nose_foreign_body_options)
+
+    private val FOREIGN_BODY_ANTERIOR = 0
+    private val FOREIGN_BODY_POSTERIOR = 1
+    private val FOREIGN_BODY_NONE = 2
+
+    private fun foreignBodyStringToIndex(value: String?): Int? {
+        return when (value) {
+            foreignBodyOptions.getOrNull(FOREIGN_BODY_ANTERIOR) -> FOREIGN_BODY_ANTERIOR
+            foreignBodyOptions.getOrNull(FOREIGN_BODY_POSTERIOR) -> FOREIGN_BODY_POSTERIOR
+            foreignBodyOptions.getOrNull(FOREIGN_BODY_NONE) -> FOREIGN_BODY_NONE
+            else -> null
+        }
+    }
+
+    private fun indexToForeignBodyString(index: Int?): String? {
+        return when (index) {
+            FOREIGN_BODY_ANTERIOR -> foreignBodyOptions.getOrNull(FOREIGN_BODY_ANTERIOR)
+            FOREIGN_BODY_POSTERIOR -> foreignBodyOptions.getOrNull(FOREIGN_BODY_POSTERIOR)
+            FOREIGN_BODY_NONE -> foreignBodyOptions.getOrNull(FOREIGN_BODY_NONE)
+            else -> null
+        }
+    }
+
+    /* -------------------- FORM ELEMENTS -------------------- */
+
+    private val difficultyBreathing = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.difficulty_in_breathing),
+        entries = arrayOf(optionYes, optionNo),
+        trueIndex = 0,
+        falseIndex = 1,
+        required = true,
+        hasAlertError = true
+    )
+
+    private val openMouthBreathing = FormElement(
+        id = 2,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.open_mouth_breathing),
+        entries = arrayOf(optionYes, optionNo),
+        trueIndex = 0,
+        falseIndex = 1,
+        required = false,
+        hasAlertError = true
+    )
+    private val noseBleed = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.nose_bleed_title),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasDependants = true
+    )
+
+    private val systolicBP = FormElement(
+        id = 4,
+        inputType = InputType.EDIT_TEXT,
+        title = context.getString(R.string.systolic_bp_title),
+        required = true,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        hasAlertError = true
+
+    )
+
+    private val diastolicBP = FormElement(
+        id = 5,
+        inputType = InputType.EDIT_TEXT,
+        title = context.getString(R.string.diastolic_bp_title),
+        required = true,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        hasAlertError = true
+
+    )
+
+    private val foreignBodyNose = FormElement(
+        id = 6,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.foreign_body_nose_title),
+        entries = foreignBodyOptions,
+        required = false,
+        hasAlertError = true
+
+    )
+
+    private val sinusitis = FormElement(
+        id = 7,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.sinusitis_title),
+        entries = arrayOf(context.getString(R.string.sinusitis_with_pain), optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+
+
+    suspend fun setUpPage(savedRecord: NoseDiagnosisAssessment?) {
+        cache = savedRecord ?: createDefaultCache()
+        populateFromCache(cache)
+        val list = mutableListOf<FormElement>()
+        list.add(difficultyBreathing)
+        list.add(openMouthBreathing)
+        list.add(noseBleed)
+
+        if (noseBleed.value == optionYes) {
+            list.add(systolicBP)
+            list.add(diastolicBP)
+        }
+
+        list.addAll(
+            listOf(
+                foreignBodyNose,
+                sinusitis
+            )
+        )
+
+        setUpPage(list)
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+
+            difficultyBreathing.id -> {
+                difficultyBreathing.booleanValue = when (index) {
+                    difficultyBreathing.trueIndex -> true
+                    difficultyBreathing.falseIndex -> false
+                    else -> null
+                }
+                if (difficultyBreathing.booleanValue == true) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.difficulty_in_breathing_alert)
+                    )
+                }
+                -1
+            }
+
+            openMouthBreathing.id -> {
+                openMouthBreathing.booleanValue = when (index) {
+                    openMouthBreathing.trueIndex -> true
+                    openMouthBreathing.falseIndex -> false
+                    else -> null
+                }
+                if (openMouthBreathing.booleanValue == true) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.open_mouth_breathing_alert)
+                    )
+                }
+                -1
+            }
+            noseBleed.id -> {
+                if (index == 0) {
+                    triggerDependants(
+                        source = noseBleed,
+                        addItems = listOf(systolicBP, diastolicBP),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    systolicBP.value = null
+                    diastolicBP.value = null
+                    triggerDependants(
+                        source = noseBleed,
+                        addItems = emptyList(),
+                        removeItems = listOf(systolicBP, diastolicBP)
+                    )
+                }
+                noseBleed.id
+            }
+
+            systolicBP.id -> {
+                systolicBP.value?.toIntOrNull()?.let {
+                    if (it > 120) {
+                        onShowAlert?.invoke(
+                            context.getString(R.string.nose_bleed_alert_systolic_bp)
+                        )
+                    }
+                }
+                -1
+            }
+
+            diastolicBP.id -> {
+                diastolicBP.value?.toIntOrNull()?.let {
+                    if (it > 80) {
+                        onShowAlert?.invoke(
+                            context.getString(R.string.nose_bleed_alert_diastolic_bp)
+                        )
+                    }
+                }
+                -1
+            }
+
+            foreignBodyNose.id -> {
+                if (index == FOREIGN_BODY_POSTERIOR) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.foreign_body_posterior_alert)
+                    )
+                }
+                -1
+            }
+
+            sinusitis.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.sinusitis_alert)
+                    )
+                }
+                -1
+            }
+            else -> -1
+        }
+    }
+
+
+    private fun createDefaultCache(): NoseDiagnosisAssessment {
+        return NoseDiagnosisAssessment(
+            patientId = "",
+            benVisitNo = null
+        )
+    }
+
+    private fun populateFromCache(cache: NoseDiagnosisAssessment) {
+        difficultyBreathing.booleanValue = cache.difficultyBreathing
+        difficultyBreathing.value = when (cache.difficultyBreathing) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        openMouthBreathing.booleanValue = cache.openMouthBreathing
+        openMouthBreathing.value = when (cache.openMouthBreathing) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        noseBleed.value = when (cache.noseBleed) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        systolicBP.value = cache.systolicBp?.toString()
+        diastolicBP.value = cache.diastolicBp?.toString()
+
+
+        // Convert stored index to display string for UI
+        val foreignBodyIndex = cache.foreignBodyNose?.toIntOrNull()
+        foreignBodyNose.value = indexToForeignBodyString(foreignBodyIndex)
+
+        sinusitis.value = when (cache.sinusitis) {
+            true -> context.getString(R.string.sinusitis_with_pain)
+            false -> optionNo
+            else -> null
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as NoseDiagnosisAssessment).let {
+            it.difficultyBreathing = difficultyBreathing.booleanValue
+            it.openMouthBreathing = openMouthBreathing.booleanValue
+            val hasNoseBleed: Boolean? = when (noseBleed.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            it.noseBleed = hasNoseBleed
+
+            it.systolicBp = if (hasNoseBleed == true) {
+                systolicBP.value?.toIntOrNull()
+            } else null
+
+            it.diastolicBp = if (hasNoseBleed == true) {
+                diastolicBP.value?.toIntOrNull()
+            } else null
+            // Store stable index as string instead of localized display text
+            it.foreignBodyNose = foreignBodyStringToIndex(foreignBodyNose.value)?.toString()
+            it.sinusitis = when (sinusitis.value) {
+                context.getString(R.string.sinusitis_with_pain) -> true
+                optionNo -> false
+                else -> null
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/OralHealthDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/OralHealthDataset.kt
new file mode 100644
index 000000000..21c574434
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/OralHealthDataset.kt
@@ -0,0 +1,334 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.OralHealth
+
+class OralHealthDataset(
+    context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private val optionYes = context.getString(R.string.yes_option)
+    private val optionNo = context.getString(R.string.no_option)
+
+    private lateinit var cache: OralHealth
+    private var lastSelectedToothDecaySymptoms: Set<String> = emptySet()
+    private var lastSelectedGumDiseaseSymptoms: Set<String> = emptySet()
+        private var lastSelectedDentalEmergencySelections: Set<String> = emptySet()
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val toothDecayPresent = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_tooth_decay_present),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasDependants = true
+    )
+
+    private val toothDecaySymptoms = FormElement(
+        id = 2,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.oral_tooth_decay_symptoms),
+        entries = arrayOf(
+            context.getString(R.string.oral_symptom_black_spot),
+            context.getString(R.string.oral_symptom_discoloration),
+            context.getString(R.string.oral_symptom_hole),
+            context.getString(R.string.oral_symptom_sensitivity),
+            context.getString(R.string.oral_symptom_food_lodgment),
+            context.getString(R.string.oral_symptom_pain),
+            context.getString(R.string.oral_symptom_swelling),
+            context.getString(R.string.oral_symptom_pus_discharge)
+        ),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val gumDiseasePresent = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_gum_disease_present),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasDependants = true
+    )
+
+    private val gumDiseaseSymptoms = FormElement(
+        id = 4,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.oral_gum_disease_symptoms),
+        entries = arrayOf(
+            context.getString(R.string.oral_gum_foul_smell),
+            context.getString(R.string.oral_gum_bleeding),
+            context.getString(R.string.oral_gum_deposits),
+            context.getString(R.string.oral_gum_loose_teeth),
+            context.getString(R.string.oral_gum_widening_gap),
+            context.getString(R.string.oral_gum_swollen)
+        ),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val irregularTeethJaws = FormElement(
+        id = 5,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_irregular_teeth_jaws),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val abnormalGrowthUlcer = FormElement(
+        id = 6,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_abnormal_growth_ulcer),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val cleftLipPalate = FormElement(
+        id = 7,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_cleft_lip_palate),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val dentalFluorosis = FormElement(
+        id = 8,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.oral_dental_fluorosis),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val dentalEmergency = FormElement(
+        id = 9,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.oral_dental_emergency),
+        entries = arrayOf(
+            context.getString(R.string.oral_emergency_pain),
+            context.getString(R.string.oral_emergency_abscess),
+            context.getString(R.string.oral_emergency_swelling),
+            context.getString(R.string.oral_emergency_tooth_injury),
+            context.getString(R.string.oral_emergency_avulsion),
+            context.getString(R.string.oral_emergency_non_healing_ulcer),
+            context.getString(R.string.oral_emergency_uncontrolled_bleeding),
+            context.getString(R.string.oral_emergency_trauma)
+        ),
+        required = false,
+        hasAlertError = true
+    )
+
+    suspend fun setUpPage(savedRecord: OralHealth?) {
+        cache = savedRecord ?: createDefaultCache()
+        populateFromCache(cache)
+        lastSelectedToothDecaySymptoms = toSelectionSet(toothDecaySymptoms.value)
+        lastSelectedGumDiseaseSymptoms = toSelectionSet(gumDiseaseSymptoms.value)
+        lastSelectedDentalEmergencySelections = toSelectionSet(dentalEmergency.value)
+
+        val list = mutableListOf<FormElement>()
+        list.add(toothDecayPresent)
+        if (toothDecayPresent.value == optionYes) {
+            toothDecaySymptoms.required = true
+            list.add(toothDecaySymptoms)
+        } else {
+            toothDecaySymptoms.required = false
+        }
+
+        list.add(gumDiseasePresent)
+        if (gumDiseasePresent.value == optionYes) {
+            gumDiseaseSymptoms.required = true
+            list.add(gumDiseaseSymptoms)
+        } else {
+            gumDiseaseSymptoms.required = false
+        }
+
+        list.add(irregularTeethJaws)
+        list.add(abnormalGrowthUlcer)
+        list.add(cleftLipPalate)
+        list.add(dentalFluorosis)
+        list.add(dentalEmergency)
+
+        setUpPage(list)
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            toothDecayPresent.id -> handleToothDecayPresent(index)
+            toothDecaySymptoms.id -> handleToothDecaySymptoms()
+            gumDiseasePresent.id -> handleGumDiseasePresent(index)
+            gumDiseaseSymptoms.id -> handleGumDiseaseSymptoms()
+            irregularTeethJaws.id,
+            abnormalGrowthUlcer.id,
+            cleftLipPalate.id,
+            dentalFluorosis.id -> handleSimpleAlert(index)
+            dentalEmergency.id -> handleDentalEmergency()
+            else -> -1
+        }
+    }
+
+    private fun handleToothDecayPresent(index: Int): Int {
+        return if (index == 0) {
+            toothDecaySymptoms.required = true
+            triggerDependants(
+                source = toothDecayPresent,
+                addItems = listOf(toothDecaySymptoms),
+                removeItems = emptyList()
+            )
+        } else {
+            toothDecaySymptoms.value = null
+            toothDecaySymptoms.required = false
+            lastSelectedToothDecaySymptoms = emptySet()
+            triggerDependants(
+                source = toothDecayPresent,
+                addItems = emptyList(),
+                removeItems = listOf(toothDecaySymptoms)
+            )
+        }
+    }
+
+    private fun handleToothDecaySymptoms(): Int {
+        val currentSelections = toSelectionSet(toothDecaySymptoms.value)
+        val isNewSelection = currentSelections.size > lastSelectedToothDecaySymptoms.size
+        if (isNewSelection) {
+            onShowAlert?.invoke(resources.getString(R.string.oral_health_referral_alert))
+        }
+        lastSelectedToothDecaySymptoms = currentSelections
+        return -1
+    }
+
+    private fun handleGumDiseasePresent(index: Int): Int {
+        return if (index == 0) {
+            gumDiseaseSymptoms.required = true
+            triggerDependants(
+                source = gumDiseasePresent,
+                addItems = listOf(gumDiseaseSymptoms),
+                removeItems = emptyList()
+            )
+        } else {
+            gumDiseaseSymptoms.value = null
+            gumDiseaseSymptoms.required = false
+            lastSelectedGumDiseaseSymptoms = emptySet()
+            triggerDependants(
+                source = gumDiseasePresent,
+                addItems = emptyList(),
+                removeItems = listOf(gumDiseaseSymptoms)
+            )
+        }
+    }
+
+    private fun handleGumDiseaseSymptoms(): Int {
+        val currentSelections = toSelectionSet(gumDiseaseSymptoms.value)
+        val isNewSelection = currentSelections.size > lastSelectedGumDiseaseSymptoms.size
+        if (isNewSelection) {
+            onShowAlert?.invoke(resources.getString(R.string.oral_health_referral_alert))
+        }
+        lastSelectedGumDiseaseSymptoms = currentSelections
+        return -1
+    }
+
+    private fun handleSimpleAlert(index: Int): Int {
+        if (index == 0) {
+            onShowAlert?.invoke(resources.getString(R.string.oral_health_referral_alert))
+        }
+        return -1
+    }
+
+    private fun handleDentalEmergency(): Int {
+        val currentSelections = toSelectionSet(dentalEmergency.value)
+        if (currentSelections.size > lastSelectedDentalEmergencySelections.size) {
+            onShowAlert?.invoke(resources.getString(R.string.oral_health_referral_alert))
+        }
+        lastSelectedDentalEmergencySelections = currentSelections
+        return -1
+    }
+
+    private fun createDefaultCache(): OralHealth {
+        return OralHealth(
+            patientID = "",
+            benVisitNo = null
+        )
+    }
+
+    private fun toSelectionSet(value: String?): Set<String> {
+        return value
+            ?.split(",")
+            ?.map { it.trim() }
+            ?.filter { it.isNotEmpty() }
+            ?.toSet()
+            ?: emptySet()
+    }
+
+    private fun String?.toYesNoBool(): Boolean? = when (this) {
+        optionYes -> true
+        optionNo  -> false
+        else -> null
+    }
+
+    private fun populateFromCache(cache: OralHealth) {
+        toothDecayPresent.value = when (cache.toothDecayPresent) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        toothDecaySymptoms.value = if (cache.toothDecayPresent == true) {
+            cache.toothDecaySymptoms
+        } else {
+            null
+        }
+
+        gumDiseasePresent.value = when (cache.gumDiseasePresent) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        gumDiseaseSymptoms.value = if (cache.gumDiseasePresent == true) cache.gumDiseaseSymptoms else null
+
+        irregularTeethJaws.value = when (cache.irregularTeethJaws) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        abnormalGrowthUlcer.value = when (cache.abnormalGrowthUlcer) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        cleftLipPalate.value = when (cache.cleftLipPalate) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        dentalFluorosis.value = when (cache.dentalFluorosis) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        dentalEmergency.value = cache.dentalEmergency
+    }
+
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as OralHealth).let {
+            it.toothDecayPresent  = toothDecayPresent.value.toYesNoBool()
+            it.toothDecaySymptoms = if (it.toothDecayPresent == true) toothDecaySymptoms.value else null
+
+            it.gumDiseasePresent  = gumDiseasePresent.value.toYesNoBool()
+            it.gumDiseaseSymptoms = if (it.gumDiseasePresent == true) gumDiseaseSymptoms.value else null
+
+            it.irregularTeethJaws  = irregularTeethJaws.value.toYesNoBool()
+            it.abnormalGrowthUlcer = abnormalGrowthUlcer.value.toYesNoBool()
+            it.cleftLipPalate      = cleftLipPalate.value.toYesNoBool()
+            it.dentalFluorosis     = dentalFluorosis.value.toYesNoBool()
+            it.dentalEmergency     = dentalEmergency.value
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PainAndSymptomAssessmentDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PainAndSymptomAssessmentDataset.kt
new file mode 100644
index 000000000..d3925a1ed
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PainAndSymptomAssessmentDataset.kt
@@ -0,0 +1,451 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
+import org.piramalswasthya.cho.R
+
+class PainAndSymptomAssessmentDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : ReferralFollowUpDataset(context, currentLanguage) {
+
+    private lateinit var cache: PainAndSymptomAssessment
+
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val optionMild = context.getString(R.string.mild)
+    private val optionModerate = context.getString(R.string.moderate)
+    private val optionSevere = context.getString(R.string.severe)
+    private val optionYes = context.getString(R.string.yes)
+    private val optionNo = context.getString(R.string.no)
+
+    // ---------------- Pain Severity ----------------
+    private val painSeverity = FormElement(
+        id = 1,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.pain_severity),
+        entries = arrayOf(optionMild, optionModerate, optionSevere),
+        required = true,
+        hasDependants = true,
+        hasAlertError = true
+    )
+
+    // ---------------- Pain Duration ----------------
+    private val painDuration = FormElement(
+        id = 2,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.pain_duration),
+        entries = arrayOf(
+            context.getString(R.string.pain_duration_less_than_one_month),
+            context.getString(R.string.pain_duration_one_to_six_months),
+            context.getString(R.string.pain_duration_more_than_six_months)
+        ),
+        required = true
+    )
+
+    // ---------------- Other Symptoms Present (Removed) ----------------
+//    private val symptomsPresent = FormElement(
+//        id = 3,
+//        inputType = InputType.RADIO,
+//        title = "Other symptoms present",
+//        entries = arrayOf("Yes", "No"),
+//        required = true,
+//        hasDependants = true
+//    )
+
+    // ---------------- Other Symptoms Severity ----------------
+    private val otherSymptomsSeverity = FormElement(
+        id = 4,
+        inputType = InputType.DROPDOWN,
+        title = context.getString(R.string.other_symptoms_severity),
+        entries = arrayOf(optionMild, optionModerate, optionSevere),
+        required = false
+    )
+
+    // ---------------- Immediate Relief ----------------
+    private val immediateReliefProvided = FormElement(
+        id = 5,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.immediate_relief_provided),
+        entries = arrayOf(optionYes, optionNo),
+        required = true
+    )
+    private val sectionCHeadline = FormElement(
+        id = 11,
+        inputType = InputType.HEADLINE,
+        title = context.getString(R.string.palliative_care_identification_headline),
+        required = false
+    )
+    private val sectionDHeadline = FormElement(
+        id = 18,
+        inputType = InputType.HEADLINE,
+        title = context.getString(R.string.pain_symptom_assessment_palliative),
+        required = false
+    )
+
+    private val persistentPainPresent = FormElement(
+        id = 12,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.persistent_pain_present),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasDependants = true
+    )
+
+
+
+    private val basicSymptoms = FormElement(
+        id = 24,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.symptom_assessment_basic_field_title),
+        entries = arrayOf(
+            context.getString(R.string.symptom_nausea_vomiting),
+            context.getString(R.string.symptom_constipation),
+            context.getString(R.string.symptom_anxiety_restlessness),
+            context.getString(R.string.symptom_sleep_disturbance)
+        ),
+        required = false
+    )
+
+
+    private val basicSymptomReliefProvided = FormElement(
+        id = 26,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.basic_symptom_relief_provided),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val basicPsychosocialSupportProvided = FormElement(
+        id = 27,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.basic_psychosocial_support_provided),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val basicCaregiverCounsellingProvided = FormElement(
+        id = 28,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.basic_caregiver_counselling_provided),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val basicManagementRemarks = FormElement(
+        id = 29,
+        inputType = InputType.EDIT_TEXT,
+        title = context.getString(R.string.basic_management_remarks),
+        required = false,
+        etMaxLength = 250,
+        multiLine = true
+    )
+
+    private val distressingSymptoms = FormElement(
+        id = 14,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.distressing_symptoms_present),
+        entries = arrayOf(
+            context.getString(R.string.breathlessness),
+            context.getString(R.string.nausea),
+            context.getString(R.string.fatigue),
+            context.getString(R.string.weakness),
+            context.getString(R.string.other)
+        ),
+        required = false
+    )
+
+    private val bedriddenOrSeverelyDependent = FormElement(
+        id = 15,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.bedridden_or_severely_dependent),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasDependants = true
+    )
+    private val lifeLimitingIllnessKnown = FormElement(
+        id = 16,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.life_limiting_illness_known),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasDependants = true
+    )
+
+    private val caregiverSupportRequired = FormElement(
+        id = 17,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.caregiver_support_required),
+        entries = arrayOf(optionYes, optionNo),
+        required = true,
+        hasDependants = true
+    )
+    // ---------------- Section F: Referral & Follow-up ----------------
+
+    override val referralRequired = createReferralRequired(6)
+
+    override val referralLevel = createReferralLevel(7)
+
+    override val reasonForReferral = createReasonForReferral(8)
+
+    override val followUpRequired = createFollowUpRequired(9)
+
+    override val followUpDate = createFollowUpDate(10)
+    override val caseStatus = createCaseStatus(20)
+    override val dateOfDeath = createDateOfDeath(21)
+    override val remarks = createRemarks(22)
+
+    // ---------------- Setup Page ----------------
+    suspend fun setUpPage(savedRecord: PainAndSymptomAssessment?) {
+        cache = savedRecord ?: createDefaultCache()
+        populateFromCache(cache)
+
+        val list = mutableListOf<FormElement>()
+        // Section C: Palliative Care Identification
+        list.add(sectionCHeadline)
+        list.add(persistentPainPresent)
+        list.add(basicSymptoms)
+        list.add(basicSymptomReliefProvided)
+        list.add(basicPsychosocialSupportProvided)
+        list.add(basicCaregiverCounsellingProvided)
+        list.add(basicManagementRemarks)
+        list.add(distressingSymptoms)
+        list.add(bedriddenOrSeverelyDependent)
+        list.add(lifeLimitingIllnessKnown)
+        list.add(caregiverSupportRequired)
+
+        // Section D: Pain & Symptom Assessment – if any Section C field is affirmative OR migrated record has saved pain data
+        if (shouldShowPainAssessment() || hasSavedPainAssessment()) {
+            list.addAll(getPainAssessmentFields())
+        }
+        // Section F
+        addReferralFollowUpElements(list)
+
+        setUpPage(list)
+    }
+
+    // ---------------- Value Change Handler ----------------
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        val referralFollowUpResult = handleReferralFollowUpChange(formId, index)
+        if (referralFollowUpResult != -1) return referralFollowUpResult
+
+        return when (formId) {
+            persistentPainPresent.id,
+            distressingSymptoms.id,
+            bedriddenOrSeverelyDependent.id,
+            lifeLimitingIllnessKnown.id,
+            caregiverSupportRequired.id -> {
+                val isShown = getFormList().any { it.id == sectionDHeadline.id }
+                val shouldShow = shouldShowPainAssessment()
+
+                if (shouldShow && !isShown) {
+                    triggerDependants(
+                        source = caregiverSupportRequired,
+                        addItems = getPainAssessmentFields(),
+                        removeItems = emptyList()
+                    )
+                } else if (!shouldShow && isShown) {
+                    painSeverity.value = null
+                    painDuration.value = null
+                    otherSymptomsSeverity.value = null
+                    immediateReliefProvided.value = null
+                    triggerDependants(
+                        source = caregiverSupportRequired,
+                        addItems = emptyList(),
+                        removeItems = getPainAssessmentFields()
+                    )
+                }
+                formId
+            }
+            painSeverity.id -> {
+                if (painSeverity.value == optionSevere) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.severe_pain_referral_alert)
+                    )
+                }
+                -1
+            }
+
+            otherSymptomsSeverity.id -> {
+                if (otherSymptomsSeverity.value == optionSevere) {
+                    onShowAlert?.invoke(
+                        context.getString(R.string.severe_symptoms_referral_alert)
+                    )
+                }
+                -1
+            }
+
+            else -> -1
+        }
+    }
+
+    // ---------------- Cache Helpers ----------------
+    private fun createDefaultCache(): PainAndSymptomAssessment {
+        return PainAndSymptomAssessment(
+            patientID = "",
+            benVisitNo = null
+        )
+    }
+
+    private fun populateFromCache(cache: PainAndSymptomAssessment) {
+        // Section C
+        persistentPainPresent.value = when (cache.persistentPainPresent) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        basicSymptoms.value = cache.basicSymptomsSelected
+        basicSymptomReliefProvided.value = when (cache.basicSymptomReliefProvided) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        basicPsychosocialSupportProvided.value = when (cache.basicPsychosocialSupportProvided) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        basicCaregiverCounsellingProvided.value = when (cache.basicCaregiverCounsellingProvided) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        basicManagementRemarks.value = cache.basicManagementRemarks
+        distressingSymptoms.value = cache.distressingSymptoms
+        bedriddenOrSeverelyDependent.value = when (cache.bedriddenOrSeverelyDependent) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        lifeLimitingIllnessKnown.value = when (cache.lifeLimitingIllnessKnown) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        caregiverSupportRequired.value = when (cache.caregiverSupportRequired) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        painSeverity.value = cache.painSeverity
+        painDuration.value = cache.painDuration
+//        symptomsPresent.value = when (cache.symptomsPresent) {
+//            true -> "Yes"
+//            false -> "No"
+//            else -> null
+//        }
+        otherSymptomsSeverity.value = cache.otherSymptomsSeverity
+        immediateReliefProvided.value = when (cache.immediateReliefProvided) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+
+        // Section F
+        populateReferralFollowUpFromCache(cache)
+    }
+
+    private fun getPainAssessmentFields(): List<FormElement> {
+        return listOf(sectionDHeadline, painSeverity, painDuration, otherSymptomsSeverity, immediateReliefProvided)
+    }
+
+    private fun shouldShowPainAssessment(): Boolean {
+        return listOf(
+            persistentPainPresent,
+            bedriddenOrSeverelyDependent,
+            lifeLimitingIllnessKnown,
+            caregiverSupportRequired
+        ).any { it.value == optionYes } || !distressingSymptoms.value.isNullOrBlank()
+    }
+
+    /** Returns true when a migrated record has saved Section D values but NULL Section C triggers. */
+    private fun hasSavedPainAssessment(): Boolean {
+        return listOf(
+            painSeverity.value,
+            painDuration.value,
+            otherSymptomsSeverity.value,
+            immediateReliefProvided.value
+        ).any { !it.isNullOrBlank() }
+    }
+
+    // ---------------- Map Values ----------------
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as PainAndSymptomAssessment).let {
+            // Section C – preserve null for unanswered radios (unanswered ≠ "No")
+            it.persistentPainPresent = when (persistentPainPresent.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            it.basicSymptomsSelected = basicSymptoms.value
+
+            it.basicSymptomReliefProvided = when (basicSymptomReliefProvided.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.basicPsychosocialSupportProvided = when (basicPsychosocialSupportProvided.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.basicCaregiverCounsellingProvided = when (basicCaregiverCounsellingProvided.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.basicManagementRemarks = basicManagementRemarks.value?.trim()?.takeIf { v -> v.isNotEmpty() }
+
+            it.distressingSymptoms = distressingSymptoms.value
+
+            it.bedriddenOrSeverelyDependent = when (bedriddenOrSeverelyDependent.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.lifeLimitingIllnessKnown = when (lifeLimitingIllnessKnown.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            it.caregiverSupportRequired = when (caregiverSupportRequired.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            // Derived Section C flags
+            it.painAssessmentEnabled = shouldShowPainAssessment() || hasSavedPainAssessment()
+            it.palliativeCareEligible = listOf(
+                it.persistentPainPresent,
+                it.bedriddenOrSeverelyDependent,
+                it.lifeLimitingIllnessKnown,
+                it.caregiverSupportRequired
+            ).any { flag -> flag == true } || !distressingSymptoms.value.isNullOrBlank()
+
+            it.painSeverity = painSeverity.value
+            it.painDuration = painDuration.value
+
+//            it.symptomsPresent = when (symptomsPresent.value) {
+//                "Yes" -> true
+//                "No" -> false
+//                else -> null
+//            }
+
+            it.otherSymptomsSeverity = otherSymptomsSeverity.value
+
+            it.immediateReliefProvided = when (immediateReliefProvided.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+
+            // Section F
+            mapReferralFollowUpValues(it)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PncFormDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PncFormDataset.kt
index 720311eba..60a751982 100644
--- a/app/src/main/java/org/piramalswasthya/cho/configuration/PncFormDataset.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PncFormDataset.kt
@@ -20,6 +20,8 @@ class PncFormDataset(
 
     private var visit: Int = 0
     private var dateOfDelivery: Long = 0L
+    private var previousPncVisitDate: Long? = null
+    private var previousPncPeriod: Int = 0
 
     private val pncPeriod = FormElement(
         id = 1,
@@ -37,6 +39,7 @@ class PncFormDataset(
         title = resources.getString(R.string.pnc_visit_date),
         arrayId = -1,
         required = true,
+        isEnabled = false,
         hasDependants = false
     )
 
@@ -52,6 +55,18 @@ class PncFormDataset(
         min = 0,
     )
 
+    private val calciumSupplementation = FormElement(
+        id = 17,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.pnc_calcium_supplementation),
+        required = false,
+        hasDependants = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 3,
+        max = 400,
+        min = 0,
+    )
+
     private val anyContraceptionMethod = FormElement(
         id = 4,
         inputType = InputType.RADIO,
@@ -78,6 +93,61 @@ class PncFormDataset(
         hasDependants = false
     )
 
+    private val dateOfSterilisation = FormElement(
+        id = 18,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.pnc_date_of_sterilization),
+        arrayId = -1,
+        max = System.currentTimeMillis(),
+        required = true,
+        hasDependants = false
+    )
+
+    private val anyDangerSign = FormElement(
+        id = 19,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.pnc_any_danger_sign),
+        entries = resources.getStringArray(R.array.pnc_confirmation_array),
+        required = false,
+        hasDependants = true
+    )
+
+    private val maternalSymptoms = FormElement(
+        id = 20,
+        inputType = InputType.CHECKBOXES,
+        title = resources.getString(R.string.pnc_maternal_symptoms),
+        entries = resources.getStringArray(R.array.pnc_maternal_symptoms_array),
+        required = true,
+        hasDependants = true
+    )
+
+    private val otherMaternalSymptoms = FormElement(
+        id = 21,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.pnc_other_maternal_symptoms),
+        required = true,
+        hasDependants = false,
+        etMaxLength = 50
+    )
+
+    private val pallor = FormElement(
+        id = 22,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.pnc_pallor),
+        entries = resources.getStringArray(R.array.pnc_pallor_array),
+        required = false,
+        hasDependants = false
+    )
+
+    private val vaginalBleeding = FormElement(
+        id = 23,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.pnc_vaginal_bleeding),
+        entries = resources.getStringArray(R.array.pnc_vaginal_bleeding_array),
+        required = false,
+        hasDependants = false
+    )
+
     private val motherDangerSign = FormElement(
         id = 7,
         inputType = InputType.DROPDOWN,
@@ -137,7 +207,8 @@ class PncFormDataset(
         inputType = InputType.EDIT_TEXT,
         title = resources.getString(R.string.pnc_other_death_cause),
         required = true,
-        hasDependants = false
+        hasDependants = false,
+        etMaxLength = 300
     )
 
     private val placeOfDeath = FormElement(
@@ -146,7 +217,15 @@ class PncFormDataset(
         title = resources.getString(R.string.pnc_death_place),
         entries = resources.getStringArray(R.array.pnc_death_place_array),
         required = true,
-        hasDependants = false,
+        hasDependants = true,
+    )
+
+    private val otherPlaceOfDeath = FormElement(
+        id = 24,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.other_place_of_death),
+        required = true,
+        hasDependants = false
     )
 
     private val remarks = FormElement(
@@ -160,61 +239,127 @@ class PncFormDataset(
     private val deliveryDate = FormElement(
         id = 16,
         inputType = InputType.TEXT_VIEW,
-        title = "Delivery Date",
+        title = resources.getString(R.string.delivery_date),
         required = false,
         hasDependants = false
     )
 
+    companion object {
+        fun getMinDeliveryDate(): Long {
+            val cal = Calendar.getInstance()
+            cal.add(Calendar.YEAR, -1)
+            return cal.timeInMillis
+        }
+
+        private fun getTodayStartMillis(): Long =
+            Calendar.getInstance().setToStartOfTheDay().timeInMillis
+    }
+
+    private val sterilisation: Array<String> by lazy {
+        resources.getStringArray(R.array.sterilization_methods_array)
+    }
+
+    // English-side reference used when comparing values that were just loaded
+    // from the DB (which are now stored in English). The locale-aware variant
+    // above is still used for runtime comparisons against form-element values.
+    private val englishSterilisation: Array<String> by lazy {
+        englishResources.getStringArray(R.array.sterilization_methods_array)
+    }
+
+    private val englishContraceptionLast: String by lazy {
+        englishResources.getStringArray(R.array.pnc_contraception_method_array).last()
+    }
+
     suspend fun setUpPage(
         visitNumber: Int,
         ben: PatientDisplay?,
         deliveryOutcomeCache: DeliveryOutcomeCache,
         previousPnc: PNCVisitCache?,
-        saved: PNCVisitCache?
+        saved: PNCVisitCache?,
+        hasPreviousPermanentSterilization: Boolean = false,
+        lastSterilizationVisit: PNCVisitCache? = null
     ) {
         val list = mutableListOf(
             deliveryDate,
             pncPeriod,
             visitDate,
+            motherDeath,
             ifaTabsGiven,
+            calciumSupplementation,
             anyContraceptionMethod,
-            motherDangerSign,
+            anyDangerSign,
+            maternalSymptoms,
+            pallor,
+            vaginalBleeding,
             referralFacility,
-            motherDeath,
             remarks
         )
-        dateOfDelivery = deliveryOutcomeCache.dateOfDelivery!!
-        deliveryDate.value = deliveryOutcomeCache.getDateStringFromLong(dateOfDelivery)
-        deathDate.min = dateOfDelivery
+        dateOfDelivery = deliveryOutcomeCache.dateOfDelivery ?: 0L
+        previousPncVisitDate = previousPnc?.pncDate
+        previousPncPeriod = previousPnc?.pncPeriod ?: 0
+
+        configureDeliveryDateField()
+        resetVisitDateToDisabled()
+
+        if (dateOfDelivery != 0L) {
+            deathDate.min = dateOfDelivery
+            dateOfSterilisation.min = dateOfDelivery
+        }
         deathDate.max = System.currentTimeMillis()
+        dateOfSterilisation.max = System.currentTimeMillis()
+        anyDangerSign.value = anyDangerSign.entries!!.last()
         motherDeath.value = motherDeath.entries!!.last()
-        val daysSinceDeliveryMillis = Calendar.getInstance()
-            .setToStartOfTheDay().timeInMillis - deliveryOutcomeCache.dateOfDelivery!!.let {
-            val cal = Calendar.getInstance()
-            cal.timeInMillis = it
-            cal.setToStartOfTheDay()
-            cal.timeInMillis
+
+        // Set default value for motherDeath to "No"
+        motherDeath.value = motherDeath.entries!!.last()
+
+        updatePncPeriodEntries()
+
+        // Handle permanent sterilization - disable contraception fields if already selected.
+        // lastSterilizationVisit.contraceptionMethod is stored in English (canonical); re-localize
+        // for display and compare against the English-side references so conditional rendering
+        // (dateOfSterilisation / otherPpcMethod) works in every locale.
+        if (hasPreviousPermanentSterilization && lastSterilizationVisit != null) {
+            anyContraceptionMethod.isEnabled = false
+            contraceptionMethod.isEnabled = false
+            dateOfSterilisation.isEnabled = false
+            otherPpcMethod.isEnabled = false
+
+            anyContraceptionMethod.value = if (lastSterilizationVisit.anyContraceptionMethod == true)
+                anyContraceptionMethod.entries!!.first() else anyContraceptionMethod.entries!!.last()
+
+            contraceptionMethod.value = getLocalValueInArray(R.array.pnc_contraception_method_array, lastSterilizationVisit.contraceptionMethod)
+            dateOfSterilisation.value = getDateFromLong(lastSterilizationVisit.sterilisationDate ?: System.currentTimeMillis())
+            otherPpcMethod.value = lastSterilizationVisit.otherPpcMethod
+
+            if (lastSterilizationVisit.anyContraceptionMethod == true) {
+                list.add(list.indexOf(anyContraceptionMethod) + 1, contraceptionMethod)
+
+                if (lastSterilizationVisit.contraceptionMethod?.let { it in englishSterilisation } == true) {
+                    list.add(list.indexOf(contraceptionMethod) + 1, dateOfSterilisation)
+                }
+
+                if (lastSterilizationVisit.contraceptionMethod == englishContraceptionLast) {
+                    list.add(list.indexOf(contraceptionMethod) + 1, otherPpcMethod)
+                }
+            }
         }
-        val daysSinceDelivery = TimeUnit.MILLISECONDS.toDays(daysSinceDeliveryMillis)
-        pncPeriod.entries =
-            listOf(
-                1,
-                3,
-                7,
-                14,
-                21,
-                28,
-                42
-            ).filter { if (daysSinceDelivery == 0L) it <= 1 else it <= daysSinceDelivery }
-                .filter { it > (previousPnc?.pncPeriod ?: 0) }
-                .map { "Day $it" }.toTypedArray()
 
         saved?.let {
+            // saved.* dropdown fields are stored in English; re-localize for display
+            // so the user always sees the form in their current UI language. Conditional
+            // rendering compares against the English side since saved values are English.
+            val englishMotherDangerSignLast = englishResources.getStringArray(R.array.pnc_mother_danger_sign_array).last()
+            val englishPlaceOfDeath = englishResources.getStringArray(R.array.pnc_death_place_array)
+            val englishMaternalSymptomsLast = englishResources.getStringArray(R.array.pnc_maternal_symptoms_array).last()
+
             pncPeriod.value = "Day ${it.pncPeriod}"
             visitDate.value = getDateFromLong(it.pncDate)
+            enableVisitDateForSelection()
             ifaTabsGiven.value = it.ifaTabsGiven?.toString()
-            anyContraceptionMethod.value = it.anyContraceptionMethod?.let {
-                if (it)
+            calciumSupplementation.value = it.calciumSupplementation?.toString()
+            anyContraceptionMethod.value = it.anyContraceptionMethod?.let { yes ->
+                if (yes)
                     anyContraceptionMethod.entries!!.first()
                 else
                     anyContraceptionMethod.entries!!.last()
@@ -222,30 +367,75 @@ class PncFormDataset(
             if (it.anyContraceptionMethod == true) {
                 list.add(list.indexOf(anyContraceptionMethod) + 1, contraceptionMethod)
             }
-            contraceptionMethod.value = it.contraceptionMethod
-            if (it.contraceptionMethod == contraceptionMethod.entries!!.last()) {
+            contraceptionMethod.value = getLocalValueInArray(R.array.pnc_contraception_method_array, it.contraceptionMethod)
+            dateOfSterilisation.value = getDateFromLong(it.sterilisationDate ?: System.currentTimeMillis())
+            if (it.contraceptionMethod == englishContraceptionLast) {
                 list.add(list.indexOf(contraceptionMethod) + 1, otherPpcMethod)
             }
+            if (it.contraceptionMethod?.let { method -> method in englishSterilisation } == true) {
+                list.add(list.indexOf(contraceptionMethod) + 1, dateOfSterilisation)
+            }
             otherPpcMethod.value = it.otherPpcMethod
-            motherDangerSign.value = it.motherDangerSign
-            if (it.motherDangerSign == motherDangerSign.entries!!.last()) {
+            anyDangerSign.value = getLocalValueInArray(R.array.pnc_confirmation_array, it.anyDangerSign)
+            anyDangerSign.value?.let { dangerSignValue ->
+                // anyDangerSign.value is now local; entries.first() is also local — compare same-locale.
+                val isDangerSignYes = dangerSignValue == anyDangerSign.entries!!.first()
+                referralFacility.required = isDangerSignYes
+                if (isDangerSignYes) {
+                    list.add(list.indexOf(anyDangerSign) + 1, motherDangerSign)
+                }
+            }
+            maternalSymptoms.value = getLocalValuesInArray(R.array.pnc_maternal_symptoms_array, it.maternalSymptoms)
+            if (it.maternalSymptoms?.contains("Other") == true || it.maternalSymptoms?.contains(englishMaternalSymptomsLast) == true) {
+                list.add(list.indexOf(maternalSymptoms) + 1, otherMaternalSymptoms)
+            }
+            otherMaternalSymptoms.value = it.otherMaternalSymptoms
+            pallor.value = getLocalValueInArray(R.array.pnc_pallor_array, it.pallor)
+            // Severe pallor → referral alert. it.pallor is English so the literal compare is correct.
+            if (it.pallor?.equals("Severe", ignoreCase = true) == true) {
+                referralFacility.required = true
+                if (it.referralFacility.isNullOrBlank()) {
+                    referralFacility.errorText = resources.getString(R.string.pnc_referral_alert_severe_pallor)
+                }
+            }
+
+            vaginalBleeding.value = getLocalValueInArray(R.array.pnc_vaginal_bleeding_array, it.vaginalBleeding)
+            // Heavy / foul smell → referral alert. it.vaginalBleeding is English so literal compare is correct.
+            val vaginalBleedingValue = it.vaginalBleeding?.lowercase() ?: ""
+            if (vaginalBleedingValue.contains("heavy", ignoreCase = true) ||
+                vaginalBleedingValue.contains("foul smell", ignoreCase = true)) {
+                referralFacility.required = true
+                if (it.referralFacility.isNullOrBlank()) {
+                    referralFacility.errorText = resources.getString(R.string.pnc_referral_alert_vaginal_bleeding)
+                }
+            }
+            motherDangerSign.value = getLocalValueInArray(R.array.pnc_mother_danger_sign_array, it.motherDangerSign)
+            if (it.motherDangerSign == englishMotherDangerSignLast) {
                 list.add(list.indexOf(motherDangerSign) + 1, otherDangerSign)
             }
             otherDangerSign.value = it.otherDangerSign
-            referralFacility.value = it.referralFacility
+            referralFacility.value = getLocalValueInArray(R.array.pnc_referral_facility_array, it.referralFacility)
             motherDeath.value =
                 if (it.motherDeath) motherDeath.entries!!.first() else motherDeath.entries!!.last()
             if (it.motherDeath) {
                 deathDate.value = getDateStrFromLong(it.deathDate)
-                causeOfDeath.value = it.causeOfDeath
+                causeOfDeath.value = getLocalValueInArray(R.array.pnc_death_cause_array, it.causeOfDeath)
                 otherDeathCause.value = it.otherDeathCause
-                placeOfDeath.value = it.placeOfDeath
+                placeOfDeath.value = getLocalValueInArray(R.array.pnc_death_place_array, it.placeOfDeath)
+                otherPlaceOfDeath.value = it.otherPlaceOfDeath
                 list.addAll(
                     list.indexOf(motherDeath) + 1,
                     listOf(deathDate, causeOfDeath, placeOfDeath)
                 )
+                // causeOfDeath.value is now local; entries.last() is local — compare same-locale.
                 if (causeOfDeath.value == causeOfDeath.entries!!.last())
                     list.add(list.indexOf(causeOfDeath) + 1, otherDeathCause)
+                // it.placeOfDeath is English; look it up in the English array to find the index.
+                englishPlaceOfDeath.indexOf(it.placeOfDeath).takeIf { index -> index >= 0 }?.let { index ->
+                    if (index == 8) { // "Other" is at index 8
+                        list.add(list.indexOf(placeOfDeath) + 1, otherPlaceOfDeath)
+                    }
+                }
             }
             remarks.value = it.remarks
         }
@@ -295,134 +485,355 @@ class PncFormDataset(
 
     }
 
-    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
-        return when (formId) {
-            pncPeriod.id -> {
-                visitDate.inputType = InputType.DATE_PICKER
-                visitDate.value = null
-                val today = Calendar.getInstance().setToStartOfTheDay().timeInMillis
-                when (val visitNumber = pncPeriod.value!!.substring(4).toInt()) {
-                    1 -> {
-                        visitDate.min = minOf(today, dateOfDelivery)
-                        visitDate.max = minOf(
-                            today,
-                            dateOfDelivery + TimeUnit.DAYS.toMillis(1)
-                        )
-                    }
+    private fun configureDeliveryDateField() {
+        val today = getTodayStartMillis()
+        if (dateOfDelivery != 0L) {
+            deliveryDate.inputType = InputType.TEXT_VIEW
+            deliveryDate.isEnabled = false
+            deliveryDate.required = false
+            deliveryDate.hasDependants = false
+            deliveryDate.value = getDateFromLong(dateOfDelivery)
+        } else {
+            deliveryDate.inputType = InputType.DATE_PICKER
+            deliveryDate.isEnabled = true
+            deliveryDate.required = true
+            deliveryDate.hasDependants = true
+            deliveryDate.min = getMinDeliveryDate()
+            deliveryDate.max = today
+            deliveryDate.value = null
+        }
+    }
 
-                    3 -> {
-                        visitDate.min = minOf(today, dateOfDelivery + TimeUnit.DAYS.toMillis(3))
-                        visitDate.max = minOf(
-                            today,
-                            dateOfDelivery + TimeUnit.DAYS.toMillis(3)
-                        )
-                    }
+    private fun resetVisitDateToDisabled() {
+        visitDate.inputType = InputType.TEXT_VIEW
+        visitDate.isEnabled = false
+        visitDate.min = null
+        visitDate.max = null
+        visitDate.value = null
+    }
 
-                    7 -> {
-                        visitDate.min =
-                            minOf(
-                                today,
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(7) - TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                        visitDate.max =
-                            minOf(
-                                System.currentTimeMillis(),
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(7) + TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                    }
+    private fun enableVisitDateForSelection() {
+        visitDate.inputType = InputType.DATE_PICKER
+        visitDate.isEnabled = true
+        visitDate.min = null
+        visitDate.max = null
+    }
 
-                    14 -> {
-                        visitDate.min =
-                            minOf(
-                                today,
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(14) - TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                        visitDate.max =
-                            minOf(
-                                System.currentTimeMillis(),
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(14) + TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                    }
+    private fun updatePncPeriodEntries() {
+        val daysSinceDeliveryMillis = if (dateOfDelivery != 0L) {
+            val deliveryCal = Calendar.getInstance()
+            deliveryCal.timeInMillis = dateOfDelivery
+            deliveryCal.setToStartOfTheDay()
+            val deliveryMillis = deliveryCal.timeInMillis
+            getTodayStartMillis() - deliveryMillis
+        } else {
+            0L
+        }
+        val daysSinceDelivery = if (daysSinceDeliveryMillis > 0) {
+            TimeUnit.MILLISECONDS.toDays(daysSinceDeliveryMillis)
+        } else 0L
+
+        pncPeriod.entries = listOf(1, 3, 7, 14, 21, 28, 42)
+            .filter { if (daysSinceDelivery == 0L) it <= 1 else it <= daysSinceDelivery }
+            .filter { it > previousPncPeriod }
+            .map { "Day $it" }
+            .toTypedArray()
+    }
 
-                    21 -> {
-                        visitDate.min =
-                            minOf(
-                                today,
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(21) - TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                        visitDate.max =
-                            minOf(
-                                System.currentTimeMillis(),
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(21) + TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                    }
+    fun getSelectedDeliveryDateMillis(): Long? {
+        val fromField = deliveryDate.value?.let { getLongFromDate(it) }?.takeIf { it > 0L }
+        return fromField ?: dateOfDelivery.takeIf { it > 0L }
+    }
 
-                    28 -> {
-                        visitDate.min =
-                            minOf(
-                                today,
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(28) - TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                        visitDate.max =
-                            minOf(
-                                System.currentTimeMillis(),
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(28) + TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                    }
+    /**
+     * Evaluates all referral conditions and updates referralFacility.required and errorText accordingly.
+     * Checks: anyDangerSign, maternalSymptoms (≥2 symptoms), pallor (Severe), vaginalBleeding (Heavy/Foul smell).
+     * Priority: anyDangerSign > multiple symptoms > severe pallor > vaginal bleeding
+     */
+    private fun updateReferralRequirement() {
+        // anyDangerSign.value and entries.first() are both in the current UI locale — compare same-locale.
+        val hasAnyDangerSign = anyDangerSign.value?.equals(anyDangerSign.entries!!.first(), ignoreCase = true) == true
+
+        if (hasAnyDangerSign) {
+            referralFacility.required = true
+            referralFacility.errorText = null
+            return
+        }
 
-                    42 -> {
-                        visitDate.min =
-                            minOf(
-                                today,
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(42) - TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                        visitDate.max =
-                            minOf(
-                                System.currentTimeMillis(),
-                                dateOfDelivery + TimeUnit.DAYS.toMillis(42) + TimeUnit.DAYS.toMillis(
-                                    3
-                                )
-                            )
-                    }
+        // The remaining checks key off canonical English literals ("None", "Severe", "heavy",
+        // "foul smell"). Since FormElement.value is in the current UI locale, canonicalize each
+        // value to English first so the predicates fire in Hindi / Assamese sessions too.
 
-                    else -> throw IllegalStateException("Illegal PNC Date $visitNumber")
-                }
-                return -1
+        // maternalSymptoms - ≥2 actual symptoms (excluding "None")
+        val maternalSymptomsEnglish = getEnglishValuesInArray(
+            R.array.pnc_maternal_symptoms_array, maternalSymptoms.value
+        )?.split(",")?.map { it.trim() } ?: emptyList()
+        val actualSymptoms = maternalSymptomsEnglish.filter {
+            it.isNotBlank() && !it.equals("None", ignoreCase = true)
+        }
+
+        if (actualSymptoms.size >= 2) {
+            referralFacility.required = true
+            // Only show alert if no facility selected yet; clear once selected so it doesn't block submission
+            if (referralFacility.value.isNullOrBlank()) {
+                referralFacility.errorText = resources.getString(R.string.pnc_referral_alert_multiple_symptoms)
+            } else {
+                referralFacility.errorText = null
             }
+            return
+        }
+
+        // pallor - Severe
+        val pallorEnglish = getEnglishValueInArray(R.array.pnc_pallor_array, pallor.value)?.trim() ?: ""
+        if (pallorEnglish.equals("Severe", ignoreCase = true)) {
+            referralFacility.required = true
+            if (referralFacility.value.isNullOrBlank()) {
+                referralFacility.errorText = resources.getString(R.string.pnc_referral_alert_severe_pallor)
+            } else {
+                referralFacility.errorText = null
+            }
+            return
+        }
+
+        // vaginalBleeding - Heavy or Foul smell (substring match on the canonical English entry)
+        val vaginalBleedingEnglish = getEnglishValueInArray(
+            R.array.pnc_vaginal_bleeding_array, vaginalBleeding.value
+        )?.trim()?.lowercase() ?: ""
+        if (vaginalBleedingEnglish.contains("heavy") ||
+            vaginalBleedingEnglish.contains("foul smell")) {
+            referralFacility.required = true
+            if (referralFacility.value.isNullOrBlank()) {
+                referralFacility.errorText = resources.getString(R.string.pnc_referral_alert_vaginal_bleeding)
+            } else {
+                referralFacility.errorText = null
+            }
+            return
+        }
+
+        // No referral conditions met - clear requirement
+        referralFacility.required = false
+        referralFacility.errorText = null
+    }
+
+    // ─── Helper: handle PNC period selection and compute visit date range ─
+    private fun handlePncPeriodChange(): Int {
+        visitDate.value = null
+        enableVisitDateForSelection()
+        return getIndexById(visitDate.id)
+    }
+
+    private fun handleDeliveryDateChange(): Int {
+        dateOfDelivery = deliveryDate.value?.let { getLongFromDate(it) } ?: 0L
+        if (dateOfDelivery != 0L) {
+            deathDate.min = dateOfDelivery
+            dateOfSterilisation.min = dateOfDelivery
+        }
+        updatePncPeriodEntries()
+        return getIndexById(pncPeriod.id)
+    }
+
+    // ─── Helper: handle contraception method selection ─────────────────
+    private fun handleContraceptionMethodChange(index: Int): Int {
+        val selected = contraceptionMethod.entries?.getOrNull(index)?.trim() ?: ""
+        val anyOtherValue = contraceptionMethod.entries!!.last().trim()
+        val result1 = if (selected.equals(anyOtherValue, ignoreCase = true)) {
+            triggerDependants(
+                source = contraceptionMethod,
+                passedIndex = index,
+                triggerIndex = contraceptionMethod.entries!!.lastIndex,
+                target = otherPpcMethod
+            )
+        } else {
+            triggerDependants(
+                source = contraceptionMethod,
+                passedIndex = -1,
+                triggerIndex = contraceptionMethod.entries!!.lastIndex,
+                target = otherPpcMethod
+            )
+        }
+
+        val isSterilisation = sterilisation.any { it.equals(selected, ignoreCase = true) }
+        val result2 = if (isSterilisation) {
+            dateOfSterilisation.min = dateOfDelivery
+            dateOfSterilisation.max = System.currentTimeMillis()
+            triggerDependants(
+                source = contraceptionMethod,
+                passedIndex = index,
+                triggerIndex = index,
+                target = dateOfSterilisation
+            )
+        } else {
+            dateOfSterilisation.value = null
+            triggerDependants(
+                source = contraceptionMethod,
+                passedIndex = -1,
+                triggerIndex = index,
+                target = dateOfSterilisation
+            )
+        }
+
+        return if (result1 != -1) result1 else result2
+    }
+
+    // ─── Helper: handle danger sign toggle and referral requirement ────
+    private fun handleDangerSignChange(index: Int): Int {
+        val result = triggerDependants(
+            source = anyDangerSign,
+            passedIndex = index,
+            triggerIndex = 0,
+            target = motherDangerSign,
+            targetSideEffect = listOf(otherDangerSign)
+        )
+
+        val oldRequiredState = referralFacility.required
+        if (index == 0) {
+            referralFacility.required = true
+        } else {
+            referralFacility.required = false
+            referralFacility.errorText = null
+        }
+        val referralFacilityIndex = getIndexById(referralFacility.id)
+        return if (oldRequiredState != referralFacility.required && referralFacilityIndex != -1) {
+            referralFacilityIndex
+        } else {
+            result
+        }
+    }
 
-            ifaTabsGiven.id -> validateIntMinMax(ifaTabsGiven)
+    // ─── Helper: handle mother death toggle ───────────────────────────
+    private fun handleMotherDeathChange(index: Int): Int {
+        return if (index == 0) {
+            triggerDependants(
+                source = motherDeath,
+                removeItems = listOf(
+                    ifaTabsGiven,
+                    calciumSupplementation,
+                    anyContraceptionMethod,
+                    anyDangerSign,
+                    maternalSymptoms,
+                    pallor,
+                    vaginalBleeding,
+                    referralFacility,
+                    remarks
+                ),
+                addItems = listOf(
+                    deathDate,
+                    causeOfDeath,
+                    placeOfDeath,
+                    otherDeathCause,
+                    otherPlaceOfDeath
+                )
+            )
+        } else {
+            triggerDependants(
+                source = motherDeath,
+                removeItems = listOf(
+                    deathDate,
+                    causeOfDeath,
+                    placeOfDeath,
+                    otherDeathCause,
+                    otherPlaceOfDeath
+                ),
+                addItems = listOf(
+                    ifaTabsGiven,
+                    calciumSupplementation,
+                    anyContraceptionMethod,
+                    anyDangerSign,
+                    maternalSymptoms,
+                    pallor,
+                    vaginalBleeding,
+                    referralFacility,
+                    remarks
+                )
+            )
+        }
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            deliveryDate.id -> handleDeliveryDateChange()
+
+            pncPeriod.id -> handlePncPeriodChange()
+
+            ifaTabsGiven.id -> {
+                // IFA Tablets: >0 and ≤400, supports 180-day postpartum supplementation
+                val result = validateIntMinMax(ifaTabsGiven)
+                ifaTabsGiven.value?.toIntOrNull()?.let { value ->
+                    if (value > 400) {
+                        ifaTabsGiven.errorText = resources.getString(R.string.pnc_ifa_max_error)
+                        return getIndexById(ifaTabsGiven.id)
+                    }
+                }
+                result
+            }
+            
+            calciumSupplementation.id -> {
+                // Calcium: ≤400
+                val result = validateIntMinMax(calciumSupplementation)
+                calciumSupplementation.value?.toIntOrNull()?.let { value ->
+                    if (value > 400) {
+                        calciumSupplementation.errorText = resources.getString(R.string.pnc_calcium_max_error)
+                        return getIndexById(calciumSupplementation.id)
+                    }
+                }
+                result
+            }
+            
             anyContraceptionMethod.id -> triggerDependants(
                 source = anyContraceptionMethod,
                 passedIndex = index,
                 triggerIndex = 0,
                 target = contraceptionMethod,
-                targetSideEffect = listOf(otherPpcMethod)
+                targetSideEffect = listOf(otherPpcMethod, dateOfSterilisation)
             )
 
-            contraceptionMethod.id -> triggerDependants(
-                source = contraceptionMethod,
-                passedIndex = index,
-                triggerIndex = contraceptionMethod.entries!!.lastIndex,
-                target = otherPpcMethod,
-            )
+            contraceptionMethod.id -> handleContraceptionMethodChange(index)
+
+            anyDangerSign.id -> handleDangerSignChange(index)
+
+            maternalSymptoms.id -> {
+                val realIndex = (if (index < 0) -index else index) - 1
+                val clickedOption = maternalSymptoms.entries?.getOrNull(realIndex) ?: return -1
+                val currentValue = maternalSymptoms.value ?: ""
+
+                if (clickedOption.equals("None", ignoreCase = true)) {
+                    if (currentValue.contains("None", ignoreCase = true)) {
+                        maternalSymptoms.value = "None"
+                    }
+                } else {
+                    val selections = mutableSetOf<String>()
+                    if (currentValue.isNotEmpty()) {
+                        selections.addAll(currentValue.split(",").map { it.trim() }.filter { it.isNotEmpty() })
+                    }
+                    if (selections.contains(clickedOption)) {
+                        val noneEntry = maternalSymptoms.entries?.find { it.equals("None", ignoreCase = true) }
+                        if (noneEntry != null && selections.contains(noneEntry)) {
+                            selections.remove(noneEntry)
+                        }
+                        maternalSymptoms.value = selections.joinToString(", ")
+                    }
+                }
+
+                // Handle "Other" field visibility
+                val selectedValues = maternalSymptoms.value?.split(",")?.map { it.trim() } ?: emptyList()
+                val hasOther = selectedValues.any { it.equals(maternalSymptoms.entries!!.last(), ignoreCase = true) }
+
+                // Update referral logic
+                updateReferralRequirement()
+
+                triggerDependants(
+                    source = maternalSymptoms,
+                    passedIndex = if (hasOther) maternalSymptoms.entries!!.lastIndex else -1,
+                    triggerIndex = maternalSymptoms.entries!!.lastIndex,
+                    target = otherMaternalSymptoms
+                )
+                
+                return getIndexById(maternalSymptoms.id)
+            }
+
+            otherMaternalSymptoms.id -> {
+                validateAllAlphabetsSpaceOnEditText(otherMaternalSymptoms)
+            }
 
             motherDangerSign.id ->
                 triggerDependants(
@@ -431,17 +842,28 @@ class PncFormDataset(
                     triggerIndex = motherDangerSign.entries!!.lastIndex,
                     target = otherDangerSign
                 )
+            
+            pallor.id -> {
+                // Update referral requirement based on all conditions
+                updateReferralRequirement()
+                val referralFacilityIndex = getIndexById(referralFacility.id)
+                return if (referralFacility.required && referralFacilityIndex != -1) referralFacilityIndex else -1
+            }
+            
+            vaginalBleeding.id -> {
+                // Update referral requirement based on all conditions
+                updateReferralRequirement()
+                val referralFacilityIndex = getIndexById(referralFacility.id)
+                return if (referralFacility.required && referralFacilityIndex != -1) referralFacilityIndex else -1
+            }
 
-            motherDeath.id -> {
-                triggerDependants(
-                    source = motherDeath,
-                    passedIndex = index,
-                    triggerIndex = 0,
-                    target = listOf(deathDate, causeOfDeath, placeOfDeath),
-                    targetSideEffect = listOf(otherDeathCause)
-                )
+            referralFacility.id -> {
+                updateReferralRequirement()
+                getIndexById(referralFacility.id)
             }
 
+            motherDeath.id -> handleMotherDeathChange(index)
+
             causeOfDeath.id -> {
                 triggerDependants(
                     source = causeOfDeath,
@@ -451,6 +873,24 @@ class PncFormDataset(
                 )
             }
 
+            otherPpcMethod.id -> {
+                validateAllAlphabetsSpaceOnEditText(otherPpcMethod)
+            }
+
+            otherDeathCause.id -> {
+                validateAllAlphabetsSpaceOnEditText(otherDeathCause)
+            }
+
+            placeOfDeath.id -> {
+                val triggerIndex = 8 // "Other" is at index 8
+                return triggerDependants(
+                    source = placeOfDeath,
+                    passedIndex = index,
+                    triggerIndex = triggerIndex,
+                    target = otherPlaceOfDeath
+                )
+            }
+
 //
             else -> -1
         }
@@ -471,20 +911,30 @@ class PncFormDataset(
             form.pncPeriod = pncPeriod.value!!.substring(4).toInt()
             form.pncDate = getLongFromDate(visitDate.value!!)
             form.ifaTabsGiven = ifaTabsGiven.value?.takeIf { it.isNotEmpty() }?.toInt()
+            form.calciumSupplementation = calciumSupplementation.value?.takeIf { it.isNotEmpty() }?.toInt()
             form.anyContraceptionMethod =
                 anyContraceptionMethod.value?.let { it == anyContraceptionMethod.entries!!.first() }
-            form.contraceptionMethod = contraceptionMethod.value?.takeIf { it.isNotEmpty() }
+            // Persist every dropdown value in its English canonical form so the
+            // DB stays locale-neutral. Display-time localization happens in setUpPage.
+            form.contraceptionMethod = getEnglishValueInArray(R.array.pnc_contraception_method_array, contraceptionMethod.value)?.takeIf { it.isNotEmpty() }
+            form.sterilisationDate = dateOfSterilisation.value?.let { getLongFromDate(it) }
             form.otherPpcMethod = otherPpcMethod.value?.takeIf { it.isNotEmpty() }
-            form.motherDangerSign = motherDangerSign.value?.takeIf { it.isNotEmpty() }
+            form.anyDangerSign = getEnglishValueInArray(R.array.pnc_confirmation_array, anyDangerSign.value)?.takeIf { it.isNotEmpty() }
+            form.maternalSymptoms = getEnglishValuesInArray(R.array.pnc_maternal_symptoms_array, maternalSymptoms.value)?.takeIf { it.isNotEmpty() }
+            form.otherMaternalSymptoms = otherMaternalSymptoms.value?.takeIf { it.isNotEmpty() }
+            form.pallor = getEnglishValueInArray(R.array.pnc_pallor_array, pallor.value)?.takeIf { it.isNotEmpty() }
+            form.vaginalBleeding = getEnglishValueInArray(R.array.pnc_vaginal_bleeding_array, vaginalBleeding.value)?.takeIf { it.isNotEmpty() }
+            form.motherDangerSign = getEnglishValueInArray(R.array.pnc_mother_danger_sign_array, motherDangerSign.value)?.takeIf { it.isNotEmpty() }
             form.otherDangerSign = otherDangerSign.value?.takeIf { it.isNotEmpty() }
-            form.referralFacility = referralFacility.value?.takeIf { it.isNotEmpty() }
+            form.referralFacility = getEnglishValueInArray(R.array.pnc_referral_facility_array, referralFacility.value)?.takeIf { it.isNotEmpty() }
             form.motherDeath =
                 motherDeath.value?.let { it == motherDeath.entries!!.first() } ?: false
             form.deathDate = deathDate.value?.let { getLongFromDate(it) }
-            form.causeOfDeath = causeOfDeath.value?.takeIf { it.isNotEmpty() }
+            form.causeOfDeath = getEnglishValueInArray(R.array.pnc_death_cause_array, causeOfDeath.value)?.takeIf { it.isNotEmpty() }
             form.otherDeathCause = otherDeathCause.value?.takeIf { it.isNotEmpty() }
-            form.placeOfDeath = placeOfDeath.value?.takeIf { it.isNotEmpty() }
+            form.placeOfDeath = getEnglishValueInArray(R.array.pnc_death_place_array, placeOfDeath.value)?.takeIf { it.isNotEmpty() }
+            form.otherPlaceOfDeath = otherPlaceOfDeath.value?.takeIf { it.isNotEmpty() }
             form.remarks = remarks.value?.takeIf { it.isNotEmpty() }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncAbortionDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncAbortionDataset.kt
new file mode 100644
index 000000000..24e86b03f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncAbortionDataset.kt
@@ -0,0 +1,265 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.utils.ImgUtils
+import org.piramalswasthya.cho.helpers.getCurrentGestationalAgeFormatted
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import java.util.concurrent.TimeUnit
+
+class PregnantWomanAncAbortionDataset(
+    context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private val appContext = context.applicationContext
+
+    private lateinit var registration: PregnantWomanRegistrationCache
+
+    private val visitDate = FormElement(
+        id = 1,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.visit_date),
+        required = true,
+        max = System.currentTimeMillis()
+    )
+    private val weekOfPregnancy = FormElement(
+        id = 2,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.weeks_of_pregnancy),
+        required = false
+    )
+    private val abortionDate = FormElement(
+        id = 3,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.abortion_date),
+        required = false
+    )
+    private val abortionType = FormElement(
+        id = 4,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.abortion_type),
+        required = false
+    )
+    private val abortionFacility = FormElement(
+        id = 5,
+        inputType = InputType.TEXT_VIEW,
+        title = resources.getString(R.string.facility_place_of_abortion),
+        required = false
+    )
+    private val serialNoAsPerAdmission = FormElement(
+        id = 6,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.serial_no_as_per_admission_evacuation_register),
+        required = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_FLAG_SIGNED,
+        etMaxLength = 10
+    )
+    private val methodOfTermination = FormElement(
+        id = 7,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.method_of_termination),
+        required = true,
+        entries = resources.getStringArray(R.array.anc_method_of_termination)
+    )
+    private val terminationDoneBy = FormElement(
+        id = 8,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.termination_done_by),
+        required = true,
+        entries = resources.getStringArray(R.array.anc_termination_done_by)
+    )
+    private val planningHeadline = FormElement(
+        id = 25,
+        inputType = InputType.HEADLINE,
+        title = resources.getString(R.string.what_family_planning_method_has_been_chosen_after_the_abortion),
+        required = false
+    )
+    private val isPaiucd = FormElement(
+        id = 9,
+        inputType = InputType.RADIO,
+        title = " ",
+        required = false,
+        hasDependants = true,
+        orientation = 1,
+        entries = resources.getStringArray(R.array.abortion_isplaning_array)
+    )
+    private val isYesOrNo = FormElement(
+        id = 23,
+        inputType = InputType.RADIO,
+        title = " ",
+        required = true,
+        hasDependants = true,
+        orientation = 1,
+        entries = resources.getStringArray(R.array.anc_confirmation_array)
+    )
+    private val dateOfSterilization = FormElement(
+        id = 24,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.date_of_sterilisation),
+        required = true,
+        max = System.currentTimeMillis()
+    )
+    private val remarks = FormElement(
+        id = 10,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.remarks),
+        required = false,
+        etMaxLength = 100
+    )
+    private val abortionDischargeSummaryImg1 = FormElement(
+        id = 21,
+        inputType = InputType.FILE_UPLOAD,
+        title = resources.getString(R.string.abortion_discharge_summary_1),
+        required = false
+    )
+    private val abortionDischargeSummaryImg2 = FormElement(
+        id = 22,
+        inputType = InputType.FILE_UPLOAD,
+        title = resources.getString(R.string.abortion_discharge_summary_2),
+        required = false
+    )
+
+    suspend fun setUpPage(
+        registrationRecord: PregnantWomanRegistrationCache,
+        abortionAnc: PregnantWomanAncCache
+    ) {
+        registration = registrationRecord
+        val list = mutableListOf(
+            visitDate,
+            weekOfPregnancy,
+            abortionDate,
+            abortionType,
+            abortionFacility,
+            serialNoAsPerAdmission,
+            methodOfTermination,
+            terminationDoneBy,
+            planningHeadline,
+            isPaiucd,
+            remarks,
+            abortionDischargeSummaryImg1,
+            abortionDischargeSummaryImg2
+        )
+
+        val now = System.currentTimeMillis()
+        val oneYearMillis = TimeUnit.DAYS.toMillis(365)
+        abortionDate.min = registration.lmpDate + TimeUnit.DAYS.toMillis(5 * 7 + 1)
+        abortionDate.max = minOf(now, registration.lmpDate + TimeUnit.DAYS.toMillis(21 * 7))
+
+        visitDate.min = abortionAnc.abortionDate ?: (now - oneYearMillis)
+        dateOfSterilization.min = abortionAnc.abortionDate
+
+        visitDate.value = abortionAnc.visitDate?.let { getDateFromLong(it) }
+        weekOfPregnancy.value = getCurrentGestationalAgeFormatted(registration.lmpDate)
+        abortionType.value = abortionAnc.abortionType
+        abortionFacility.value = abortionAnc.abortionFacility
+        abortionDate.value = abortionAnc.abortionDate?.let { getDateFromLong(it) }
+        serialNoAsPerAdmission.value = abortionAnc.serialNo
+        methodOfTermination.value = abortionAnc.methodOfTermination
+        terminationDoneBy.value = abortionAnc.terminationDoneBy
+        remarks.value = abortionAnc.remarks
+        abortionDischargeSummaryImg1.value = abortionAnc.abortionImg1
+        abortionDischargeSummaryImg2.value = abortionAnc.abortionImg2
+        isPaiucd.value = when (abortionAnc.isPaiucdId) {
+            1 -> isPaiucd.entries?.getOrNull(0)
+            2 -> isPaiucd.entries?.getOrNull(1)
+            else -> abortionAnc.isPaiucd
+        }
+        if (abortionAnc.isPaiucdId != null && abortionAnc.isPaiucdId != 0) {
+            list.add(list.indexOf(isPaiucd) + 1, isYesOrNo)
+            isYesOrNo.value = if (abortionAnc.isYesOrNo == true) {
+                isYesOrNo.entries?.getOrNull(0)
+            } else {
+                isYesOrNo.entries?.getOrNull(1)
+            }
+            if (abortionAnc.isPaiucdId == 2 && abortionAnc.isYesOrNo == true) {
+                list.add(list.indexOf(isYesOrNo) + 1, dateOfSterilization)
+                dateOfSterilization.value = abortionAnc.dateSterilisation?.let { getDateFromLong(it) }
+            }
+        }
+
+        setUpPage(list)
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            visitDate.id -> -1
+
+            isPaiucd.id -> {
+                isYesOrNo.value = null
+                triggerDependants(
+                    source = isPaiucd,
+                    addItems = listOf(isYesOrNo),
+                    removeItems = listOf(dateOfSterilization)
+                )
+            }
+
+            isYesOrNo.id -> {
+                val paiucdSecondOption = (isPaiucd.entries?.indexOf(isPaiucd.value ?: "") ?: -1) == 1
+                if (isYesOrNo.value == "Yes" && paiucdSecondOption) {
+                    triggerDependants(
+                        source = isYesOrNo,
+                        addItems = listOf(dateOfSterilization),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    triggerDependants(
+                        source = isYesOrNo,
+                        addItems = emptyList(),
+                        removeItems = listOf(dateOfSterilization)
+                    )
+                }
+            }
+            else -> -1
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as PregnantWomanAncCache).let { cache ->
+            cache.visitDate = visitDate.value?.let { getLongFromDate(it) }
+            cache.lmpDate = registration.lmpDate
+            cache.serialNo = serialNoAsPerAdmission.value
+            cache.methodOfTermination = methodOfTermination.value
+            cache.methodOfTerminationId = methodOfTermination.entries?.indexOf(methodOfTermination.value ?: "")?.takeIf { it >= 0 }
+            cache.terminationDoneBy = terminationDoneBy.value
+            cache.terminationDoneById = terminationDoneBy.entries?.indexOf(terminationDoneBy.value ?: "")?.takeIf { it >= 0 }
+            cache.isPaiucd = isPaiucd.value
+            cache.isPaiucdId = (isPaiucd.entries?.indexOf(isPaiucd.value ?: "") ?: -1) + 1
+            cache.isYesOrNo = isYesOrNo.entries?.indexOf(isYesOrNo.value ?: "") == 0
+            cache.remarks = remarks.value
+            cache.dateSterilisation = dateOfSterilization.value?.let { getLongFromDate(it) }
+            // Persist the picked image to internal storage and save only its
+            // path. Base64 encoding happens at upload time so the row stays
+            // small enough for SQLite's 2 MB CursorWindow.
+            cache.abortionImg1 = abortionDischargeSummaryImg1.value?.let {
+                ImgUtils.saveImageToInternalStorage(appContext, it)
+            }
+            cache.abortionImg2 = abortionDischargeSummaryImg2.value?.let {
+                ImgUtils.saveImageToInternalStorage(appContext, it)
+            }
+        }
+    }
+
+    fun getWeeksOfPregnancyIndex(): Int = getIndexById(weekOfPregnancy.id)
+
+    fun setImageUriToFormElement(formId: Int, uri: String) {
+        when (formId) {
+            21 -> abortionDischargeSummaryImg1.value = uri
+            22 -> abortionDischargeSummaryImg2.value = uri
+        }
+    }
+
+    fun getImageFieldIndex(formId: Int): Int = getIndexById(formId)
+
+    fun getAbortionImageFieldValue(formId: Int): String? {
+        return when (formId) {
+            abortionDischargeSummaryImg1.id -> abortionDischargeSummaryImg1.value
+            abortionDischargeSummaryImg2.id -> abortionDischargeSummaryImg2.value
+            else -> null
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncVisitDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncVisitDataset.kt
index 831c1ba5a..6ef074af3 100644
--- a/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncVisitDataset.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanAncVisitDataset.kt
@@ -5,6 +5,7 @@ import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.helpers.Konstants
 import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.helpers.getCurrentGestationalAgeFormatted
 import org.piramalswasthya.cho.helpers.getWeeksOfPregnancy
 import org.piramalswasthya.cho.model.FormElement
 import org.piramalswasthya.cho.model.InputType
@@ -18,6 +19,8 @@ class PregnantWomanAncVisitDataset(
     context: Context, currentLanguage: Languages
 ) : Dataset(context, currentLanguage) {
 
+    private val allTdDosesMessage: String get() = resources.getString(R.string.all_td_doses_message)
+
     private var lastAncVisitDate: Long = 0L
 
     private lateinit var regis: PregnantWomanRegistrationCache
@@ -77,52 +80,23 @@ class PregnantWomanAncVisitDataset(
     private val weight = FormElement(
         id = 8,
         inputType = InputType.EDIT_TEXT,
-        title = "Weight of PW (Kg) at time Registration",
+        title = "Weight of PW (Kg)",
         arrayId = -1,
         etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
         etMaxLength = 3,
-        required = false,
+        required = true,
         min = 30,
         max = 200
     )
     private val bp = FormElement(
         id = 9,
         inputType = InputType.EDIT_TEXT,
-        title = "BP of PW – Systolic/ Diastolic (mm Hg) ",
-//        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        title = "BP (Systolic/Diastolic) mmHg",
+        etInputType = android.text.InputType.TYPE_CLASS_PHONE,
         etMaxLength = 7,
-        required = false,
+        required = true,
+        hasDependants = true
     )
-//    private val bpDiastolic = FormElement(
-//        id = 10,
-//        inputType = InputType.EDIT_TEXT,
-//        title = "BP of PW (mm Hg) – Diastolic",
-//        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
-//        etMaxLength = 3,
-//        required = false,
-//        min = 30,
-//        max = 200
-//    )
-//    private val bpSystolicReq = FormElement(
-//        id = 119,
-//        inputType = InputType.EDIT_TEXT,
-//        title = "BP of PW (mm Hg) – Systolic",
-//        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
-//        etMaxLength = 3,
-//        required = true,
-//        min = 50,
-//        max = 300
-//    )
-//    private val bpDiastolicReq = FormElement(
-//        id = 120,
-//        inputType = InputType.EDIT_TEXT,
-//        title = "BP of PW (mm Hg) – Diastolic",
-//        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
-//        etMaxLength = 3,
-//        required = true,
-//        min = 30,
-//        max = 200
-//    )
 
     private val pulseRate = FormElement(
         id = 11,
@@ -141,7 +115,8 @@ class PregnantWomanAncVisitDataset(
         etMaxLength = 4,
         minDecimal = 2.0,
         maxDecimal = 15.0,
-        required = false,
+        required = true,
+        hasDependants = true
     )
 
     private val fundalHeight = FormElement(
@@ -154,10 +129,11 @@ class PregnantWomanAncVisitDataset(
     )
     private val urineAlbumin = FormElement(
         id = 14,
-        inputType = InputType.RADIO,
+        inputType = InputType.DROPDOWN,
         title = "Urine Albumin",
-        entries = arrayOf("Absent", "Present"),
+        entries = arrayOf("Negative", "Trace", "+", "++", "+++"),
         required = false,
+        hasDependants = true
     )
     private val randomBloodSugarTest = FormElement(
         id = 15,
@@ -184,7 +160,7 @@ class PregnantWomanAncVisitDataset(
     private val dateOfTTOrTdBooster = FormElement(
         id = 18,
         inputType = InputType.DATE_PICKER,
-        title = "Date of Td TT (Boooster Dose)",
+        title = "Date of Td TT (Booster Dose)",
         required = false,
         hasDependants = true,
 
@@ -235,7 +211,7 @@ class PregnantWomanAncVisitDataset(
         id = 23,
         inputType = InputType.EDIT_TEXT,
         title = "Any other High Risk conditions",
-        required = true,
+        required = false,
     )
     private val highRiskReferralFacility = FormElement(
         id = 24,
@@ -269,7 +245,8 @@ class PregnantWomanAncVisitDataset(
     private val maternalDeath = FormElement(
         id = 27, inputType = InputType.RADIO, title = "Maternal Death", entries = arrayOf(
             "No", "Yes",
-        ), required = false, hasDependants = true
+        ), required = false, hasDependants = true,
+        value = "No"
     )
     private val maternalDeathProbableCause = FormElement(
         id = 28,
@@ -313,6 +290,104 @@ class PregnantWomanAncVisitDataset(
         hasDependants = false
     )
 
+    private val bloodSugarFasting = FormElement(
+        id = 33,
+        inputType = InputType.EDIT_TEXT,
+        title = "Blood Sugar (Fasting) mg/dL",
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 3,
+        required = false,
+        min = 40,
+        max = 400,
+        hasDependants = true
+    )
+
+    private val urineSugar = FormElement(
+        id = 34,
+        inputType = InputType.DROPDOWN,
+        title = "Urine Sugar",
+        entries = arrayOf("Negative", "Trace", "+", "++", "+++"),
+        required = false,
+        hasDependants = true
+    )
+
+    private val fetalHeartRate = FormElement(
+        id = 35,
+        inputType = InputType.EDIT_TEXT,
+        title = "Fetal Heart Rate (FHR) bpm",
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL,
+        etMaxLength = 5,
+        required = false,
+        minDecimal = 40.0,
+        maxDecimal = 200.0,
+        hasDependants = true
+    )
+
+    private val calciumGiven = FormElement(
+        id = 36,
+        inputType = InputType.EDIT_TEXT,
+        title = "Calcium Given",
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_VARIATION_NORMAL,
+        etMaxLength = 3,
+        required = false,
+        min = 0,
+        max = 400
+    )
+
+    private val dangerSigns = FormElement(
+        id = 37,
+        inputType = InputType.CHECKBOXES,
+        title = "Danger Signs",
+        entries = arrayOf(
+            "None",
+            "Vaginal Bleeding",
+            "Swelling of hands, feet or face",
+            "Severe Headache",
+            "Blurred Vision",
+            "Convulsions/ seizures",
+            "Severe abdominal pain",
+            "Fever > 38°C",
+            "Painful urination/ Burning",
+            "Reduced fetal movement",
+            "Vaginal fluid leakage",
+            "Persistent vomiting",
+            "Breathlessness/ chest pain"
+        ),
+        required = false,
+        hasDependants = true
+    )
+
+    private val counsellingProvided = FormElement(
+        id = 38,
+        inputType = InputType.RADIO,
+        title = "Counselling Provided",
+        entries = arrayOf("No", "Yes"),
+        required = false,
+        hasDependants = true
+    )
+
+    private val counsellingTopics = FormElement(
+        id = 39,
+        inputType = InputType.CHECKBOXES,
+        title = "Which counselling was provided?",
+        entries = arrayOf(
+            "Nutrition",
+            "Birth Preparedness and Complication readiness",
+            "Identification of danger signs",
+            "Medication compliance (IFA/ Calcium/ other medications)",
+            "Immunization",
+            "Hygiene and Infection Prevention"
+        ),
+        required = false
+    )
+
+    private val nextAncVisitDate = FormElement(
+        id = 40,
+        inputType = InputType.DATE_PICKER,
+        title = "Next ANC Visit Date",
+        required = false
+    )
+
     private var toggleBp = false
 
     fun resetBpToggle() {
@@ -330,57 +405,137 @@ class PregnantWomanAncVisitDataset(
         saved: PregnantWomanAncCache?
     ) {
         this.regis = regis
-        val list = mutableListOf(
-            lmpDate,
-            ancDate,
-            weekOfPregnancy,
-            ancVisit,
+        val ancFields = listOf(
             isAborted,
             weight,
             bp,
             pulseRate,
             hb,
-            fundalHeight,
+            bloodSugarFasting,
+//            fundalHeight,
             urineAlbumin,
+            urineSugar,
+            fetalHeartRate,
             randomBloodSugarTest,
             dateOfTTOrTd1,
-            dateOfTTOrTd2,
-            dateOfTTOrTdBooster,
+//            dateOfTTOrTd2,             // Added dynamically
+//            dateOfTTOrTdBooster,       // Added dynamically
             numFolicAcidTabGiven,
             numIfaAcidTabGiven,
+            calciumGiven,
             anyHighRisk,
             highRiskReferralFacility,
             hrpConfirm,
+            dangerSigns,
+            counsellingProvided,
+            nextAncVisitDate
+        ).toMutableList()
+        
+        val list = mutableListOf(
+            lmpDate,
+            ancDate,
+            weekOfPregnancy,
+            ancVisit,
             maternalDeath
-
         )
+        
+        if (saved?.maternalDeath != true) {
+            list.addAll(ancFields)
+        }
+
+        // Dynamic Field Insertion based on History
+        val td1Index = list.indexOf(dateOfTTOrTd1)
+        if (td1Index != -1) {
+            // If Td1 is present (history or current), add Td2
+            if (regis.tt1 != null || dateOfTTOrTd1.value != null) {
+                if (!list.contains(dateOfTTOrTd2)) {
+                    val td1Date = regis.tt1 ?: getLongFromDate(dateOfTTOrTd1.value)
+                    if (td1Date != null) {
+                         val minTd2Date = td1Date + TimeUnit.DAYS.toMillis(4 * 7)
+                         val maxTd2Date = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+                         
+                         // Always add, just set type based on validity
+                         if (minTd2Date <= maxTd2Date) {
+                             dateOfTTOrTd2.inputType = InputType.DATE_PICKER
+                             dateOfTTOrTd2.min = minTd2Date
+                             dateOfTTOrTd2.max = maxTd2Date
+                         } else {
+                             dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                         }
+                         list.add(td1Index + 1, dateOfTTOrTd2)
+                    }
+                }
+            }
+            // If Td2 is present (history or current), add Booster
+            if (regis.tt2 != null || dateOfTTOrTd2.value != null) {
+                 val td2Index = list.indexOf(dateOfTTOrTd2)
+                 if (td2Index != -1) { 
+                     if (!list.contains(dateOfTTOrTdBooster)) {
+                         val minBoosterDate = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+                         val maxBoosterDate = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+                         
+                         if (minBoosterDate <= maxBoosterDate) {
+                            dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
+                            dateOfTTOrTdBooster.min = minBoosterDate
+                            dateOfTTOrTdBooster.max = maxBoosterDate
+                         } else {
+                            dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+                         }
+                         list.add(td2Index + 1, dateOfTTOrTdBooster)
+                     }
+                 }
+            }
+        }
+
         lmpDate.value = this.regis.getDateStringFromLong(this.regis.lmpDate)
-        abortionDate.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7 + 1)
-        dateOfTTOrTd1.min = abortionDate.min
-        dateOfTTOrTdBooster.min = abortionDate.min
+        abortionDate.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+        // TD Dose 1: 5 weeks from LMP to 36 weeks of LMP, ≤ today
+        dateOfTTOrTd1.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+        dateOfTTOrTd1.max = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+        // TT Booster: 5 weeks from LMP to 36 weeks of LMP, ≤ today
+        dateOfTTOrTdBooster.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+        dateOfTTOrTdBooster.max = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+        // Abortion date: 5–20 weeks from LMP, ≤ today
         abortionDate.max =
-            minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(21 * 7))
-        dateOfTTOrTd1.max = abortionDate.max
-        dateOfTTOrTd2.max = abortionDate.max
-        dateOfTTOrTdBooster.max = abortionDate.max
+            minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(20 * 7))
+
+        // Next ANC Visit Date range (> today, <= EDD)
+        val edd = getEddFromLmp(regis.lmpDate)
+        val tomorrow = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1)
+        nextAncVisitDate.max = edd
+        // Allow saved next visit date when editing, but still cap at EDD and ensure >= tomorrow for new visits
+        saved?.let { savedAnc ->
+            val savedCandidate = savedAnc.nextAncVisitDate ?: (savedAnc.ancDate + TimeUnit.DAYS.toMillis(1))
+            nextAncVisitDate.min = minOf(maxOf(tomorrow, savedCandidate), edd)
+        } ?: run {
+            nextAncVisitDate.min = minOf(tomorrow, edd)
+        }
+
 
-        if (lastAnc == null)
-            list.remove(dateOfTTOrTd2)
         setUpTdX()
         ben?.let {
             ancDate.min =
                 regis.lmpDate + TimeUnit.DAYS.toMillis(7 * Konstants.minAnc1Week.toLong() + 1)
-            ancVisit.entries = arrayOf("1", "2", "3", "4")
+            ancVisit.entries = when (visitNumber) {
+                1 -> arrayOf("1", "2", "3", "4")
+                2 -> arrayOf("2", "3", "4")
+                3 -> arrayOf("3", "4")
+                else -> arrayOf(visitNumber.toString()) // Visit 4, 5, 6, etc.
+            }
+            // For visit 4 and higher, change dropdown to read-only text field
+            if (visitNumber >= 4) {
+                ancVisit.inputType = InputType.TEXT_VIEW
+            }
             lastAnc?.let { last ->
                 ancDate.min = last.ancDate + TimeUnit.DAYS.toMillis(4 * 7)
-                ancVisit.entries = arrayOf(2, 3, 4).filter {
-                    it > last.visitNumber
-                }.map { it.toString() }.toTypedArray()
-
                 lastAncVisitDate = last.ancDate
             }
-            ancDate.max =
-                minOf(getEddFromLmp(regis.lmpDate), System.currentTimeMillis())
+            // ANC date max: ≤42 weeks from LMP, ≤ EDD (40 weeks), and ≤ today
+            ancDate.max = minOf(
+                regis.lmpDate + TimeUnit.DAYS.toMillis(42 * 7), // 42 weeks from LMP
+                getEddFromLmp(regis.lmpDate), // EDD (40 weeks)
+                System.currentTimeMillis() // Today
+            )
             ancDate.value = getDateFromLong(ancDate.max!!)
             maternalDateOfDeath.min =
                 maxOf(regis.lmpDate, lastAncVisitDate) + TimeUnit.DAYS.toMillis(1)
@@ -390,58 +545,92 @@ class PregnantWomanAncVisitDataset(
 
 //        ancDate.value = getDateFromLong(System.currentTimeMillis())
         if (saved == null) {
-            weekOfPregnancy.value = ancDate.value?.let {
+            ancDate.value?.let {
                 val long = getLongFromDate(it)
                 val weeks = getWeeksOfPregnancy(long, regis.lmpDate)
                 if (weeks >= Konstants.minWeekToShowDelivered) {
-                    list.add(deliveryDone)
+                    if (saved?.maternalDeath != true) list.add(deliveryDone)
                 }
                 if (weeks <= 12) {
-                    list.remove(fundalHeight)
+                    fundalHeight.inputType = InputType.TEXT_VIEW
+                    fundalHeight.value = null
+
                     list.remove(numIfaAcidTabGiven)
                 } else {
+                    fundalHeight.inputType = InputType.EDIT_TEXT
                     list.remove(numFolicAcidTabGiven)
                 }
-                weeks.toString()
+                // Disable Calcium up to 14 weeks
+                if (weeks <= 14) {
+                    list.remove(calciumGiven)
+                }
+                if (weeks > Konstants.maxWeekToShowAbortion) {
+                    list.remove(isAborted)
+                }
             }
+            weekOfPregnancy.value = getCurrentGestationalAgeFormatted(regis.lmpDate)
         }
 
-        ancVisit.value = visitNumber.toString()
+        ancVisit.value = if (ancVisit.entries?.contains(visitNumber.toString()) == true) visitNumber.toString() else (ancVisit.entries?.firstOrNull() ?: visitNumber.toString())
 
         saved?.let { savedAnc ->
 
             val woP = getWeeksOfPregnancy(savedAnc.ancDate, regis.lmpDate)
-            if (woP <= 12) {
-                list.remove(fundalHeight)
-                list.remove(numIfaAcidTabGiven)
-            } else {
-                list.remove(numFolicAcidTabGiven)
-            }
-            if (woP >= Konstants.minWeekToShowDelivered) {
-                if (!list.contains(deliveryDone)) list.add(deliveryDone)
+            
+            if (savedAnc.maternalDeath != true) {
+                 if (woP <= 12) {
+                    fundalHeight.inputType = InputType.TEXT_VIEW
+                    fundalHeight.value = null
+
+                    list.remove(numIfaAcidTabGiven)
+                } else {
+                    fundalHeight.inputType = InputType.EDIT_TEXT
+                    list.remove(numFolicAcidTabGiven)
+                }
+                // Disable Calcium up to 14 weeks when editing saved visits too
+                if (woP <= 14) {
+                    list.remove(calciumGiven)
+                }
+                if (woP >= Konstants.minWeekToShowDelivered) {
+                    if (!list.contains(deliveryDone)) list.add(deliveryDone)
+                }
+                if (woP > Konstants.maxWeekToShowAbortion) {
+                    list.remove(isAborted)
+                }
             }
+
             ancDate.value = getDateFromLong(savedAnc.ancDate)
-            weekOfPregnancy.value = woP.toString()
-            isAborted.value =
-                if (savedAnc.isAborted) isAborted.entries!!.last() else isAborted.entries!!.first()
-            if (savedAnc.isAborted) {
-                abortionType.value = abortionType.getStringFromPosition(savedAnc.abortionTypeId)
-                abortionFacility.value =
-                    abortionFacility.getStringFromPosition(savedAnc.abortionFacilityId)
-                abortionDate.value = savedAnc.abortionDate?.let { getDateFromLong(it) }
-                list.addAll(
-                    list.indexOf(isAborted) + 1,
-                    listOf(abortionType, abortionFacility, abortionDate)
-                )
+            weekOfPregnancy.value = getCurrentGestationalAgeFormatted(regis.lmpDate)
+            
+            if (list.contains(isAborted)) {
+                isAborted.value =
+                    if (savedAnc.isAborted) isAborted.entries!!.last() else isAborted.entries!!.first()
+                if (savedAnc.isAborted) {
+                    abortionType.value = abortionType.getStringFromPosition(savedAnc.abortionTypeId)
+                    abortionFacility.value =
+                        abortionFacility.getStringFromPosition(savedAnc.abortionFacilityId)
+                    abortionDate.value = savedAnc.abortionDate?.let { getDateFromLong(it) }
+                    list.removeAll(abortionDisabledFields())
+                    list.addAll(
+                        list.indexOf(isAborted) + 1,
+                        listOf(abortionType, abortionFacility, abortionDate)
+                    )
+                }
             }
+
             weight.value = savedAnc.weight?.toString()
             bp.value =
                 if (savedAnc.bpSystolic == null || savedAnc.bpDiastolic == null) null else "${savedAnc.bpSystolic}/${savedAnc.bpDiastolic}"
-//            bpDiastolic.value = savedAnc.bpDiastolic?.toString()
             pulseRate.value = savedAnc.pulseRate
             hb.value = savedAnc.hb?.toString()
             fundalHeight.value = savedAnc.fundalHeight?.toString()
-            urineAlbumin.value = urineAlbumin.getStringFromPosition(savedAnc.urineAlbuminId)
+            // Map legacy "Present/Absent" values to new dropdown values
+            urineAlbumin.value = when (savedAnc.urineAlbumin?.trim()) {
+                "Present" -> "+"
+                "Absent" -> "Negative"
+                "Negative", "Trace", "+", "++", "+++" -> savedAnc.urineAlbumin
+                else -> urineAlbumin.getStringFromPosition(savedAnc.urineAlbuminId)
+            }
             randomBloodSugarTest.value =
                 randomBloodSugarTest.getStringFromPosition(savedAnc.randomBloodSugarTestId)
             dateOfTTOrTd1.value = regis.tt1?.let { getDateFromLong(it) }
@@ -449,29 +638,37 @@ class PregnantWomanAncVisitDataset(
             dateOfTTOrTdBooster.value = regis.ttBooster?.let { getDateFromLong(it) }
             numFolicAcidTabGiven.value = savedAnc.numFolicAcidTabGiven.toString()
             numIfaAcidTabGiven.value = savedAnc.numIfaAcidTabGiven.toString()
-            savedAnc.anyHighRisk?.let {
-                anyHighRisk.value =
-                    if (it) anyHighRisk.entries!!.last() else anyHighRisk.entries!!.first()
-                if (it) {
-                    highRiskCondition.value =
-                        highRiskCondition.getStringFromPosition(savedAnc.highRiskId)
-                    list.add(list.indexOf(anyHighRisk) + 1, highRiskCondition)
-                    if (highRiskCondition.value == highRiskCondition.entries!!.last()) {
-                        otherHighRiskCondition.value = savedAnc.otherHighRisk
-                        list.add(list.indexOf(highRiskCondition) + 1, otherHighRiskCondition)
+            
+            if (list.contains(anyHighRisk)) {
+                savedAnc.anyHighRisk?.let {
+                    anyHighRisk.value =
+                        if (it) anyHighRisk.entries!!.last() else anyHighRisk.entries!!.first()
+                    if (it) {
+                        highRiskCondition.value =
+                            highRiskCondition.getStringFromPosition(savedAnc.highRiskId)
+                        list.add(list.indexOf(anyHighRisk) + 1, highRiskCondition)
+                        if (highRiskCondition.value == highRiskCondition.entries!!.last()) {
+                            otherHighRiskCondition.value = savedAnc.otherHighRisk
+                            list.add(list.indexOf(highRiskCondition) + 1, otherHighRiskCondition)
+                        }
                     }
                 }
+                highRiskCondition.required =
+                    (anyHighRisk.value == anyHighRisk.entries!!.last())
             }
 
             highRiskReferralFacility.value =
                 highRiskReferralFacility.getStringFromPosition(savedAnc.referralFacilityId)
-            hrpConfirm.value =
-                savedAnc.hrpConfirmed?.let { if (it) hrpConfirm.entries!!.last() else hrpConfirm.entries!!.first() }
-            if (savedAnc.hrpConfirmed == true) {
-                hrpConfirmedBy.value =
-                    hrpConfirmedBy.getStringFromPosition(savedAnc.hrpConfirmedById)
-                list.add(list.indexOf(hrpConfirm) + 1, hrpConfirmedBy)
+            if (list.contains(hrpConfirm)) {
+                hrpConfirm.value =
+                    savedAnc.hrpConfirmed?.let { if (it) hrpConfirm.entries!!.last() else hrpConfirm.entries!!.first() }
+                if (savedAnc.hrpConfirmed == true) {
+                    hrpConfirmedBy.value =
+                        hrpConfirmedBy.getStringFromPosition(savedAnc.hrpConfirmedById)
+                    list.add(list.indexOf(hrpConfirm) + 1, hrpConfirmedBy)
+                }
             }
+
             savedAnc.maternalDeath?.let {
                 maternalDeath.value =
                     if (it) maternalDeath.entries!!.last() else maternalDeath.entries!!.first()
@@ -480,6 +677,7 @@ class PregnantWomanAncVisitDataset(
                         maternalDeathProbableCause.getStringFromPosition(savedAnc.maternalDeathProbableCauseId)
                     maternalDateOfDeath.value =
                         savedAnc.deathDate?.let { it1 -> getDateFromLong(it1) }
+                    // maternalDeath is at index 4 now.
                     list.addAll(
                         list.indexOf(maternalDeath) + 1,
                         listOf(maternalDeathProbableCause, maternalDateOfDeath)
@@ -492,44 +690,349 @@ class PregnantWomanAncVisitDataset(
                     )
                 }
             }
-            deliveryDone.value =
-                if (savedAnc.pregnantWomanDelivered == true) deliveryDone.entries!!.first() else deliveryDone.entries!!.last()
+            if (list.contains(deliveryDone)) { // Only update if visible
+                deliveryDone.value =
+                    if (savedAnc.pregnantWomanDelivered == true) deliveryDone.entries!!.first() else deliveryDone.entries!!.last()
+            }
+            
+            // Populate new ANC fields when editing saved visits
+            bloodSugarFasting.value = savedAnc.bloodSugarFasting?.toString()
+            urineSugar.value = savedAnc.urineSugar
+            fetalHeartRate.value = savedAnc.fetalHeartRate?.toString()
+            calciumGiven.value = savedAnc.calciumGiven.takeIf { it > 0 }?.toString()
+            dangerSigns.value = savedAnc.dangerSigns
+            
+            if (list.contains(counsellingProvided)) {
+                counsellingProvided.value = savedAnc.counsellingProvided?.let {
+                    if (it) counsellingProvided.entries!!.last() else counsellingProvided.entries!!.first()
+                }
+                if (savedAnc.counsellingProvided == true) {
+                    counsellingTopics.value = savedAnc.counsellingTopics
+                    list.add(list.indexOf(counsellingProvided) + 1, counsellingTopics)
+                }
+            }
+            nextAncVisitDate.value = savedAnc.nextAncVisitDate?.let { getDateFromLong(it) }
         }
         setUpPage(list)
 
     }
 
     private fun setUpTdX() {
+        val allTdMessage = resources.getString(R.string.all_td_doses_message) // Ensure this string is available, or use the property if defined
+        
+        // Reset defaults
+        dateOfTTOrTd1.inputType = InputType.DATE_PICKER
+        dateOfTTOrTd2.inputType = InputType.TEXT_VIEW // Default disabled
+        dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW // Default disabled
+        
+        // Clear messages initially (safeguard)
+        if (dateOfTTOrTd2.title.contains(allTdDosesMessage)) {
+             dateOfTTOrTd2.title = dateOfTTOrTd2.title.replace(allTdDosesMessage, "")
+        }
+        if (dateOfTTOrTdBooster.title.contains(allTdDosesMessage)) {
+             dateOfTTOrTdBooster.title = dateOfTTOrTdBooster.title.replace(allTdDosesMessage, "")
+        }
+
         if (regis.ttBooster != null) {
-            dateOfTTOrTdBooster.value = getDateFromLong(regis.ttBooster!!)
+            // Booster given (implies Td1 and Td2 given or not needed due to history, but if Booster is there, we show it)
+            dateOfTTOrTd1.value = regis.tt1?.let { getDateFromLong(it) }
             dateOfTTOrTd1.inputType = InputType.TEXT_VIEW
+            
+            dateOfTTOrTd2.value = regis.tt2?.let { getDateFromLong(it) }
             dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+            
+            dateOfTTOrTdBooster.value = getDateFromLong(regis.ttBooster!!)
             dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
-        } else if (regis.tt1 == null) {
+            
+            // Add message
+            if (!dateOfTTOrTdBooster.title.contains(allTdDosesMessage)) {
+                dateOfTTOrTdBooster.title += allTdDosesMessage
+            }
+        } else if (regis.tt2 != null) {
+            // Td2 given (implies Td1 given)
+            dateOfTTOrTd1.value = regis.tt1?.let { getDateFromLong(it) }
+            dateOfTTOrTd1.inputType = InputType.TEXT_VIEW
+            
+            dateOfTTOrTd2.value = getDateFromLong(regis.tt2!!)
             dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
-        } else {
-            dateOfTTOrTd1.value = getDateFromLong(regis.tt1!!)
+            // Message on Td2
+             if (!dateOfTTOrTd2.title.contains(allTdDosesMessage)) {
+                dateOfTTOrTd2.title += allTdDosesMessage
+            }
+            
+            // Booster Disabled (since Td2 present means series complete)
             dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+
+        } else if (regis.tt1 != null) {
+            // Td1 given
+            dateOfTTOrTd1.value = getDateFromLong(regis.tt1!!)
             dateOfTTOrTd1.inputType = InputType.TEXT_VIEW
-            if (regis.tt2 == null) {
-                dateOfTTOrTd2.min = regis.tt1!! + TimeUnit.DAYS.toMillis(28)
-                dateOfTTOrTd2.max = min(System.currentTimeMillis(), getEddFromLmp(regis.lmpDate))
+            
+            // Td2 Enabled
+            dateOfTTOrTd2.inputType = InputType.DATE_PICKER
+            dateOfTTOrTd2.min = regis.tt1!! + TimeUnit.DAYS.toMillis(28) // 4 weeks after Td1
+            dateOfTTOrTd2.max = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+            
+            // Booster Disabled (Need Td2 first)
+            dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+        } else {
+            // No Td given - Enable BOTH Td1 and Booster
+            dateOfTTOrTd1.inputType = InputType.DATE_PICKER
+             // Td1 Range: 5 weeks from LMP to 36 weeks, max Today
+            dateOfTTOrTd1.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+            dateOfTTOrTd1.max = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+            
+            dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+            
+            // Booster Range: 5 weeks from LMP to 36 weeks, max Today
+            dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
+            dateOfTTOrTdBooster.min = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+            dateOfTTOrTdBooster.max = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+        }
+    }
+
+    // ANC detail fields disabled when isAborted = Yes (per spec).
+    private fun abortionDisabledFields(): List<FormElement> = listOf(
+        weight, bp, pulseRate, hb, fundalHeight,
+        urineAlbumin, randomBloodSugarTest,
+        dateOfTTOrTd1, dateOfTTOrTd2, dateOfTTOrTdBooster,
+        numFolicAcidTabGiven,
+        anyHighRisk, highRiskCondition, highRiskReferralFacility,
+        hrpConfirm, hrpConfirmedBy,
+        maternalDeathProbableCause, otherMaternalDeathProbableCause, maternalDateOfDeath,
+        deliveryDone,
+        nextAncVisitDate
+    )
+
+    private fun buildVisibleAncFields(): MutableList<FormElement> {
+        val ancFields = mutableListOf(
+            isAborted,
+            weight,
+            bp,
+            pulseRate,
+            hb,
+            bloodSugarFasting,
+            urineAlbumin,
+            urineSugar,
+            fetalHeartRate,
+            randomBloodSugarTest,
+            dateOfTTOrTd1,
+            numFolicAcidTabGiven,
+            numIfaAcidTabGiven,
+            calciumGiven,
+            anyHighRisk,
+            dangerSigns,
+            highRiskReferralFacility,
+            hrpConfirm,
+            counsellingProvided,
+            nextAncVisitDate
+        )
+
+        ancDate.value?.let {
+            val long = getLongFromDate(it)
+            val weeks = getWeeksOfPregnancy(long, regis.lmpDate)
+
+            if (weeks <= 12) {
+                fundalHeight.inputType = InputType.TEXT_VIEW
+                fundalHeight.value = null
+                ancFields.remove(numIfaAcidTabGiven)
             } else {
-                dateOfTTOrTd2.value = getDateFromLong(regis.tt2!!)
-                dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                fundalHeight.inputType = InputType.EDIT_TEXT
+                ancFields.remove(numFolicAcidTabGiven)
+            }
+
+            if (weeks <= 14) {
+                ancFields.remove(calciumGiven)
+            }
+
+            if (weeks >= Konstants.minWeekToShowDelivered) {
+                ancFields.add(deliveryDone)
+            }
+
+            if (weeks > Konstants.maxWeekToShowAbortion) {
+                ancFields.remove(isAborted)
             }
         }
+
+        if (isAborted.value == isAborted.entries!!.last()) {
+            ancFields.addAll(ancFields.indexOf(isAborted) + 1, listOf(abortionType, abortionFacility, abortionDate))
+        }
+
+        if (anyHighRisk.value == anyHighRisk.entries!!.last()) {
+            val hrIndex = ancFields.indexOf(anyHighRisk)
+            if (hrIndex != -1) {
+                ancFields.add(hrIndex + 1, highRiskCondition)
+                if (highRiskCondition.value == highRiskCondition.entries!!.last()) {
+                    ancFields.add(hrIndex + 2, otherHighRiskCondition)
+                }
+            }
+        }
+
+        if (hrpConfirm.value == hrpConfirm.entries!!.last()) {
+            ancFields.add(ancFields.indexOf(hrpConfirm) + 1, hrpConfirmedBy)
+        }
+
+        if (counsellingProvided.value == counsellingProvided.entries!!.last()) {
+            ancFields.add(ancFields.indexOf(counsellingProvided) + 1, counsellingTopics)
+        }
+
+        // Restore canonical Td values, inputTypes, ranges, and suffix from regis history.
+        // Without this, Yes→No leaves Booster as a DATE_PICKER even when regis.tt2 marks
+        // the series complete (or regis.ttBooster marks it already given).
+        setUpTdX()
+
+        val td1Index = ancFields.indexOf(dateOfTTOrTd1)
+        if (td1Index != -1) {
+            if (regis.tt1 != null || dateOfTTOrTd1.value != null) {
+                if (!ancFields.contains(dateOfTTOrTd2)) {
+                    ancFields.add(td1Index + 1, dateOfTTOrTd2)
+                }
+            }
+            val td2Index = ancFields.indexOf(dateOfTTOrTd2)
+            if (td2Index != -1 && (regis.tt2 != null || dateOfTTOrTd2.value != null)) {
+                if (!ancFields.contains(dateOfTTOrTdBooster)) {
+                    ancFields.add(td2Index + 1, dateOfTTOrTdBooster)
+                }
+            }
+        }
+
+        return ancFields
     }
 
+    private fun checkHrpStatus(): Int {
+        if (isAborted.value == isAborted.entries!!.last()) {
+            return -1
+        }
+        var isHighRisk = false
+        var highRiskReason: String? = null
+
+        // Check BP for high risk
+        checkBpForHighRisk()?.let {
+            isHighRisk = true
+            highRiskReason = it
+        }
+
+        // Check HB for severe anaemia
+        if (!isHighRisk) {
+            checkHbForSevereAnaemia()?.let {
+                isHighRisk = true
+                highRiskReason = it
+            }
+        }
+
+        // Check danger signs
+        if (!isHighRisk) {
+            checkDangerSignsForHighRisk()?.let {
+                isHighRisk = true
+                highRiskReason = it
+            }
+        }
+
+        // Apply to UI
+        if (isHighRisk) {
+            anyHighRisk.value = "Yes"
+            if (highRiskReason != null) {
+                // Try to set the specific reason if it exists in the dropdown
+                if (highRiskCondition.entries?.contains(highRiskReason) == true) {
+                    highRiskCondition.value = highRiskReason
+                } else {
+                    highRiskCondition.value = "OTHER"
+                }
+            }
+        }
+        highRiskCondition.required =
+            (anyHighRisk.value == anyHighRisk.entries!!.last())
+        // Triggers UI update
+        return triggerDependants(
+            source = anyHighRisk,
+            addItems = listOf(highRiskCondition, highRiskReferralFacility, hrpConfirm),
+            removeItems = emptyList()
+        )
+    }
+
+    private fun checkBpForHighRisk(): String? {
+        val bpValue = bp.value
+        if (!bpValue.isNullOrEmpty() && bpValue.contains("/")) {
+            val sys = bpValue.substringBefore("/").toIntOrNull()
+            val dia = bpValue.substringAfter("/").toIntOrNull()
+            if ((sys != null && sys >= 140) || (dia != null && dia >= 90)) {
+                return "HIGH BP (SYSTOLIC>=140 AND OR DIASTOLIC >=90mmHg)"
+            }
+        }
+        return null
+    }
+
+    private fun checkHbForSevereAnaemia(): String? {
+        val hemoglobin = hb.value?.toDoubleOrNull()
+        if (hemoglobin != null && hemoglobin < 7.0) {
+            return "SEVERE ANAEMIA (HB<7 gm/dl)"
+        }
+        return null
+    }
+
+    private fun checkDangerSignsForHighRisk(): String? {
+        val selectedDangerSigns = dangerSigns.value
+        if (!selectedDangerSigns.isNullOrEmpty() && !selectedDangerSigns.contains("None")) {
+            return "OTHER"
+        }
+        return null
+    }
 
     override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        val hrpTriggerIds = setOf(
+            bp.id, hb.id, bloodSugarFasting.id,
+            fetalHeartRate.id, dangerSigns.id, urineSugar.id, urineAlbumin.id
+        )
+
+        if (formId in hrpTriggerIds) {
+            checkHrpStatus()
+        }
+
         return when (formId) {
             ancDate.id -> {
                 ancDate.value?.let {
                     val long = getLongFromDate(it)
-                    val weeks = 2
-//                    val weeks = getWeeksOfPregnancy(long, regis.lmpDate)
-                    val listChanged = if (weeks >= Konstants.minWeekToShowDelivered) {
+                    val weeks = getWeeksOfPregnancy(long, regis.lmpDate)
+
+                    val maternalDeathSelected =
+                        maternalDeath.value == maternalDeath.entries!!.last()
+                    val wasAborted = isAborted.value == isAborted.entries!!.last()
+
+                    // Abortion If Any: visible when weeks <= 24 and maternal death != Yes
+                    val abortionResult = when {
+                        maternalDeathSelected -> -1
+                        weeks <= Konstants.maxWeekToShowAbortion -> {
+                            if (!getFormList().contains(isAborted)) {
+                                triggerDependants(
+                                    source = maternalDeath,
+                                    addItems = listOf(isAborted),
+                                    removeItems = emptyList(),
+                                )
+                            } else -1
+                        }
+                        else -> {
+                            val toRemove = mutableListOf<FormElement>(isAborted)
+                            if (wasAborted) {
+                                toRemove.addAll(
+                                    listOf(abortionType, abortionFacility, abortionDate)
+                                )
+                            }
+                            triggerDependants(
+                                source = maternalDeath,
+                                addItems = emptyList(),
+                                removeItems = toRemove,
+                            )
+                        }
+                    }
+
+                    // Has the pregnant woman delivered?: visible when weeks >= 23,
+                    // hidden if abortion is selected (and still active) or maternal death = Yes
+                    val abortionStillSelected =
+                        wasAborted && weeks <= Konstants.maxWeekToShowAbortion
+                    val listChanged = if (!maternalDeathSelected
+                        && weeks >= Konstants.minWeekToShowDelivered
+                        && !abortionStillSelected
+                    ) {
                         triggerDependants(
                             source = maternalDeath,
                             addItems = listOf(deliveryDone),
@@ -542,7 +1045,8 @@ class PregnantWomanAncVisitDataset(
                             removeItems = listOf(deliveryDone),
                         )
                     }
-                    weekOfPregnancy.value = weeks.toString()
+
+                    weekOfPregnancy.value = getCurrentGestationalAgeFormatted(regis.lmpDate)
                     val calcVisitNumber = when (weeks) {
                         in Konstants.minAnc1Week..Konstants.maxAnc1Week -> 1
                         in Konstants.minAnc2Week..Konstants.maxAnc2Week -> 2
@@ -552,34 +1056,37 @@ class PregnantWomanAncVisitDataset(
                     }
                     if (ancVisit.entries?.contains(calcVisitNumber.toString()) == true) {
                         ancVisit.value = calcVisitNumber.toString()
+
+                        // Handle Fundal Height visibility (Enable/Disable instead of Add/Remove)
+                        if (weeks <= 12) {
+                            fundalHeight.inputType = InputType.TEXT_VIEW
+                            fundalHeight.value = null
+                        } else {
+                            fundalHeight.inputType = InputType.EDIT_TEXT
+                        }
+
                         val listChanged2 = if (weeks <= 12)
                             triggerDependants(
                                 source = ancVisit,
                                 addItems = listOf(numFolicAcidTabGiven),
-                                removeItems = listOf(fundalHeight, numIfaAcidTabGiven),
+                                removeItems = listOf(numIfaAcidTabGiven),
                                 position = getIndexById(dateOfTTOrTdBooster.id) + 1
                             )
                         else {
                             triggerDependants(
                                 source = ancVisit,
                                 removeItems = listOf(numFolicAcidTabGiven),
-                                addItems = listOf(fundalHeight),
-                                position = getIndexById(hb.id) + 1
-                            )
-                            triggerDependants(
-                                source = ancVisit,
-                                removeItems = listOf(),
                                 addItems = listOf(numIfaAcidTabGiven),
                                 position = getIndexById(dateOfTTOrTdBooster.id) + 1
                             )
 
                         }
-                        return if (listChanged >= 0 || listChanged2 >= 0)
+                        return if (listChanged >= 0 || listChanged2 >= 0 || abortionResult >= 0)
                             1
                         else
                             -1
                     }
-                    return listChanged
+                    return if (abortionResult >= 0) maxOf(listChanged, abortionResult) else listChanged
                 }
                 -1
             }
@@ -589,19 +1096,13 @@ class PregnantWomanAncVisitDataset(
                     triggerDependants(
                         source = ancVisit,
                         addItems = listOf(numFolicAcidTabGiven),
-                        removeItems = listOf(fundalHeight, numIfaAcidTabGiven),
+                        removeItems = listOf(numIfaAcidTabGiven),
                         position = getIndexById(dateOfTTOrTdBooster.id) + 1
                     )
                 else {
                     triggerDependants(
                         source = ancVisit,
                         removeItems = listOf(numFolicAcidTabGiven),
-                        addItems = listOf(fundalHeight),
-                        position = getIndexById(hb.id) + 1
-                    )
-                    triggerDependants(
-                        source = ancVisit,
-                        removeItems = listOf(),
                         addItems = listOf(numIfaAcidTabGiven),
                         position = getIndexById(dateOfTTOrTdBooster.id) + 1
                     )
@@ -609,13 +1110,24 @@ class PregnantWomanAncVisitDataset(
                 }
             }
 
-            isAborted.id -> triggerDependants(
-                source = isAborted,
-                passedIndex = index,
-                triggerIndex = 1,
-                target = listOf(abortionType, abortionDate),
-                targetSideEffect = listOf(abortionFacility)
-            )
+            isAborted.id -> {
+                if (isAborted.value == isAborted.entries!![1]) {
+                    triggerDependants(
+                        source = isAborted,
+                        addItems = listOf(abortionType, abortionDate),
+                        removeItems = abortionDisabledFields() + listOf(abortionFacility),
+                        position = getIndexById(isAborted.id) + 1
+                    )
+                } else {
+                    val restored = buildVisibleAncFields().also { it.remove(isAborted) }
+                    triggerDependants(
+                        source = isAborted,
+                        addItems = restored,
+                        removeItems = listOf(abortionType, abortionDate, abortionFacility),
+                        position = getIndexById(isAborted.id) + 1
+                    )
+                }
+            }
 
             abortionType.id -> triggerDependants(
                 source = abortionType,
@@ -625,30 +1137,190 @@ class PregnantWomanAncVisitDataset(
             )
 
             dateOfTTOrTd1.id -> {
-                if (dateOfTTOrTd1.value == null)
-                    dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
-                else
-                    dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
-                -1
+                var result = -1
+                if (dateOfTTOrTd1.value == null) {
+                    // If Td1 removed, disable Td2 and Booster
+                    if (dateOfTTOrTd2.inputType != InputType.TEXT_VIEW) {
+                        dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                        result = 1
+                    }
+                    dateOfTTOrTd2.value = null
+                    
+                    // Re-enable Booster if Td1 is cleared
+                    if (dateOfTTOrTdBooster.inputType != InputType.DATE_PICKER) {
+                        dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
+                        result = 1
+                    }
+                    
+                    // Remove Td2 (and Booster if present)
+                    val res = triggerDependants(
+                        source = dateOfTTOrTd1,
+                        addItems = emptyList(),
+                        removeItems = listOf(dateOfTTOrTd2, dateOfTTOrTdBooster),
+                        position = getIndexById(dateOfTTOrTd1.id) + 1
+                    )
+                    if (res != -1) result = res
+                } else {
+                    // If Td1 entered, enable Td2
+                    
+                    val td1Date = getLongFromDate(dateOfTTOrTd1.value)
+                    val minDate = td1Date + TimeUnit.DAYS.toMillis(4 * 7) // 4 weeks after Td1
+                    // Set max to 36 weeks LMP or Today
+                    val maxDate = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+                    
+                    // Always add Td2 if Td1 is entered
+                    if (getIndexOfTd2() == -1) {
+                         val res = triggerDependants(
+                            source = dateOfTTOrTd1,
+                            addItems = listOf(dateOfTTOrTd2),
+                            removeItems = emptyList(),
+                            position = getIndexById(dateOfTTOrTd1.id) + 1
+                         )
+                         if (res != -1) result = res
+                    }
+
+                    // Check if Td2 is valid (Min <= Max) to Enable it
+                    if (minDate <= maxDate) {
+                         if (dateOfTTOrTd2.inputType != InputType.DATE_PICKER) {
+                             dateOfTTOrTd2.inputType = InputType.DATE_PICKER
+                             result = 1
+                         }
+                         dateOfTTOrTd2.min = minDate
+                         dateOfTTOrTd2.max = maxDate
+                    } else {
+                        // Td2 not possible yet -> Disable it (Show as TextView)
+                         if (dateOfTTOrTd2.inputType != InputType.TEXT_VIEW) {
+                             dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                             result = 1
+                         }
+                         dateOfTTOrTd2.value = null
+                    }
+                    
+                    // Disable Booster (Mutual Exclusion) - DO NOT CLEAR VALUE
+                    if (dateOfTTOrTdBooster.inputType != InputType.TEXT_VIEW) {
+                        dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+                        result = 1
+                    }
+                }
+                result
+            }
+
+            dateOfTTOrTd2.id -> {
+                var result = -1
+                if (dateOfTTOrTd2.value != null) {
+                    // Always Add Booster if Td2 is entered
+                    if (getIndexOfTdBooster() == -1) {
+                         val res = triggerDependants(
+                            source = dateOfTTOrTd2,
+                            addItems = listOf(dateOfTTOrTdBooster),
+                            removeItems = emptyList(),
+                            position = getIndexById(dateOfTTOrTd2.id) + 1
+                         )
+                         if (res != -1) result = res
+                    }
+                    
+                    val minBoosterDate = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+                    val maxBoosterDate = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+
+                    // Check availability
+                    if (minBoosterDate <= maxBoosterDate) {
+                        if (dateOfTTOrTdBooster.inputType != InputType.DATE_PICKER) {
+                            dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
+                            result = 1
+                        }
+                        dateOfTTOrTdBooster.min = minBoosterDate
+                        dateOfTTOrTdBooster.max = maxBoosterDate
+                    } else {
+                        // Booster not possible yet -> Disable
+                        if (dateOfTTOrTdBooster.inputType != InputType.TEXT_VIEW) {
+                            dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+                            result = 1
+                        }
+                        dateOfTTOrTdBooster.value = null
+                    }
+                } else {
+                    // Remove message if cleared
+                    if (dateOfTTOrTd2.title.contains(allTdDosesMessage)) {
+                         dateOfTTOrTd2.title = dateOfTTOrTd2.title.replace(allTdDosesMessage, "")
+                         result = 1
+                    }
+                    // Disable Booster if Td2 cleared -> Remove Booster
+                    if (dateOfTTOrTdBooster.inputType != InputType.TEXT_VIEW) {
+                        dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+                        result = 1
+                    }
+                    dateOfTTOrTdBooster.value = null
+                    
+                    val res = triggerDependants(
+                        source = dateOfTTOrTd2,
+                        addItems = emptyList(),
+                        removeItems = listOf(dateOfTTOrTdBooster),
+                        position = getIndexById(dateOfTTOrTd2.id) + 1
+                    )
+                    if (res != -1) result = res
+                }
+                result
             }
 
             dateOfTTOrTdBooster.id -> {
-                if (dateOfTTOrTdBooster.value == null) {
-                    dateOfTTOrTd1.inputType = InputType.DATE_PICKER
+                var result = -1
+                if (dateOfTTOrTdBooster.value != null) {
+                    // Booster entered -> Disable Td1/Td2 (Mutual Exclusion) - DO NOT CLEAR VALUE
+                    if (dateOfTTOrTd1.inputType != InputType.TEXT_VIEW) {
+                        dateOfTTOrTd1.inputType = InputType.TEXT_VIEW
+                        result = 1
+                    }
+                    if (dateOfTTOrTd2.inputType != InputType.TEXT_VIEW) {
+                        dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                        result = 1
+                    }
                 } else {
-                    dateOfTTOrTd1.inputType = InputType.TEXT_VIEW
+                    // Booster removed -> Enable Td1 (if eligible)
+                    if (regis.tt1 == null) {
+                        if (dateOfTTOrTd1.inputType != InputType.DATE_PICKER) {
+                            dateOfTTOrTd1.inputType = InputType.DATE_PICKER
+                            result = 1
+                        }
+                    }
+                    // Remove message
+                     if (dateOfTTOrTdBooster.title.contains(allTdDosesMessage)) {
+                        dateOfTTOrTdBooster.title = dateOfTTOrTdBooster.title.replace(allTdDosesMessage, "")
+                         result = 1
+                    }
                 }
+                result
+            }
 
+            bp.id -> {
+                validateForBp(bp)
+                // PRD: show HRP alert dialog if systolic < 90 or >= 140, or diastolic < 60 or >= 90
+                if (bp.errorText == null) {
+                    val bpVal = bp.value
+                    if (!bpVal.isNullOrEmpty() && bpVal.contains("/")) {
+                        val sys = bpVal.substringBefore("/").toIntOrNull()
+                        val dia = bpVal.substringAfter("/").toIntOrNull()
+                        if ((sys != null && (sys < 90 || sys >= 140)) || (dia != null && (dia < 60 || dia >= 90))) {
+                            emitAlertErrorMessage(R.string.anc_alert_bp_hrp)
+                        }
+                    }
+                }
+                recomputeHighRiskState()
                 -1
             }
 
-            bp.id -> validateForBp(bp)
-
             weight.id -> validateIntMinMax(weight)
 
             hb.id -> {
                 validateDoubleUpto1DecimalPlaces(hb)
                 if (hb.errorText == null) validateDoubleMinMax(hb)
+                // PRD: show Severe Anaemia alert dialog if Hb < 7
+                if (hb.errorText == null) {
+                    val hbVal = hb.value?.toDoubleOrNull()
+                    if (hbVal != null && hbVal < 7.0) {
+                        emitAlertErrorMessage(R.string.anc_alert_hb_severe_anemia)
+                    }
+                }
+                recomputeHighRiskState()
                 -1
             }
 
@@ -665,15 +1337,21 @@ class PregnantWomanAncVisitDataset(
                     if (it < 7)
                         highRiskCondition.value = highRiskCondition.entries!![5]
                 }
-                bp.value?.takeIf { it.isNotEmpty() && hb.errorText == null }?.let {
-                    val sys = it.substringBefore("/").toInt()
-                    val dia = it.substringAfter("/").toInt()
-                    if (sys > 140 || dia > 90) {
-                        highRiskCondition.value = highRiskCondition.entries!![1]
+                if (bp.value != null) {
+                    val bpValue = bp.value!!
+                    if (bpValue.contains("/")) {
+                         val sys = bpValue.substringBefore("/").toIntOrNull()
+                         val dia = bpValue.substringAfter("/").toIntOrNull()
+                         // HRP alert: Systolic < 90 or >= 140, Diastolic < 60 or >= 90
+                         if ((sys != null && (sys < 90 || sys >= 140)) || (dia != null && (dia < 60 || dia >= 90))) {
+                             highRiskCondition.value = highRiskCondition.entries!![1]
+                         }
                     }
                 }
                 if (highRiskCondition.value == null)
                     highRiskCondition.value = highRiskCondition.entries!!.first()
+                highRiskCondition.required =
+                    (anyHighRisk.value == anyHighRisk.entries!!.last())
             }
 
             highRiskCondition.id -> triggerDependants(
@@ -695,13 +1373,151 @@ class PregnantWomanAncVisitDataset(
                 target = hrpConfirmedBy,
             )
 
-            maternalDeath.id -> triggerDependants(
-                source = maternalDeath,
-                passedIndex = index,
-                triggerIndex = 1,
-                target = listOf(maternalDeathProbableCause, maternalDateOfDeath),
-                targetSideEffect = listOf(otherMaternalDeathProbableCause)
-            )
+            maternalDeath.id -> {
+                val ancFields = mutableListOf(
+                    isAborted,
+                    weight,
+                    bp,
+                    pulseRate,
+                    hb,
+                    bloodSugarFasting,
+//                    fundalHeight,
+                    urineAlbumin,
+                    urineSugar,
+                    fetalHeartRate,
+                    randomBloodSugarTest,
+                    dateOfTTOrTd1,
+                    // Td2 and Booster added conditionally below
+//                    dateOfTTOrTd2,
+//                    dateOfTTOrTdBooster,
+                    numFolicAcidTabGiven,
+                    numIfaAcidTabGiven,
+                    calciumGiven,
+                    anyHighRisk,
+                    dangerSigns,
+                    highRiskReferralFacility,
+                    hrpConfirm,
+                    counsellingProvided,
+                    nextAncVisitDate
+                )
+                
+                val dependantFields = listOf(
+                    abortionType, abortionFacility, abortionDate,
+                    highRiskCondition, otherHighRiskCondition,
+                    hrpConfirmedBy,
+                    counsellingTopics
+                )
+                
+                if (maternalDeath.value == "Yes") {
+                     triggerDependants(
+                        source = maternalDeath,
+                        addItems = listOf(maternalDeathProbableCause, maternalDateOfDeath),
+                        removeItems = ancFields + listOf(deliveryDone, otherMaternalDeathProbableCause) + dependantFields,
+                        position = getIndexById(maternalDeath.id) + 1
+                    )
+                } else {
+                     ancDate.value?.let {
+                        val long = getLongFromDate(it)
+                        val weeks = getWeeksOfPregnancy(long, regis.lmpDate)
+
+                        if (weeks <= 12) {
+                            // Disable Fundal Height but keep visible
+                            fundalHeight.inputType = InputType.TEXT_VIEW
+                            fundalHeight.value = null
+
+                            ancFields.remove(numIfaAcidTabGiven)
+                        } else {
+                            fundalHeight.inputType = InputType.EDIT_TEXT
+                            ancFields.remove(numFolicAcidTabGiven)
+                        }
+
+                        if (weeks <= 14) {
+                            ancFields.remove(calciumGiven)
+                        }
+
+                        if (weeks >= Konstants.minWeekToShowDelivered) {
+                            ancFields.add(deliveryDone)
+                        }
+
+                        if (weeks > Konstants.maxWeekToShowAbortion) {
+                            ancFields.remove(isAborted)
+                        }
+                     }
+                     
+                     // Restore dependant fields if they were active
+                     if (isAborted.value == isAborted.entries!!.last()) {
+                         ancFields.addAll(ancFields.indexOf(isAborted) + 1, listOf(abortionType, abortionFacility, abortionDate))
+                     }
+                     
+                     if (anyHighRisk.value == anyHighRisk.entries!!.last()) {
+                         val hrIndex = ancFields.indexOf(anyHighRisk)
+                         if (hrIndex != -1) {
+                             ancFields.add(hrIndex + 1, highRiskCondition)
+                             if (highRiskCondition.value == highRiskCondition.entries!!.last()) {
+                                 ancFields.add(hrIndex + 2, otherHighRiskCondition)
+                             }
+                         }
+                     }
+                     
+                     if (hrpConfirm.value == hrpConfirm.entries!!.last()) {
+                         ancFields.add(ancFields.indexOf(hrpConfirm) + 1, hrpConfirmedBy)
+                     }
+                     
+                     if (counsellingProvided.value == counsellingProvided.entries!!.last()) {
+                         ancFields.add(ancFields.indexOf(counsellingProvided) + 1, counsellingTopics)
+                     }
+
+                     // Re-apply Td Logic dynamically
+                     val td1Index = ancFields.indexOf(dateOfTTOrTd1)
+                     if (td1Index != -1) {
+                         // If Td1 is present (history or current), add Td2
+                         if (regis.tt1 != null || dateOfTTOrTd1.value != null) {
+                             if (!ancFields.contains(dateOfTTOrTd2)) {
+                                 val td1Date = regis.tt1 ?: getLongFromDate(dateOfTTOrTd1.value)
+                                 if (td1Date != null) {
+                                      val minTd2Date = td1Date + TimeUnit.DAYS.toMillis(4 * 7)
+                                      val maxTd2Date = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+                                      
+                                      if (minTd2Date <= maxTd2Date) {
+                                          dateOfTTOrTd2.inputType = InputType.DATE_PICKER
+                                          dateOfTTOrTd2.min = minTd2Date
+                                          dateOfTTOrTd2.max = maxTd2Date
+                                      } else {
+                                          dateOfTTOrTd2.inputType = InputType.TEXT_VIEW
+                                      }
+                                      ancFields.add(td1Index + 1, dateOfTTOrTd2)
+                                 }
+                             }
+                         }
+                         // If Td2 is present (history or current), add Booster
+                         val td2Index = ancFields.indexOf(dateOfTTOrTd2)
+                         if (td2Index != -1) {
+                             if (regis.tt2 != null || dateOfTTOrTd2.value != null) {
+                                  if (!ancFields.contains(dateOfTTOrTdBooster)) {
+                                      val minBoosterDate = regis.lmpDate + TimeUnit.DAYS.toMillis(5 * 7)
+                                      val maxBoosterDate = minOf(System.currentTimeMillis(), regis.lmpDate + TimeUnit.DAYS.toMillis(36 * 7))
+                                      
+                                      if (minBoosterDate <= maxBoosterDate) {
+                                         dateOfTTOrTdBooster.inputType = InputType.DATE_PICKER
+                                         dateOfTTOrTdBooster.min = minBoosterDate
+                                         dateOfTTOrTdBooster.max = maxBoosterDate
+                                      } else {
+                                         dateOfTTOrTdBooster.inputType = InputType.TEXT_VIEW
+                                      }
+                                      ancFields.add(td2Index + 1, dateOfTTOrTdBooster)
+                                  }
+                             }
+                         }
+                     }
+                     
+                     triggerDependants(
+                        source = maternalDeath,
+                        addItems = ancFields,
+                        removeItems = listOf(maternalDeathProbableCause, maternalDateOfDeath, otherMaternalDeathProbableCause),
+                        position = getIndexById(maternalDeath.id) + 1
+                     )
+                }
+            }
 
             maternalDeathProbableCause.id -> triggerDependants(
                 source = maternalDeathProbableCause,
@@ -715,6 +1531,103 @@ class PregnantWomanAncVisitDataset(
                 validateAllAlphabetsSpaceOnEditText(otherMaternalDeathProbableCause)
             }
 
+            // NEW FIELD VALIDATIONS
+
+            bloodSugarFasting.id -> {
+                validateIntMinMax(bloodSugarFasting)
+                // PRD: show alert dialog if blood sugar > 95 mg/dL
+                if (bloodSugarFasting.errorText == null) {
+                    val bsVal = bloodSugarFasting.value?.toIntOrNull()
+                    if (bsVal != null && bsVal > 95) {
+                        emitAlertErrorMessage(R.string.anc_alert_blood_sugar_high)
+                    }
+                }
+                recomputeHighRiskState()
+                -1
+            }
+
+            urineSugar.id -> {
+                // PRD: show HRP alert dialog if urine sugar is + or more
+                val urineSugarRiskLevels = arrayOf("+", "++", "+++")
+                if (urineSugar.value in urineSugarRiskLevels) {
+                    emitAlertErrorMessage(R.string.anc_alert_urine_sugar_hrp)
+                }
+                recomputeHighRiskState()
+                -1
+            }
+
+            fetalHeartRate.id -> {
+                validateDoubleUpto1DecimalPlaces(fetalHeartRate)
+                if (fetalHeartRate.errorText == null) validateDoubleMinMax(fetalHeartRate)
+                // PRD: show bradycardia / tachycardia alert dialog
+                if (fetalHeartRate.errorText == null) {
+                    val fhrVal = fetalHeartRate.value?.toDoubleOrNull()
+                    when {
+                        fhrVal != null && fhrVal < 110.0 ->
+                            emitAlertErrorMessage(R.string.anc_alert_bradycardia)
+                        fhrVal != null && fhrVal > 160.0 ->
+                            emitAlertErrorMessage(R.string.anc_alert_tachycardia)
+                    }
+                }
+                recomputeHighRiskState()
+                -1
+            }
+
+            urineAlbumin.id -> {
+                // PRD: show HRP alert dialog if urine albumin is + or more
+                val albuminRiskLevels = arrayOf("+", "++", "+++")
+                if (urineAlbumin.value in albuminRiskLevels) {
+                    emitAlertErrorMessage(R.string.anc_alert_urine_albumin_hrp)
+                }
+                recomputeHighRiskState()
+                -1
+            }
+
+            calciumGiven.id -> validateIntMinMax(calciumGiven)
+
+            dangerSigns.id -> {
+                // Checkbox adapter encodes index as (arrayIndex + 1) * (+1 checked / -1 unchecked).
+                val realIndex = (if (index < 0) -index else index) - 1
+                val isChecked = index > 0
+                val noneStr = "None"
+                val noneIndex = dangerSigns.entries?.indexOf(noneStr) ?: -1
+                val isNoneOption = noneIndex >= 0 && realIndex == noneIndex
+                val clickedOption = dangerSigns.entries?.getOrNull(realIndex)
+
+                if (clickedOption != null && isChecked) {
+                    if (isNoneOption) {
+                        dangerSigns.value = noneStr
+                    } else {
+                        val parts = (dangerSigns.value ?: "")
+                            .split(",")
+                            .map { it.trim() }
+                            .filter { it.isNotEmpty() && it != noneStr }
+                        dangerSigns.value =
+                            if (parts.isEmpty()) null else parts.joinToString(",")
+                    }
+                    // Same FormElement reference in old & new lists makes DiffUtil
+                    // miss the in-place value change; force a rebind so checkboxes redraw.
+                    forceRefreshId(dangerSigns.id)
+                }
+
+                // PRD: show HRP alert dialog when any danger sign (other than None) selected
+                val updatedVal = dangerSigns.value
+                val hasSignAfterUpdate = !updatedVal.isNullOrEmpty() && !updatedVal.equals(noneStr, ignoreCase = true)
+                if (hasSignAfterUpdate) {
+                    emitAlertErrorMessage(R.string.anc_alert_danger_signs_hrp)
+                }
+
+                recomputeHighRiskState()
+                -1
+            }
+
+            counsellingProvided.id -> triggerDependants(
+                source = counsellingProvided,
+                passedIndex = index,
+                triggerIndex = 1,
+                target = counsellingTopics,
+            )
+
             else -> -1
         }
 
@@ -724,6 +1637,195 @@ class PregnantWomanAncVisitDataset(
     fun getIndexOfTd2() = getIndexById(dateOfTTOrTd2.id)
     fun getIndexOfTdBooster() = getIndexById(dateOfTTOrTdBooster.id)
 
+    /**
+     * Recomputes high-risk state from all current inputs and updates flags accordingly.
+     * Clears high-risk flags when no triggers apply.
+     */
+    private fun recomputeHighRiskState() {
+        if (isAborted.value == isAborted.entries!!.last()) {
+
+            anyHighRisk.value = anyHighRisk.entries!!.first()
+            highRiskCondition.value = null
+            hrpConfirm.value = null
+            hrpConfirmedBy.value = null
+            highRiskReferralFacility.value = null
+
+            return
+        }
+
+        var hasHighRisk = false
+        var riskCondition: String? = null
+
+        // Check all health parameters
+        checkBloodSugarForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        checkUrineSugarForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        checkFetalHeartRateForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        if (checkUrineAlbuminForRisk()) {
+            hasHighRisk = true
+        }
+
+        checkDangerSignsForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        checkHbForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        checkBpForRisk()?.let {
+            hasHighRisk = true
+            riskCondition = updateRiskCondition(riskCondition, it)
+        }
+
+        // Update UI based on risk assessment
+        updateHighRiskUI(hasHighRisk, riskCondition)
+    }
+
+    private fun checkBloodSugarForRisk(): Int? {
+        bloodSugarFasting.value?.takeIf { it.isNotEmpty() && bloodSugarFasting.errorText == null }?.toIntOrNull()?.let { bsValue ->
+            if (bsValue > 95) {
+                return 6 // DIABETES
+            }
+        }
+        return null
+    }
+
+    private fun checkUrineSugarForRisk(): Int? {
+        urineSugar.value?.let { value ->
+            val riskLevels = arrayOf("+", "++", "+++")
+            if (value in riskLevels) {
+                return 6 // DIABETES
+            }
+        }
+        return null
+    }
+
+    private fun checkFetalHeartRateForRisk(): Int? {
+        fetalHeartRate.value?.takeIf { it.isNotEmpty() && fetalHeartRate.errorText == null }?.toDoubleOrNull()?.let { fhrValue ->
+            if (fhrValue < 110.0 || fhrValue > 160.0) {
+                return highRiskCondition.entries!!.lastIndex // OTHER
+            }
+        }
+        return null
+    }
+
+    private fun checkUrineAlbuminForRisk(): Boolean {
+        urineAlbumin.value?.let { value ->
+            val riskLevels = arrayOf("+", "++", "+++")
+            if (value in riskLevels) {
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun checkDangerSignsForRisk(): Int? {
+        dangerSigns.value?.let { value ->
+            val selectedSigns = dangerSigns.entries?.filter { entry ->
+                value.contains(entry)
+            } ?: emptyList()
+            val hasDangerSigns = selectedSigns.any { it != "None" }
+            if (hasDangerSigns) {
+                return when {
+                    selectedSigns.contains("Vaginal Bleeding") -> 3
+                    selectedSigns.contains("Convulsions/ seizures") -> 2
+                    else -> highRiskCondition.entries!!.lastIndex
+                }
+            }
+        }
+        return null
+    }
+
+    private fun checkHbForRisk(): Int? {
+        hb.value?.takeIf { it.isNotEmpty() && hb.errorText == null }?.toDoubleOrNull()?.let {
+            if (it < 7) {
+                return 5 // SEVERE ANAEMIA
+            }
+        }
+        return null
+    }
+
+    private fun checkBpForRisk(): Int? {
+        if (bp.value != null) {
+            val bpValue = bp.value!!
+            if (bpValue.contains("/")) {
+                val sys = bpValue.substringBefore("/").toIntOrNull()
+                val dia = bpValue.substringAfter("/").toIntOrNull()
+                if ((sys != null && (sys < 90 || sys >= 140)) || (dia != null && (dia < 60 || dia >= 90))) {
+                    return 1 // HIGH BP
+                }
+            }
+        }
+        return null
+    }
+
+    private fun updateRiskCondition(current: String?, newRiskIndex: Int): String? {
+        if (current == null || current == highRiskCondition.entries?.first()) {
+            return highRiskCondition.entries!![newRiskIndex]
+        }
+        return current
+    }
+
+    private fun updateHighRiskUI(hasHighRisk: Boolean, riskCondition: String?) {
+        if (hasHighRisk) {
+            setHighRiskFlags(riskCondition)
+        } else {
+            clearHighRiskFlags()
+        }
+    }
+
+    private fun setHighRiskFlags(riskCondition: String?) {
+        if (anyHighRisk.value != anyHighRisk.entries?.last()) {
+            anyHighRisk.value = anyHighRisk.entries?.last()
+            triggerDependants(
+                source = anyHighRisk,
+                removeItems = emptyList(),
+                addItems = listOf(highRiskCondition),
+                position = getIndexById(anyHighRisk.id) + 1
+            )
+        }
+
+        updateHighRiskConditionValue(riskCondition)
+    }
+
+    private fun updateHighRiskConditionValue(riskCondition: String?) {
+        if (riskCondition != null && (highRiskCondition.value == null || highRiskCondition.value == highRiskCondition.entries?.first())) {
+            highRiskCondition.value = riskCondition
+            if (riskCondition == highRiskCondition.entries!!.last()) {
+                triggerDependants(
+                    source = highRiskCondition,
+                    passedIndex = highRiskCondition.entries!!.lastIndex,
+                    triggerIndex = highRiskCondition.entries!!.lastIndex,
+                    target = otherHighRiskCondition,
+                )
+            }
+        }
+    }
+
+    private fun clearHighRiskFlags() {
+        if (anyHighRisk.value == anyHighRisk.entries?.last()) {
+            anyHighRisk.value = anyHighRisk.entries?.first()
+            if (highRiskCondition.value != null && highRiskCondition.value != highRiskCondition.entries?.first()) {
+                highRiskCondition.value = highRiskCondition.entries?.first()
+            }
+        }
+        highRiskCondition.required = false
+    }
+
 
     override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
         (cacheModel as PregnantWomanAncCache).let { cache ->
@@ -735,19 +1837,23 @@ class PregnantWomanAncVisitDataset(
             cache.abortionFacility = abortionFacility.value
             cache.abortionFacilityId = abortionFacility.getPosition()
             cache.abortionDate = abortionDate.value?.let { getLongFromDate(it) }
-            cache.weight = weight.value?.toInt()
-            cache.bpSystolic = bp.value?.takeIf { it.isNotEmpty() }?.substringBefore("/")?.toInt()
-            cache.bpDiastolic = bp.value?.takeIf { it.isNotEmpty() }?.substringAfter("/")?.toInt()
+            cache.weight = weight.value?.toIntOrNull()
+            bp.value?.let {
+                if (it.contains("/")) {
+                    cache.bpSystolic = it.substringBefore("/").toIntOrNull()
+                    cache.bpDiastolic = it.substringAfter("/").toIntOrNull()
+                }
+            }
             cache.pulseRate = pulseRate.value?.takeIf { it.isNotEmpty() }
-            cache.hb = hb.value?.toDouble()
-            cache.fundalHeight = fundalHeight.value?.toInt()
+            cache.hb = hb.value?.toDoubleOrNull()
+            cache.fundalHeight = fundalHeight.value?.toIntOrNull()
             cache.urineAlbumin = urineAlbumin.value
             cache.urineAlbuminId = urineAlbumin.getPosition()
             cache.randomBloodSugarTest = randomBloodSugarTest.value
             cache.randomBloodSugarTestId = randomBloodSugarTest.getPosition()
             updateRegistrationForTdX()
-            cache.numFolicAcidTabGiven = numFolicAcidTabGiven.value?.toInt() ?: 0
-            cache.numIfaAcidTabGiven = numIfaAcidTabGiven.value?.toInt() ?: 0
+            cache.numFolicAcidTabGiven = numFolicAcidTabGiven.value?.toIntOrNull() ?: 0
+            cache.numIfaAcidTabGiven = numIfaAcidTabGiven.value?.toIntOrNull() ?: 0
             anyHighRisk.value?.let {
                 cache.anyHighRisk = it == anyHighRisk.entries!!.last()
             }
@@ -767,29 +1873,84 @@ class PregnantWomanAncVisitDataset(
             deliveryDone.value?.let {
                 cache.pregnantWomanDelivered = it == deliveryDone.entries!!.first()
             }
+
+
+            cache.bloodSugarFasting = bloodSugarFasting.value?.toIntOrNull()
+            cache.urineSugar = urineSugar.value
+            cache.urineSugarId = urineSugar.getPosition()
+            cache.fetalHeartRate = fetalHeartRate.value?.toDoubleOrNull()
+            cache.calciumGiven = calciumGiven.value?.toIntOrNull() ?: 0
+            cache.dangerSigns = dangerSigns.value
+            // For multi-select checkboxes, getPosition() doesn't work correctly
+            // Store 0 since the value itself contains all the information
+            cache.dangerSignsId = if (dangerSigns.inputType == InputType.CHECKBOXES) 0 else dangerSigns.getPosition()
+            cache.counsellingProvided = counsellingProvided.value?.let { it == counsellingProvided.entries?.last() }
+            cache.counsellingTopics = counsellingTopics.value
+            // For multi-select checkboxes, getPosition() doesn't work correctly
+            // Store 0 since the value itself contains all the information
+            cache.counsellingTopicsId = if (counsellingTopics.inputType == InputType.CHECKBOXES) 0 else counsellingTopics.getPosition()
+            cache.nextAncVisitDate = nextAncVisitDate.value?.let { getLongFromDate(it) }
         }
     }
 
     private fun updateRegistrationForTdX() {
-        if (dateOfTTOrTd1.value.isNullOrBlank() || dateOfTTOrTd2.value.isNullOrBlank() || dateOfTTOrTdBooster.value.isNullOrBlank())
-            return
-        else {
-            val td1 = if (dateOfTTOrTd1.inputType == InputType.DATE_PICKER) getLongFromDate(
-                dateOfTTOrTd1.value
-            ) else null
-            val td2 = if (dateOfTTOrTd2.inputType == InputType.DATE_PICKER) getLongFromDate(
-                dateOfTTOrTd2.value
-            ) else null
-            val tdBooster =
-                if (dateOfTTOrTdBooster.inputType == InputType.DATE_PICKER) getLongFromDate(
-                    dateOfTTOrTdBooster.value
-                ) else null
-            if (td1 == null && td2 == null && tdBooster == null)
-                return
-        }
-        regis.tt1 = dateOfTTOrTd1.value?.let { getLongFromDate(it) }
-        regis.tt2 = dateOfTTOrTd2.value?.let { getLongFromDate(it) }
-        regis.ttBooster = dateOfTTOrTdBooster.value?.let { getLongFromDate(it) }
+        var updated = updateTd1()
+        if (updateTd2()) updated = true
+        if (updateBooster()) updated = true
+
+        if (updated) {
+            updateRegistrationMetadata()
+        }
+    }
+
+    private fun updateTd1(): Boolean {
+        if (dateOfTTOrTd1.inputType == InputType.DATE_PICKER || dateOfTTOrTd1.inputType == InputType.TEXT_VIEW) {
+            val newVal = dateOfTTOrTd1.value?.let { getLongFromDate(it) }
+            if (regis.tt1 != newVal) {
+                regis.tt1 = newVal
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun updateTd2(): Boolean {
+        // Only update if the field is visible/relevant (not completely hidden/irrelevant)
+        // But since we use TEXT_VIEW for disabled, we should update.
+        if (dateOfTTOrTd2.inputType == InputType.DATE_PICKER || dateOfTTOrTd2.inputType == InputType.TEXT_VIEW) {
+            val newVal = dateOfTTOrTd2.value?.let { getLongFromDate(it) }
+            if (regis.tt2 != newVal) {
+                regis.tt2 = newVal
+                return true
+            }
+        } else if (dateOfTTOrTd1.value == null) {
+            // Logic: If Td1 is null, Td2 must be null (strict sequence)
+            if (regis.tt2 != null) {
+                regis.tt2 = null
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun updateBooster(): Boolean {
+        if (dateOfTTOrTdBooster.inputType == InputType.DATE_PICKER || dateOfTTOrTdBooster.inputType == InputType.TEXT_VIEW) {
+            val newVal = dateOfTTOrTdBooster.value?.let { getLongFromDate(it) }
+            if (regis.ttBooster != newVal) {
+                regis.ttBooster = newVal
+                return true
+            }
+        } else if (dateOfTTOrTd2.value == null) {
+            // Logic: If Td2 is null, Booster must be null
+            if (regis.ttBooster != null) {
+                regis.ttBooster = null
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun updateRegistrationMetadata() {
         regis.updatedDate = System.currentTimeMillis()
         if (regis.processed != "N") regis.processed = "U"
         regis.syncState = SyncState.UNSYNCED
@@ -797,6 +1958,8 @@ class PregnantWomanAncVisitDataset(
 
     fun getWeeksOfPregnancy(): Int = getIndexById(weekOfPregnancy.id)
 
+    fun getAncVisitNumber(): Int? = ancVisit.value?.toIntOrNull()
+
 //    fun updateBenRecordToDelivered(it: BenRegCache) {
 //        it.genDetails?.apply {
 //            reproductiveStatus =
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanRegistrationDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanRegistrationDataset.kt
new file mode 100644
index 000000000..a463f5f2e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PregnantWomanRegistrationDataset.kt
@@ -0,0 +1,1426 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import timber.log.Timber
+import java.util.Calendar
+import java.util.concurrent.TimeUnit
+
+class PregnantWomanRegistrationDataset(
+    context: Context, currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    companion object {
+        // Test result constants
+        const val TEST_RESULT_REACTIVE = "Reactive"
+        const val TEST_RESULT_NON_REACTIVE = "Non-Reactive"
+        const val TEST_RESULT_TEST_NOT_DONE = "Test Not Done"
+        const val TEST_RESULT_POSITIVE = "Positive"
+        const val TEST_RESULT_NEGATIVE = "Negative"
+
+        // Test result indices (matching array order)
+        private const val TEST_RESULT_INDEX_REACTIVE = 0
+        private const val TEST_RESULT_INDEX_NON_REACTIVE = 1
+        private const val TEST_RESULT_INDEX_NOT_DONE = 2
+
+        private fun getMinLmpMillis(): Long {
+            val cal = Calendar.getInstance()
+            cal.add(Calendar.DAY_OF_YEAR, -42 * 7) // Last 42 weeks
+            return cal.timeInMillis
+        }
+
+        private fun getEddFromLmp(lmpDate: Long): Long {
+            return lmpDate + TimeUnit.DAYS.toMillis(280)
+        }
+
+        private fun calculateGestationalAge(lmpDate: Long, currentDate: Long): Pair<Int, Int> {
+            val days = TimeUnit.MILLISECONDS.toDays(currentDate - lmpDate)
+            val weeks = (days / 7).toInt()
+            val remainingDays = (days % 7).toInt()
+            return Pair(weeks, remainingDays)
+        }
+
+        private fun calculateTrimester(weeks: Int): String {
+            return when {
+                weeks <= 12 -> "First"
+                weeks <= 26 -> "Second"
+                else -> "Third"
+            }
+        }
+
+        private fun calculateBMI(weight: Double, height: Double): Double {
+            return weight / ((height / 100) * (height / 100))
+        }
+
+        private fun getBMICategory(bmi: Double): String {
+            return when {
+                bmi < 18.5 -> "Underweight"
+                bmi < 24.9 -> "Normal"
+                bmi < 29.9 -> "Overweight"
+                else -> "Obese"
+            }
+        }
+    }
+
+    private var _isFormReadOnly: Boolean = false
+    val isFormReadOnly: Boolean
+        get() = _isFormReadOnly
+    private lateinit var registrationCache: PregnantWomanRegistrationCache
+    private var dateOfRegMillis: Long = System.currentTimeMillis()
+    private var oneYearBeforeRegMillis: Long = 0L
+    private var patientAgeYears: Int? = null
+
+    var onShowAlert: ((String) -> Unit)? = null
+    var onNavigateToEligibleCouple: (() -> Unit)? = null
+    var onNavigateToVitalsAndPrescription: (() -> Unit)? = null
+
+    // Date of Registration
+    private val dateOfReg = FormElement(
+        id = 1,
+        inputType = InputType.DATE_PICKER,
+        title = "Date of PW Registration",
+        required = true,
+        max = System.currentTimeMillis(),
+        hasDependants = true
+    )
+
+    // RCH ID
+    private val rchId = FormElement(
+        id = 2,
+        inputType = InputType.EDIT_TEXT,
+        title = "RCH ID No. of Woman",
+        required = false,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 12
+    )
+
+//    // Pregnancy Test Flow
+//    private val pregnancyTestAtFacility = FormElement(
+//        id = 3,
+//        inputType = InputType.RADIO,
+//        title = "Is the pregnancy test conducted at facility?",
+//        entries = arrayOf("Yes", "No"),
+//        required = true,
+//        hasDependants = true
+//    )
+//
+//    private val uptResult = FormElement(
+//        id = 4,
+//        inputType = InputType.RADIO,
+//        title = "Result of UPT",
+//        entries = arrayOf("Positive", "Negative"),
+//        required = false,
+//        hasDependants = true
+//    )
+
+    // Pregnancy Details
+    private val lmp = FormElement(
+        id = 5,
+        inputType = InputType.DATE_PICKER,
+        title = "LMP",
+        required = true,
+        hasDependants = true,
+        max = System.currentTimeMillis(),
+        min = getMinLmpMillis()
+    )
+
+    private val edd = FormElement(
+        id = 6,
+        inputType = InputType.TEXT_VIEW,
+        title = "EDD",
+        required = false
+    )
+
+    private val gestationalAge = FormElement(
+        id = 7,
+        inputType = InputType.TEXT_VIEW,
+        title = "Gestational Age (Weeks)",
+        required = false,
+    )
+
+    private val trimester = FormElement(
+        id = 8,
+        inputType = InputType.TEXT_VIEW,
+        title = "Trimester",
+        required = false,
+    )
+
+    // Blood Group
+    private val bloodGroup = FormElement(
+        id = 9,
+        inputType = InputType.DROPDOWN,
+        title = "Blood Group",
+        entries = arrayOf(
+            "A +ve",
+            "B +ve",
+            "AB +ve",
+            "O +ve",
+            "A -ve",
+            "B -ve",
+            "AB -ve",
+            "O -ve"
+        ),
+        required = false
+    )
+
+    // Gravida & Para
+    private val gravida = FormElement(
+        id = 10,
+        inputType = InputType.EDIT_TEXT,
+        title = "Gravida",
+        required = true,
+        min = 1,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 2,
+        hasDependants = true
+    )
+
+    private val para1 = FormElement(
+        id = 11,
+        inputType = InputType.EDIT_TEXT,
+        title = "Para",
+        required = true,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 2
+    )
+
+    private val para2 = FormElement(
+        id = 1100,
+        inputType = InputType.EDIT_TEXT,
+        title = "Para",
+        required = true,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 2
+    )
+
+    private var _para = para1
+    private val para get() = _para
+    fun getParaId(): Int = _para.id
+
+    // History Fields
+    private val historyOfAbortions = FormElement(
+        id = 12,
+        inputType = InputType.RADIO,
+        title = "History of abortions",
+        entries = arrayOf("Yes", "No"),
+        required = false,
+        isEnabled = false,
+        hasDependants = true
+    )
+
+    private val previousLSCS = FormElement(
+        id = 13,
+        inputType = InputType.RADIO,
+        title = "History of previous LSCS",
+        entries = arrayOf("Yes", "No"),
+        required = false,
+        hasDependants = true
+    )
+
+    private val complicationsInPreviousPregnancy = FormElement(
+        id = 14,
+        inputType = InputType.CHECKBOXES,
+        title = "Any complications in previous pregnancy",
+        entries = arrayOf(
+            "None",
+            "Gestational Diabetes",
+            "Pre-eclampsia",
+            "Eclampsia",
+            "Hemorrhage",
+            "Preterm Birth",
+            "Stillbirth"
+        ),
+        required = true,
+        hasDependants = true
+    )
+
+    // Anthropometry
+    private val height = FormElement(
+        id = 15,
+        inputType = InputType.EDIT_TEXT,
+        title = "Height (cm)",
+        required = false,
+        min = 100,
+        max = 220,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER,
+        etMaxLength = 3,
+        hasDependants = true
+    )
+
+    private val weight = FormElement(
+        id = 16,
+        inputType = InputType.EDIT_TEXT,
+        title = "Weight (Kgs)",
+        required = false,
+        min = 30,
+        max = 150,
+        minDecimal = 30.0,
+        maxDecimal = 150.0,
+        etInputType = android.text.InputType.TYPE_CLASS_NUMBER or android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL,
+        etMaxLength = 6,
+        hasDependants = true
+    )
+
+    private val bmi1 = FormElement(
+        id = 17,
+        inputType = InputType.TEXT_VIEW,
+        title = "BMI",
+        required = false,
+    )
+
+    private val bmi2 = FormElement(
+        id = 1700,
+        inputType = InputType.TEXT_VIEW,
+        title = "BMI",
+        required = false,
+    )
+
+    private var _bmi = bmi1
+    private val bmi get() = _bmi
+    fun getBmiId(): Int = _bmi.id
+
+    // Pre-existing Conditions
+    private val preExistingConditions = FormElement(
+        id = 18,
+        inputType = InputType.CHECKBOXES,
+        title = "Pre-existing conditions",
+        entries = arrayOf(
+            "None",
+            "Hypertension",
+            "Diabetes Mellitus",
+            "Thyroid",
+            "Heart disease",
+            "Epilepsy",
+            "Tuberculosis",
+            "HIV",
+            "Sexually transmitted Infections",
+            "Severe Malnutrition",
+            "Kidney disease",
+            "Auto Immune disorders"
+        ),
+        required = true,
+        hasDependants = true
+    )
+
+    // Lab Investigations - VDRL/RPR
+    private val vdrlRprResult = FormElement(
+        id = 19,
+        inputType = InputType.DROPDOWN,
+        title = "VDRL/RPR Test result",
+        entries = arrayOf(TEST_RESULT_REACTIVE, TEST_RESULT_NON_REACTIVE, TEST_RESULT_TEST_NOT_DONE),
+        required = false,
+        hasDependants = true
+    )
+
+    private val vdrlRprDate = FormElement(
+        id = 20,
+        inputType = InputType.DATE_PICKER,
+        title = "Date of VDRL/RPR Test done",
+        required = false,
+        max = System.currentTimeMillis(),
+
+        )
+
+    // Lab Investigations - HIV
+    private val hivResult = FormElement(
+        id = 21,
+        inputType = InputType.DROPDOWN,
+        title = "HIV Test result",
+        entries = arrayOf(TEST_RESULT_REACTIVE, TEST_RESULT_NON_REACTIVE, TEST_RESULT_TEST_NOT_DONE),
+        required = false,
+        hasDependants = true
+    )
+
+    private val hivTestDate = FormElement(
+        id = 22,
+        inputType = InputType.DATE_PICKER,
+        title = "Date of HIV Test done",
+        required = false,
+        max = System.currentTimeMillis(),
+    )
+
+    // Lab Investigations - HBsAg
+    private val hbsAgResult = FormElement(
+        id = 23,
+        inputType = InputType.DROPDOWN,
+        title = "HBsAg Test result",
+        entries = arrayOf(TEST_RESULT_POSITIVE, TEST_RESULT_NEGATIVE, TEST_RESULT_TEST_NOT_DONE),
+        required = false,
+        hasDependants = true
+    )
+
+    private val hbsAgTestDate = FormElement(
+        id = 24,
+        inputType = InputType.DATE_PICKER,
+        title = "Date of HBsAg Test done",
+        required = false,
+        max = System.currentTimeMillis(),
+    )
+
+    // High-Risk Pregnancy Flag
+    private val isHighRiskPregnancy = FormElement(
+        id = 25,
+        inputType = InputType.RADIO,
+        title = "High-Risk Conditions Present?",
+        entries = arrayOf("Yes", "No"),
+        required = false,
+        isEnabled = false // Auto-calculated
+    )
+
+    suspend fun setUpPage(
+        ben: PatientDisplay?,
+        savedRecord: PregnantWomanRegistrationCache?
+    ) {
+        this.registrationCache = savedRecord ?: createDefaultRegistrationCache(ben)
+        _isFormReadOnly = savedRecord?.isFirstAncSubmitted == true
+        patientAgeYears = ben?.patient?.age
+
+        // Initialize date of registration
+        dateOfRegMillis = savedRecord?.dateOfRegistration ?: System.currentTimeMillis()
+        oneYearBeforeRegMillis = dateOfRegMillis - TimeUnit.DAYS.toMillis(365)
+
+        _para = para1
+        _bmi = bmi1
+
+        val list = mutableListOf<FormElement>()
+
+        // Always add RCH ID first
+        list.add(rchId)
+
+        // Build form based on read-only or editable mode
+        if (isFormReadOnly) {
+            savedRecord?.let { buildReadOnlyFormList(it, list) }
+        } else {
+            buildEditableFormList(savedRecord, list)
+            updateHighRiskStatus()
+        }
+
+        setUpPage(list)
+    }
+
+    /**
+     * Build form list for read-only mode
+     */
+    private suspend fun buildReadOnlyFormList(
+        cache: PregnantWomanRegistrationCache,
+        list: MutableList<FormElement>
+    ) {
+        populateFormFromCache(cache)
+
+        // Add all main fields in consistent order
+//        list.add(pregnancyTestAtFacility)
+//        list.add(uptResult)
+
+        list.addAll(getPregnancyBasicFields())
+
+        // Add history fields if gravida > 1
+        addHistoryFieldsIfNeeded(cache, list)
+
+        list.addAll(getPhysicalFields())
+
+        addLabFieldsCombined(list)
+
+        list.add(isHighRiskPregnancy)
+
+        // Make all fields read-only
+        makeFormReadOnly(list)
+    }
+
+    /**
+     * Build form list for editable mode
+     */
+    private suspend fun buildEditableFormList(
+        savedRecord: PregnantWomanRegistrationCache?,
+        list: MutableList<FormElement>
+    ) {
+//        list.add(pregnancyTestAtFacility)
+
+        if (savedRecord == null) {
+            rchId.value = "0"
+            // Default to showing registration fields
+            list.addAll(getPregnancyBasicFields())
+            list.addAll(getPhysicalFields())
+            addLabFieldsCombined(list)
+            list.add(isHighRiskPregnancy)
+        }
+
+        savedRecord?.let { cache ->
+            populateFormFromCache(cache)
+//            val hasLmpDate = cache.lmpDate > 0
+
+//            if (hasLmpDate) {
+//                list.add(uptResult)
+            list.addAll(getPregnancyBasicFields())
+
+            // Add history fields after Para
+            addHistoryFieldsIfNeeded(cache, list)
+
+            // Add physical fields
+            list.addAll(getPhysicalFields())
+
+            // Add lab fields combined (results and dates)
+            addLabFieldsCombined(list)
+
+            // Finally add High Risk status
+            list.add(isHighRiskPregnancy)
+//            } else {
+//                list.add(uptResult)
+//            }
+        }
+    }
+
+    /**
+     * Add history fields if gravida > 1
+     */
+    private fun addHistoryFieldsIfNeeded(
+        cache: PregnantWomanRegistrationCache,
+        list: MutableList<FormElement>
+    ) {
+        cache.numPrevPregnancy?.let { gravidaValue ->
+            if (gravidaValue > 1) {
+                list.addAll(listOf(
+                    historyOfAbortions,
+                    previousLSCS,
+                    complicationsInPreviousPregnancy
+                ))
+            }
+        }
+    }
+
+    /**
+     * Helper to add lab result fields and their corresponding date fields together
+     */
+    private fun addLabFieldsCombined(list: MutableList<FormElement>) {
+        list.add(vdrlRprResult)
+        if (shouldShowTestDateField(vdrlRprResult.value, isHbsAg = false)) {
+            list.add(vdrlRprDate)
+        }
+        list.add(hivResult)
+        if (shouldShowTestDateField(hivResult.value, isHbsAg = false)) {
+            list.add(hivTestDate)
+        }
+        list.add(hbsAgResult)
+        if (shouldShowTestDateField(hbsAgResult.value, isHbsAg = true)) {
+            list.add(hbsAgTestDate)
+        }
+    }
+
+    /**
+     * Check if test date field should be shown based on test result
+     */
+    private fun shouldShowTestDateField(testResult: String?, isHbsAg: Boolean): Boolean {
+        return when {
+            testResult == null -> false
+            isHbsAg -> testResult == TEST_RESULT_POSITIVE || testResult == TEST_RESULT_NEGATIVE
+            else -> testResult == TEST_RESULT_REACTIVE || testResult == TEST_RESULT_NON_REACTIVE
+        }
+    }
+
+    private fun getPregnancyBasicFields(): List<FormElement> {
+        return listOf(
+            lmp, edd, gestationalAge, trimester,
+            bloodGroup,
+            gravida, para
+        )
+    }
+
+    private fun getPhysicalFields(): List<FormElement> {
+        return listOf(
+            preExistingConditions,
+            height, weight, bmi
+        )
+    }
+
+
+    fun createDefaultRegistrationCache(ben: PatientDisplay?): PregnantWomanRegistrationCache {
+        return PregnantWomanRegistrationCache(
+            patientID = ben?.patient?.patientID ?: "",
+            syncState = SyncState.UNSYNCED,
+            createdDate = System.currentTimeMillis(),
+            updatedDate = System.currentTimeMillis(),
+            dateOfRegistration = System.currentTimeMillis(),
+            bloodGroupId = 0,
+            vdrlRprTestResultId = 0,
+            hivTestResultId = 0,
+            hbsAgTestResultId = 0,
+            complicationPrevPregnancyId = null,
+            hrpIdById = 0,
+            isFirstAncSubmitted = false,
+            id = 0,
+            mcpCardNumber = null,
+            rchId = null,
+            lmpDate = 0L,
+            bloodGroup = null,
+            weight = null,
+            height = null,
+            vdrlRprTestResult = null,
+            dateOfVdrlRprTest = null,
+            historyOfAbortions = null,
+            previousLSCS = null,
+            hivTestResult = null,
+            dateOfHivTest = null,
+            hbsAgTestResult = null,
+            dateOfHbsAgTest = null,
+            pastIllness = null,
+            otherPastIllness = null,
+            is1st = true,
+            numPrevPregnancy = null,
+            para = null,
+            complicationPrevPregnancy = null,
+            otherComplication = null,
+            isHrp = false,
+            hrpIdBy = null,
+            active = true,
+            tt1 = null,
+            tt2 = null,
+            ttBooster = null,
+            processed = "N",
+            createdBy = "",
+            updatedBy = ""
+        )
+    }
+
+    private fun populateFormFromCache(cache: PregnantWomanRegistrationCache) {
+        populateBasicFields(cache)
+        populateTestResultFields(cache)
+        populateHistoryFieldsIfNeeded(cache)
+    }
+
+    /**
+     * Populate basic form fields from cache
+     */
+    private fun populateBasicFields(cache: PregnantWomanRegistrationCache) {
+        dateOfReg.value = getDateFromLong(cache.dateOfRegistration)
+        rchId.value = (cache.rchId ?: 0L).toString()
+//        pregnancyTestAtFacility.value = cache.pregnancyTestAtFacility
+//        uptResult.value = cache.uptResult
+
+        if (cache.lmpDate > 0) {
+            lmp.value = getDateFromLong(cache.lmpDate)
+            updateCalculatedFields(System.currentTimeMillis())
+        }
+
+        bloodGroup.value = cache.bloodGroup
+        gravida.value = cache.numPrevPregnancy?.toString()
+        // Use stored Para if available, else calculate default
+        // Also handle the case where cache.para might be null (legacy data)
+        para.value = cache.para?.toString() ?: (cache.numPrevPregnancy?.let { it - 1 })?.toString()
+        height.value = cache.height?.toString()
+        weight.value = cache.weight?.toString()
+        updateBMI()
+        preExistingConditions.value = cache.pastIllness
+        isHighRiskPregnancy.value = if(cache.isHrp) "Yes" else "No"
+    }
+
+    /**
+     * Populate test result fields and their date fields
+     */
+    private fun populateTestResultFields(cache: PregnantWomanRegistrationCache) {
+        populateVdrlRprFields(cache)
+        populateHivFields(cache)
+        populateHbsAgFields(cache)
+    }
+
+    /**
+     * Populate VDRL/RPR test result and date fields
+     */
+    private fun populateVdrlRprFields(cache: PregnantWomanRegistrationCache) {
+        vdrlRprResult.value = cache.vdrlRprTestResult
+        if (shouldShowTestDateField(cache.vdrlRprTestResult, isHbsAg = false)) {
+            vdrlRprDate.isEnabled = true
+            vdrlRprDate.required = true
+            vdrlRprDate.value = cache.dateOfVdrlRprTest?.let { getDateFromLong(it) }
+        }
+    }
+
+    /**
+     * Populate HIV test result and date fields
+     */
+    private fun populateHivFields(cache: PregnantWomanRegistrationCache) {
+        hivResult.value = cache.hivTestResult
+        if (shouldShowTestDateField(cache.hivTestResult, isHbsAg = false)) {
+            hivTestDate.isEnabled = true
+            hivTestDate.required = true
+            hivTestDate.value = cache.dateOfHivTest?.let { getDateFromLong(it) }
+        }
+    }
+
+    /**
+     * Populate HBsAg test result and date fields
+     */
+    private fun populateHbsAgFields(cache: PregnantWomanRegistrationCache) {
+        hbsAgResult.value = cache.hbsAgTestResult
+        if (shouldShowTestDateField(cache.hbsAgTestResult, isHbsAg = true)) {
+            hbsAgTestDate.isEnabled = true
+            hbsAgTestDate.required = true
+            hbsAgTestDate.value = cache.dateOfHbsAgTest?.let { getDateFromLong(it) }
+        }
+    }
+
+    /**
+     * Populate history fields if gravida > 1
+     */
+    private fun populateHistoryFieldsIfNeeded(cache: PregnantWomanRegistrationCache) {
+        cache.numPrevPregnancy?.let { gravidaValue ->
+            if (gravidaValue > 1) {
+                enableHistoryFields(cache)
+                updateHighRiskStatus()
+            }
+        }
+    }
+
+    /**
+     * Enable and populate history-related fields
+     */
+    private fun enableHistoryFields(cache: PregnantWomanRegistrationCache) {
+        historyOfAbortions.isEnabled = true
+        historyOfAbortions.required = true
+        historyOfAbortions.value = if (cache.historyOfAbortions == true) "Yes" else "No"
+
+        previousLSCS.isEnabled = true
+        previousLSCS.required = true
+        previousLSCS.value = if (cache.previousLSCS == true) "Yes" else "No"
+
+        complicationsInPreviousPregnancy.isEnabled = true
+        complicationsInPreviousPregnancy.required = true
+        complicationsInPreviousPregnancy.value = cache.complicationPrevPregnancy
+
+        preExistingConditions.value = cache.pastIllness
+    }
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+            dateOfReg.id -> handleDateOfRegChange()
+//            pregnancyTestAtFacility.id -> handlePregnancyTestFlow(index)
+//            uptResult.id -> handleUPTResultFlow(index)
+            lmp.id -> handleLmpChange()
+            historyOfAbortions.id -> handleHistoryOfAbortionsChange(index)
+            gravida.id -> handleGravidaChange()
+            para1.id, para2.id -> handleParaChange()
+            height.id, weight.id -> handleAnthropometryChange(formId)
+            vdrlRprResult.id -> {
+                handleVdrlRprResultChange(index)
+                return vdrlRprResult.id // Return the ID so Fragment can update UI
+            }
+            hivResult.id -> {
+                handleHivResultChange(index)
+                return hivResult.id // Return the ID so Fragment can update UI
+            }
+            hbsAgResult.id -> {
+                handleHbsAgResultChange(index)
+                return hbsAgResult.id // Return the ID so Fragment can update UI
+            }
+            previousLSCS.id -> handlePreviousLSCSChange(index)
+            complicationsInPreviousPregnancy.id -> handleComplicationsChange(index)
+            preExistingConditions.id -> handlePreExistingConditionsChange(index)
+            else -> -1
+        }
+    }
+
+
+    private fun handleDateOfRegChange(): Int {
+        dateOfReg.value?.let {
+            dateOfRegMillis = getLongFromDate(it)
+            oneYearBeforeRegMillis = dateOfRegMillis - TimeUnit.DAYS.toMillis(365)
+
+            // Update min dates for test dates (should be >= Date of Registration - 1 year)
+            vdrlRprDate.min = oneYearBeforeRegMillis
+            hivTestDate.min = oneYearBeforeRegMillis
+            hbsAgTestDate.min = oneYearBeforeRegMillis
+
+            // Update max dates for test dates (should be <= today's date)
+            val today = System.currentTimeMillis()
+            vdrlRprDate.max = today
+            hivTestDate.max = today
+            hbsAgTestDate.max = today
+
+            // Update LMP max date
+            lmp.max = dateOfRegMillis
+        }
+        return -1
+    }
+
+//    private fun handlePregnancyTestFlow(index: Int): Int {
+//        return if (index == 0) { // "Yes" selected
+//            triggerDependants(
+//                source = pregnancyTestAtFacility,
+//                addItems = listOf(uptResult),
+//                removeItems = emptyList()
+//            )
+//        } else { // "No" selected
+//            onShowAlert?.invoke("Please conduct UPT (Urine Pregnancy Test)")
+//            triggerDependants(
+//                source = pregnancyTestAtFacility,
+//                addItems = listOf(uptResult),
+//                removeItems = emptyList()
+//            )
+//        }
+//    }
+//
+//    private fun handleUPTResultFlow(index: Int): Int {
+//        val baseRegistrationFields = listOf(
+//            lmp, edd, gestationalAge, trimester, bloodGroup,
+//            gravida, para, height, weight, bmi,
+//            preExistingConditions, vdrlRprResult, hivResult, hbsAgResult,
+//            isHighRiskPregnancy
+//        )
+//
+//        return (if (index == 0) { // Positive
+//            // Get current gravida value to decide if history fields should be included
+//            val gravidaValue = gravida.value?.toIntOrNull() ?: 1
+//
+//            val registrationFields = mutableListOf<FormElement>().apply {
+//                addAll(getPregnancyBasicFields())
+//
+//                // Only add history fields if gravida > 1
+//                if (gravidaValue > 1) {
+//                    add(historyOfAbortions)
+//                    add(previousLSCS)
+//                    add(complicationsInPreviousPregnancy)
+//                }
+//
+//                addAll(getPhysicalFields())
+//                addLabFieldsCombined(this)
+//                add(isHighRiskPregnancy)
+//            }
+//
+//            triggerDependants(
+//                source = uptResult,
+//                addItems = registrationFields,
+//                removeItems = emptyList()
+//            )
+//        } else { // Negative - Redirect to Eligible Couple Tracking Form
+//            val allFieldsToRemove = mutableListOf<FormElement>().apply {
+//                addAll(getPregnancyBasicFields())
+//                addAll(getPhysicalFields())
+//                add(vdrlRprResult)
+//                add(hivResult)
+//                add(hbsAgResult)
+//                add(isHighRiskPregnancy)
+//                add(historyOfAbortions)
+//                add(previousLSCS)
+//                add(complicationsInPreviousPregnancy)
+//                add(vdrlRprDate)
+//                add(hivTestDate)
+//                add(hbsAgTestDate)
+//            }
+//
+//            triggerDependants(
+//                source = uptResult,
+//                addItems = emptyList(),
+//                removeItems = allFieldsToRemove
+//            )
+//        })
+//    }
+
+    fun shouldNavigateToEligibleCouple(): Boolean {
+
+        return false // uptResult.value == "Negative"
+    }
+
+    private fun handleLmpChange(): Int {
+        lmp.value?.let {
+            updateCalculatedFields(System.currentTimeMillis())
+        }
+        return lmp.id
+    }
+
+    private fun handleGravidaChange(): Int {
+        gravida.value?.toIntOrNull()?.let { gravidaValue ->
+            Timber.d("Gravida changed to: $gravidaValue")
+
+            if (gravidaValue <= 1) {
+                removeHistoryFields()
+            } else {
+                addHistoryFields()
+            }
+
+            handleParaFieldForGravida(gravidaValue)
+            updateHighRiskStatus()
+            return historyOfAbortions.id
+        }
+
+        return -1
+    }
+
+    /**
+     * Remove history fields when gravida <= 1
+     */
+    private fun removeHistoryFields() {
+        val historyFields = listOf(historyOfAbortions, previousLSCS, complicationsInPreviousPregnancy)
+
+        historyFields.forEach { field ->
+            field.isEnabled = false
+            field.required = false
+            field.value = null
+            triggerDependants(
+                source = gravida,
+                removeItems = listOf(field),
+                addItems = emptyList()
+            )
+        }
+
+        updateHighRiskStatus()
+    }
+
+    /**
+     * Add history fields when gravida > 1
+     */
+    private fun addHistoryFields() {
+        historyOfAbortions.isEnabled = true
+        historyOfAbortions.required = true
+
+        val paraPosition = getIndexById(para.id)
+        if (paraPosition >= 0 && getIndexById(historyOfAbortions.id) < 0) {
+            triggerDependants(
+                source = gravida,
+                addItems = listOf(historyOfAbortions),
+                removeItems = emptyList(),
+                position = paraPosition + 1
+            )
+        }
+
+        addFieldIfNotExists(previousLSCS) { getIndexById(historyOfAbortions.id) + 1 }
+        addFieldIfNotExists(complicationsInPreviousPregnancy) { getIndexById(previousLSCS.id) + 1 }
+    }
+
+    /**
+     * Add a field if it doesn't exist in the form
+     */
+    private fun addFieldIfNotExists(field: FormElement, positionProvider: () -> Int) {
+        field.isEnabled = true
+        field.required = true
+        if (getIndexById(field.id) < 0) {
+            triggerDependants(
+                source = gravida,
+                addItems = listOf(field),
+                removeItems = emptyList(),
+                position = positionProvider()
+            )
+        }
+    }
+
+    /**
+     * Handle Para field based on gravida value
+     */
+    /**
+     * Handle Para field based on gravida value
+     */
+    private fun handleParaFieldForGravida(gravidaValue: Int) {
+        // Swap para field to force UI refresh
+        val oldPara = _para
+        val newPara = if (_para.id == para1.id) para2 else para1
+        _para = newPara
+
+        if (gravidaValue == 1) {
+            newPara.value = "0"
+            newPara.isEnabled = false
+            newPara.required = false
+            newPara.errorText = null
+            Timber.d("Para auto-set to 0 and disabled")
+        } else {
+            newPara.isEnabled = true
+            newPara.required = true
+            newPara.value = oldPara.value // Preserve value if switching
+            if (newPara.value == "0") {
+                newPara.value = null
+            }
+        }
+
+        // Trigger the swap in the list
+        triggerDependants(
+            source = gravida,
+            removeItems = listOf(oldPara),
+            addItems = listOf(newPara),
+            position = getIndexById(oldPara.id)
+        )
+    }
+
+    private fun handleHistoryOfAbortionsChange(index: Int): Int {
+        if (index == 0) { // Yes
+            onShowAlert?.invoke("History of abortions detected – High Risk Pregnancy")
+        }
+        updateHighRiskStatus()
+        return -1
+    }
+
+    private fun handlePreviousLSCSChange(index: Int): Int {
+        if (index == 0) { // Yes
+            onShowAlert?.invoke("Previous LSCS detected – High Risk Pregnancy")
+        }
+        updateHighRiskStatus()
+        return -1
+    }
+
+    private fun handleVdrlRprResultChange(index: Int) {
+        when (index) {
+            TEST_RESULT_INDEX_REACTIVE -> { // Reactive
+                onShowAlert?.invoke("VDRL/RPR Test is Reactive - HRP condition")
+                showVdrlRprDateField()
+            }
+            TEST_RESULT_INDEX_NON_REACTIVE -> { // Non-Reactive
+                showVdrlRprDateField()
+            }
+            TEST_RESULT_INDEX_NOT_DONE -> { // Test Not Done
+                hideVdrlRprDateField()
+            }
+        }
+        updateHighRiskStatus()
+    }
+
+    private fun handleHivResultChange(index: Int) {
+        when (index) {
+            TEST_RESULT_INDEX_REACTIVE -> { // Reactive
+                onShowAlert?.invoke("HIV Test is Reactive - HRP condition")
+                showHivTestDateField()
+            }
+            TEST_RESULT_INDEX_NON_REACTIVE -> { // Non-Reactive
+                showHivTestDateField()
+            }
+            TEST_RESULT_INDEX_NOT_DONE -> { // Test Not Done
+                hideHivTestDateField()
+            }
+        }
+        updateHighRiskStatus()
+    }
+
+    private fun handleHbsAgResultChange(index: Int) {
+        when (index) {
+            TEST_RESULT_INDEX_REACTIVE -> { // Positive
+                onShowAlert?.invoke("HBsAg Test is Positive - HRP condition")
+                showHbsAgTestDateField()
+            }
+            TEST_RESULT_INDEX_NON_REACTIVE -> { // Negative
+                showHbsAgTestDateField()
+            }
+            TEST_RESULT_INDEX_NOT_DONE -> { // Test Not Done
+                hideHbsAgTestDateField()
+            }
+        }
+        updateHighRiskStatus()
+    }
+    /**
+     * Generic helper to show a test date field
+     */
+    private fun showTestDateField(dateField: FormElement, sourceField: FormElement) {
+        val today = System.currentTimeMillis()
+        dateField.min = oneYearBeforeRegMillis
+        dateField.max = today
+        dateField.isEnabled = true
+        dateField.required = true
+        addDateFieldAfterSource(sourceField, dateField)
+    }
+
+    /**
+     * Generic helper to hide a test date field
+     */
+    private fun hideTestDateField(dateField: FormElement) {
+        dateField.isEnabled = false
+        dateField.required = false
+        dateField.value = null
+        removeDateField(dateField)
+    }
+
+    private fun showVdrlRprDateField() {
+        showTestDateField(vdrlRprDate, vdrlRprResult)
+    }
+
+    private fun hideVdrlRprDateField() {
+        hideTestDateField(vdrlRprDate)
+    }
+
+    private fun showHivTestDateField() {
+        showTestDateField(hivTestDate, hivResult)
+    }
+
+    private fun hideHivTestDateField() {
+        hideTestDateField(hivTestDate)
+    }
+
+    private fun showHbsAgTestDateField() {
+        showTestDateField(hbsAgTestDate, hbsAgResult)
+    }
+
+    private fun hideHbsAgTestDateField() {
+        hideTestDateField(hbsAgTestDate)
+    }
+
+    // Helper methods to add/remove fields
+    private fun addDateFieldAfterSource(source: FormElement, dateField: FormElement) {
+        // Check if date field already exists
+        if (getIndexById(dateField.id) < 0) {
+            // Use triggerDependants to add the date field
+            triggerDependants(
+                source = source,
+                addItems = listOf(dateField),
+                removeItems = emptyList(),
+                position = getIndexById(source.id) + 1
+            )
+        }
+    }
+
+    private fun removeDateField(dateField: FormElement) {
+        // Find which test result this date field belongs to
+        val sourceField = when (dateField.id) {
+            vdrlRprDate.id -> vdrlRprResult
+            hivTestDate.id -> hivResult
+            hbsAgTestDate.id -> hbsAgResult
+            else -> null
+        }
+
+        sourceField?.let {
+            triggerDependants(
+                source = it,
+                removeItems = listOf(dateField),
+                addItems = emptyList()
+            )
+        }
+    }
+    /**
+     * Generic helper to handle checkbox field changes with "None" option
+     */
+    private fun handleCheckboxFieldChange(
+        field: FormElement,
+        index: Int,
+        alertMessage: String? = null
+    ): Int {
+        val entries = field.entries!!
+        val realIndex = (if (index < 0) -index else index) - 1
+        val clickedOption = entries[realIndex]
+        val currentValue = field.value ?: ""
+        if (realIndex == 0) {
+            if (currentValue.contains(clickedOption)) {
+                field.value = clickedOption
+            }
+        } else {
+            val selections = mutableSetOf<String>()
+            if (currentValue.isNotEmpty()) {
+                selections.addAll(currentValue.split(",").map { it.trim() }.filter { it.isNotEmpty() })
+            }
+
+            // If the option is present, it was checked.
+            if (selections.contains(clickedOption)) {
+                // Remove "None" if it exists
+                if (selections.contains("None")) {
+                    selections.remove("None")
+                }
+                alertMessage?.let { onShowAlert?.invoke(it) }
+                field.value = selections.joinToString(",")
+            }
+            // If option is NOT present, it was unchecked. Nothing extra to do.
+        }
+
+        updateHighRiskStatus()
+        return getIndexById(field.id)
+    }
+
+    private fun handleComplicationsChange(index: Int): Int {
+        val realIndex = (if (index < 0) -index else index) - 1
+        return handleCheckboxFieldChange(
+            field = complicationsInPreviousPregnancy,
+            index = index,
+            alertMessage = "Previous pregnancy complication: ${complicationsInPreviousPregnancy.entries!![realIndex]} - High Risk Pregnancy"        )
+    }
+
+    private fun handleParaChange(): Int {
+        val paraValue = para.value?.toIntOrNull() ?: return -1
+        val gravidaValue = gravida.value?.toIntOrNull() ?: return -1
+
+        return if (paraValue > gravidaValue) {
+            para.errorText = "Para cannot exceed Gravida"
+            para.value = gravidaValue.toString()
+            -1
+        } else {
+            para.errorText = null
+            -1
+        }
+    }
+
+    private fun handleAnthropometryChange(formId: Int): Int {
+
+        if (formId == height.id) {
+            val heightText = height.value ?: ""
+            val heightValue = heightText.toIntOrNull()
+
+            when {
+                heightValue != null && heightValue < 100 -> {
+                    height.errorText = "Height should be greater than or equal to 100 cm"
+                }
+
+                heightValue != null && heightText.length >= 3 && heightValue > 220 -> {
+                    height.errorText = "Height should be less than or equal to 220 cm"
+                }
+
+                heightValue != null && heightValue in 100..220 -> {
+                    height.errorText = null
+
+                    if (heightValue < 145 && heightText.length >= 3) {
+                        onShowAlert?.invoke("Height < 145 cm detected - High Risk Pregnancy")
+                    }
+                }
+
+                else -> {
+                    height.errorText = null
+                }
+            }
+        }
+
+        if (formId == weight.id) {
+            validateDoubleMinMax(weight)
+        }
+
+        updateBMI()
+        updateHighRiskStatus()
+
+        return if (getIndexById(bmi.id) >= 0) bmi.id else -1
+    }
+
+
+
+    fun validateHeightStrict(): Boolean {
+        validateIntMinMax(height)
+        return height.errorText == null
+    }
+
+    private fun handlePreExistingConditionsChange(index: Int): Int {
+        val realIndex = (if (index < 0) -index else index) - 1
+        return handleCheckboxFieldChange(
+            field = preExistingConditions,
+            index = index,
+            alertMessage = "Pre-existing condition: ${preExistingConditions.entries!![realIndex]} - High Risk Pregnancy"        )
+    }
+
+    private fun updateCalculatedFields(currentDate: Long) {
+        lmp.value?.let { lmpStr ->
+            val lmpLong = getLongFromDate(lmpStr)
+
+            // Calculate EDD
+            val eddLong = getEddFromLmp(lmpLong)
+            edd.value = getDateFromLong(eddLong)
+
+            // Calculate gestational age
+            val (weeks, days) = calculateGestationalAge(lmpLong, currentDate)
+            gestationalAge.value = "$weeks weeks $days days"
+
+            // Calculate trimester
+            trimester.value = calculateTrimester(weeks)
+        }
+    }
+
+    private fun updateBMI(isHeightChange: Boolean = false) {
+        val heightValue = height.value?.toDoubleOrNull()
+        val weightValue = weight.value?.toDoubleOrNull()
+
+        if (heightValue != null && heightValue > 0 && weightValue != null && weightValue > 0) {
+            val bmiValue = calculateBMI(weightValue, heightValue)
+            val category = getBMICategory(bmiValue)
+
+            // Swap BMI element to force UI refresh
+            val oldBmi = _bmi
+            val newBmi = if (_bmi.id == bmi1.id) bmi2 else bmi1
+            _bmi = newBmi
+
+            newBmi.value = String.format("%.1f (%s)", bmiValue, category)
+
+            // Trigger the swap in the list
+            triggerDependants(
+                source = weight, // Using weight as source (it's adjacent usually) or we can use specific position
+                removeItems = listOf(oldBmi),
+                addItems = listOf(newBmi),
+                position = getIndexById(oldBmi.id)
+            )
+
+            Timber.d("BMI updated: Height=$heightValue, Weight=$weightValue, BMI=${newBmi.value}")
+
+            // Check for height < 145 cm HRP condition
+            // Only trigger alert if user has typed at least 3 digits to avoid premature alerts
+            // AND if the height field is the one that was actively changed
+            if (isHeightChange && heightValue < 145 && (height.value?.length ?: 0) >= 3) {
+                onShowAlert?.invoke("Height < 145 cm detected - HRP condition")
+            }
+        } else {
+            // Clear BMI if values are invalid
+            val oldBmi = _bmi
+            val newBmi = if (_bmi.id == bmi1.id) bmi2 else bmi1
+            _bmi = newBmi
+
+            newBmi.value = ""
+
+            triggerDependants(
+                source = weight,
+                removeItems = listOf(oldBmi),
+                addItems = listOf(newBmi),
+                position = getIndexById(oldBmi.id)
+            )
+            Timber.d("BMI cleared - invalid height or weight values")
+        }
+    }
+
+    private fun updateHighRiskStatus() {
+        val isHRP = checkHighRiskConditions()
+        isHighRiskPregnancy.value = if (isHRP) "Yes" else "No"
+
+        // Also update the cache
+        registrationCache.isHrp = isHRP
+    }
+
+    private fun checkHighRiskConditions(): Boolean {
+        return checkAgeCondition() ||
+                checkHeightCondition() ||
+                checkHistoryOfAbortions() ||
+                checkPreviousLSCS() ||
+                checkPreExistingConditions() ||
+                checkComplicationsInPreviousPregnancy() ||
+                checkLabResults()
+    }
+
+    /**
+     * Check if age < 18 or > 35 years (HRP condition)
+     */
+    private fun checkAgeCondition(): Boolean {
+        return patientAgeYears?.let { age -> age < 18 || age > 35 } == true
+    }
+
+    /**
+     * Check if height < 145 cm (HRP condition)
+     */
+    private fun checkHeightCondition(): Boolean {
+        return height.value?.toDoubleOrNull()?.let { it < 145 && (height.value?.length ?: 0) >= 3 } == true
+    }
+
+    /**
+     * Check if history of abortions exists
+     */
+    private fun checkHistoryOfAbortions(): Boolean {
+        return historyOfAbortions.value == "Yes"
+    }
+
+    /**
+     * Check if previous LSCS exists
+     */
+    private fun checkPreviousLSCS(): Boolean {
+        return previousLSCS.value == "Yes"
+    }
+
+    /**
+     * Check if pre-existing conditions exist (excluding "None")
+     */
+    private fun checkPreExistingConditions(): Boolean {
+        return preExistingConditions.value?.let { value ->
+            value.isNotEmpty() && hasNonNoneSelections(value)
+        } == true
+    }
+
+    /**
+     * Check if complications in previous pregnancy exist (excluding "None")
+     */
+    private fun checkComplicationsInPreviousPregnancy(): Boolean {
+        return complicationsInPreviousPregnancy.value?.let { value ->
+            value.isNotEmpty() && hasNonNoneSelections(value)
+        } == true
+    }
+
+    /**
+     * Check if any lab results indicate HRP
+     */
+    private fun checkLabResults(): Boolean {
+        return vdrlRprResult.value == TEST_RESULT_REACTIVE ||
+                hivResult.value == TEST_RESULT_REACTIVE ||
+                hbsAgResult.value == TEST_RESULT_POSITIVE
+    }
+
+    /**
+     * Check if comma-separated selections contain non-"None" values
+     */
+    private fun hasNonNoneSelections(value: String): Boolean {
+        val selections = value.split(",").map { it.trim() }
+        return selections.isNotEmpty() && !selections.contains("None")
+    }
+
+    private fun makeFormReadOnly(fields: List<FormElement>) {
+        fields.forEach { field ->
+            when (field.inputType) {
+                InputType.EDIT_TEXT -> field.inputType = InputType.TEXT_VIEW
+                InputType.DATE_PICKER -> field.inputType = InputType.TEXT_VIEW
+                InputType.DROPDOWN -> field.inputType = InputType.TEXT_VIEW
+                InputType.RADIO -> field.inputType = InputType.TEXT_VIEW
+                InputType.CHECKBOXES -> field.inputType = InputType.TEXT_VIEW
+                else -> {
+                    // No conversion needed for other input types
+                }
+            }
+            field.isEnabled = false
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as PregnantWomanRegistrationCache).let { cache ->
+            // Map Date of Registration
+            cache.dateOfRegistration = dateOfReg.value?.let { getLongFromDate(it) } ?: System.currentTimeMillis()
+
+            // Map RCH ID
+            cache.rchId = rchId.value?.toLongOrNull()
+
+//            cache.pregnancyTestAtFacility = pregnancyTestAtFacility.value
+//            cache.uptResult = uptResult.value
+
+            // Map pregnancy details
+            cache.lmpDate = lmp.value?.let { getLongFromDate(it) } ?: 0L
+
+            // Map blood group
+            cache.bloodGroup = bloodGroup.value
+            cache.bloodGroupId = bloodGroup.getPosition()
+
+            // Map anthropometry
+            cache.height = height.value?.toIntOrNull()
+            cache.weight = weight.value?.toIntOrNull()
+
+            // Map obstetric history
+            cache.numPrevPregnancy = gravida.value?.toIntOrNull()
+            cache.para = para.value?.toIntOrNull()
+            cache.is1st = (gravida.value?.toIntOrNull() ?: 1) == 1
+            cache.historyOfAbortions = historyOfAbortions.value == "Yes"
+            cache.previousLSCS = previousLSCS.value == "Yes"
+            cache.complicationPrevPregnancy = complicationsInPreviousPregnancy.value
+
+            // Map pre-existing conditions
+            cache.pastIllness = preExistingConditions.value
+
+            // Map VDRL/RPR lab investigations
+            cache.vdrlRprTestResult = vdrlRprResult.value
+            cache.vdrlRprTestResultId = vdrlRprResult.getPosition()
+            cache.dateOfVdrlRprTest = vdrlRprDate.value?.let { getLongFromDate(it) }
+
+            // Map HIV lab investigations
+            cache.hivTestResult = hivResult.value
+            cache.hivTestResultId = hivResult.getPosition()
+            cache.dateOfHivTest = hivTestDate.value?.let { getLongFromDate(it) }
+
+            // Map HBsAg lab investigations
+            cache.hbsAgTestResult = hbsAgResult.value
+            cache.hbsAgTestResultId = hbsAgResult.getPosition()
+            cache.dateOfHbsAgTest = hbsAgTestDate.value?.let { getLongFromDate(it) }
+
+            // Map high-risk status
+            cache.isHrp = isHighRiskPregnancy.value == "Yes"
+
+            // Set sync state
+            cache.syncState = SyncState.UNSYNCED
+
+            // Mark as first ANC submitted if this is the first submission
+            if (!cache.isFirstAncSubmitted) {
+                cache.isFirstAncSubmitted = true
+            }
+        }
+    }
+
+    fun shouldNavigateToVitals(): Boolean {
+        // Navigate to Vitals & Prescription after successful submission
+        return !isFormReadOnly
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/PsychosocialCaregiverSupportDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/PsychosocialCaregiverSupportDataset.kt
new file mode 100644
index 000000000..7a9774808
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/PsychosocialCaregiverSupportDataset.kt
@@ -0,0 +1,137 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+
+class PsychosocialCaregiverSupportDataset(
+    context: Context,
+    currentLanguage: Languages
+) : ReferralFollowUpDataset(context, currentLanguage) {
+
+    private lateinit var cache: PsychosocialCaregiverSupport
+
+    private val optionYes = context.getString(R.string.yes_option)
+    private val optionNo = context.getString(R.string.no_option)
+
+    // ---------------- Psychosocial counselling ----------------
+    private val psychosocialCounsellingProvided = FormElement(
+        id = 1,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.psychosocial_counselling_provided),
+        entries = arrayOf(optionYes, optionNo),
+        required = true
+    )
+
+    // ---------------- Caregiver counselling ----------------
+    private val caregiverCounsellingProvided = FormElement(
+        id = 2,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.psychosocial_caregiver_counselling),
+        entries = arrayOf(optionYes, optionNo),
+        required = true
+    )
+
+    // ---------------- Caregiver distress ----------------
+    private val caregiverDistressIdentified = FormElement(
+        id = 3,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.psychosocial_caregiver_distress),
+        entries = arrayOf(optionYes),
+        required = false
+    )
+
+    // ---------------- Counselling remarks ----------------
+    private val counsellingRemarks = FormElement(
+        id = 4,
+        inputType = InputType.EDIT_TEXT,
+        title = context.getString(R.string.psychosocial_counselling_remarks),
+        required = false,
+        etMaxLength = 250,
+        etInputType = android.text.InputType.TYPE_CLASS_TEXT
+    )
+
+    // ---------------- Section F: Referral & Follow-up ----------------
+
+    override val referralRequired = createReferralRequired(5)
+
+    override val referralLevel = createReferralLevel(6)
+
+    override val reasonForReferral = createReasonForReferral(7)
+
+    override val followUpRequired = createFollowUpRequired(8)
+
+    override val followUpDate = createFollowUpDate(9)
+    override val caseStatus = createCaseStatus(20)
+    override val dateOfDeath = createDateOfDeath(21)
+    override val remarks = createRemarks(22)
+
+    // ---------------- Setup Page ----------------
+    suspend fun setUpPage(savedRecord: PsychosocialCaregiverSupport?) {
+        cache = savedRecord ?: createDefaultCache()
+        populateFromCache(cache)
+
+        val list = mutableListOf<FormElement>()
+        list.add(psychosocialCounsellingProvided)
+        list.add(caregiverCounsellingProvided)
+        list.add(caregiverDistressIdentified)
+        list.add(counsellingRemarks)
+
+        // Section F
+        addReferralFollowUpElements(list)
+
+        setUpPage(list)
+    }
+
+    // ---------------- Value Change Handler ----------------
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return handleReferralFollowUpChange(formId, index)
+    }
+
+    // ---------------- Cache Helpers ----------------
+    private fun createDefaultCache(): PsychosocialCaregiverSupport {
+        return PsychosocialCaregiverSupport(
+            patientId = "",
+            benVisitNo = null
+        )
+    }
+
+    private fun populateFromCache(cache: PsychosocialCaregiverSupport) {
+        psychosocialCounsellingProvided.value =
+            cache.psychosocialCounsellingProvided?.let { if (it) optionYes else optionNo }
+
+        caregiverCounsellingProvided.value =
+            cache.caregiverCounsellingProvided?.let { if (it) optionYes else optionNo }
+
+        caregiverDistressIdentified.value =
+            if (cache.caregiverDistressIdentified == true) optionYes else null
+
+        counsellingRemarks.value = cache.counsellingRemarks
+
+        // Section F
+        populateReferralFollowUpFromCache(cache)
+    }
+
+    // ---------------- Map Values ----------------
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as PsychosocialCaregiverSupport).let {
+
+            it.psychosocialCounsellingProvided =
+                psychosocialCounsellingProvided.value == optionYes
+
+            it.caregiverCounsellingProvided =
+                caregiverCounsellingProvided.value == optionYes
+
+            it.caregiverDistressIdentified =
+                caregiverDistressIdentified.value == optionYes
+
+            it.counsellingRemarks = counsellingRemarks.value
+
+            // Section F
+            mapReferralFollowUpValues(it)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/RMNCHAIconDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/RMNCHAIconDataset.kt
new file mode 100644
index 000000000..1fb7c799d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/RMNCHAIconDataset.kt
@@ -0,0 +1,240 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.res.Resources
+import android.os.Bundle
+import androidx.navigation.NavDirections
+import dagger.hilt.android.scopes.ActivityRetainedScoped
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.model.Icon
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.PncRepo
+import javax.inject.Inject
+
+@ActivityRetainedScoped
+class RMNCHAIconDataset @Inject constructor(
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val pncRepo: PncRepo,
+    private val patientRepo: PatientRepo,
+    private val infantRegRepo: InfantRegRepo,
+    private val ecrRepo: EcrRepo,
+) {
+
+    companion object {
+        const val MODULE_TYPE_KEY = "module_type"
+        const val SHOW_EC_TRACKING_KEY = "show_ec_tracking"
+        const val SHOW_PWR_KEY = "show_pwr"
+        const val SHOW_ANC_VISITS_KEY = "show_anc_visits"
+        const val SHOW_DELIVERY_OUTCOME_KEY = "show_delivery_outcome"
+        const val SHOW_NEONATAL_OUTCOME_KEY = "show_neonatal_outcome"
+        const val SHOW_PNC_MOTHER_LIST_KEY = "show_pnc_mother_list"
+        const val SHOW_E_PMSMA_LIST_KEY = "show_e_pmsma_list"
+        const val SHOW_ABORTION_LIST_KEY = "show_abortion_list"
+        const val SHOW_INFANT_LIST_KEY = "show_infant_list"
+        const val SHOW_CHILD_LIST_KEY = "show_child_list"
+        const val SHOW_ADOLESCENT_LIST_KEY = "show_adolescent_list"
+        const val MODULE_MATERNAL_HEALTH = "maternal_health"
+        private const val ACTION_SUBMODULE = 1001 // Custom action ID for sub-modules
+        private const val ACTION_EC_TRACKING = 1004 // Action for EC tracking list
+        private const val ACTION_PWR = 1005 // Action for Pregnant Women Registration list
+        private const val ACTION_ANC_VISITS = 1006 // Action for ANC Visits list
+        private const val ACTION_DELIVERY_OUTCOME = 1007 // Action for Delivery Outcome list
+        private const val ACTION_PNC_MOTHER_LIST = 1008 // Action for PNC Mother List
+        private const val ACTION_NEONATAL_OUTCOME = 1009 // Action for Neonatal Outcome List
+        private const val ACTION_E_PMSMA_LIST = 1016 // Action for e-PMSMA List
+        private const val ACTION_ABORTION_LIST = 1011 // Action for Abortion List
+        private const val ACTION_INFANT_LIST = 1013 // Action for Infant List
+        private const val ACTION_CHILD_LIST = 1014 // Action for Child List
+        private const val ACTION_ADOLESCENT_LIST = 1015 // Action for Adolescent List
+    }
+
+    // NavDirections for sub-module navigation
+    private fun createNavAction(moduleType: String): NavDirections {
+        return object : NavDirections {
+            override val actionId: Int = ACTION_SUBMODULE
+            override val arguments = Bundle().apply {
+                putString(MODULE_TYPE_KEY, moduleType)
+            }
+        }
+    }
+
+    // NavDirections for showing EC Tracking list
+    private val showECTrackingAction = object : NavDirections {
+        override val actionId: Int = ACTION_EC_TRACKING
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_EC_TRACKING_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Pregnant Women Registration list
+    private val showPWRAction = object : NavDirections {
+        override val actionId: Int = ACTION_PWR
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_PWR_KEY, true)
+        }
+    }
+
+    // NavDirections for showing ANC Visits list
+    private val showANCVisitsAction = object : NavDirections {
+        override val actionId: Int = ACTION_ANC_VISITS
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_ANC_VISITS_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Delivery Outcome list
+    private val showDeliveryOutcomeAction = object : NavDirections {
+        override val actionId: Int = ACTION_DELIVERY_OUTCOME
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_DELIVERY_OUTCOME_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Neonatal Outcome list
+    private val showNeonatalOutcomeAction = object : NavDirections {
+        override val actionId: Int = ACTION_NEONATAL_OUTCOME
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_NEONATAL_OUTCOME_KEY, true)
+        }
+    }
+
+    // NavDirections for showing PNC Mother List
+    private val showPNCMotherListAction = object : NavDirections {
+        override val actionId: Int = ACTION_PNC_MOTHER_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_PNC_MOTHER_LIST_KEY, true)
+        }
+    }
+
+    // NavDirections for showing e-PMSMA List (women flagged high-risk in any ANC visit)
+    private val showEPmsmaListAction = object : NavDirections {
+        override val actionId: Int = ACTION_E_PMSMA_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_E_PMSMA_LIST_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Abortion List
+    private val showAbortionListAction = object : NavDirections {
+        override val actionId: Int = ACTION_ABORTION_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_ABORTION_LIST_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Infant List
+    private val showInfantListAction = object : NavDirections {
+        override val actionId: Int = ACTION_INFANT_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_INFANT_LIST_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Child List
+    private val showChildListAction = object : NavDirections {
+        override val actionId: Int = ACTION_CHILD_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_CHILD_LIST_KEY, true)
+        }
+    }
+
+    // NavDirections for showing Adolescent List
+    private val showAdolescentListAction = object : NavDirections {
+        override val actionId: Int = ACTION_ADOLESCENT_LIST
+        override val arguments = Bundle().apply {
+            putBoolean(SHOW_ADOLESCENT_LIST_KEY, true)
+        }
+    }
+
+    private val placeholderNavAction = object : NavDirections {
+        override val actionId: Int = 0
+        override val arguments = Bundle()
+    }
+
+    fun getRMNCHAIconDataset(resources: Resources): List<Icon> {
+        return listOf(
+            Icon(
+                R.drawable.ic__eligible_couple,
+                resources.getString(R.string.eligible_couple_tracking),
+                ecrRepo.getEligibleCoupleTrackingCount(),
+                showECTrackingAction
+            ),
+            Icon(
+                R.drawable.ic__maternal_health,
+                resources.getString(R.string.maternal_health),
+                null,
+                createNavAction(MODULE_MATERNAL_HEALTH)
+            ),
+            Icon(
+                R.drawable.ic__adolescent,
+                resources.getString(R.string.adolescent_list),
+                patientRepo.getAdolescentListCount(),
+                showAdolescentListAction
+            )
+        ).mapIndexed { index, icon ->
+            icon.copy(colorPrimary = index % 2 == 0)
+        }
+    }
+
+    /**
+     * Maternal Health sub-modules dataset
+     */
+    fun getMaternalHealthDataset(resources: Resources): List<Icon> {
+        return listOf(
+            Icon(
+                R.drawable.ic__pwr,
+                resources.getString(R.string.pregnant_women_registration),
+                maternalHealthRepo.getPWRCount(),
+                showPWRAction
+            ),
+            Icon(
+                R.drawable.ic__anc_visit,
+                resources.getString(R.string.anc_visits),
+                maternalHealthRepo.getANCCount(),
+                showANCVisitsAction
+            ),
+            Icon(
+                R.drawable.ic__pwr,
+                resources.getString(R.string.e_pmsma_list),
+                maternalHealthRepo.getEPmsmaWomenCount(),
+                showEPmsmaListAction
+            ),
+            Icon(
+                R.drawable.ic__delivery_outcome,
+                resources.getString(R.string.delivery_outcome),
+                maternalHealthRepo.getDeliveredWomenCount(),
+                showDeliveryOutcomeAction
+            ),
+            Icon(
+                R.drawable.ic__mother,
+                resources.getString(R.string.pnc_mother_list),
+                pncRepo.getPNCMothersCount(),
+                showPNCMotherListAction
+            ),
+            Icon(
+                R.drawable.ic__infant_registration,
+                resources.getString(R.string.infant_registration),
+                infantRegRepo.getInfantRegisterCount(),
+                showInfantListAction
+            ),
+            Icon(
+                R.drawable.ic__child_registration,
+                resources.getString(R.string.child_registration),
+                infantRegRepo.getRegisteredInfantsCount(),
+                showChildListAction
+            ),
+            Icon(
+                R.drawable.ic__child_registration,
+                resources.getString(R.string.abortion_list),
+                maternalHealthRepo.getAbortionWomenCount(),
+                showAbortionListAction
+            )
+        ).mapIndexed { index, icon ->
+            icon.copy(colorPrimary = index % 2 == 0)
+        }
+    }
+
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/ReferralFollowUpDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/ReferralFollowUpDataset.kt
new file mode 100644
index 000000000..15fb68b65
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/ReferralFollowUpDataset.kt
@@ -0,0 +1,243 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.ReferralFollowUpModel
+import java.util.concurrent.TimeUnit
+import org.piramalswasthya.cho.R
+
+
+abstract class ReferralFollowUpDataset(context: Context, currentLanguage: Languages) : Dataset(context, currentLanguage) {
+
+    // Resolve all user-facing strings, options, and sentinel values through the base
+    // Dataset.resources, which is locked to the *screening* language passed in via
+    // currentLanguage. Using context.getString / context.resources would resolve from
+    // the device locale instead, which can drift from the screening language and break
+    // comparisons like `caseStatus.value == optionDeath` when the two locales differ.
+    private val optionYes = resources.getString(R.string.yes)
+    private val optionNo = resources.getString(R.string.no)
+
+    private val caseStatusEntries = resources.getStringArray(R.array.case_status_options)
+    private val optionDeath = caseStatusEntries.last()
+
+    protected abstract val referralRequired: FormElement
+    protected abstract val referralLevel: FormElement
+    protected abstract val reasonForReferral: FormElement
+    protected abstract val followUpRequired: FormElement
+    protected abstract val followUpDate: FormElement
+    protected abstract val caseStatus: FormElement
+    protected abstract val dateOfDeath: FormElement
+    protected abstract val remarks: FormElement
+
+
+
+    protected fun createReferralRequired(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.referral_required_title),
+        entries = resources.getStringArray(R.array.referral_required_options),
+        trueIndex = 0,
+        falseIndex = 1,
+        required = true,
+        hasDependants = true
+    )
+
+    protected fun createReferralLevel(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.referral_level_title),
+        entries = resources.getStringArray(R.array.referral_level_options),
+        required = false
+    )
+
+    protected fun createReasonForReferral(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.reason_for_referral_title),
+        entries = resources.getStringArray(R.array.reason_for_referral_options),
+        required = true
+    )
+
+    protected fun createFollowUpRequired(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.RADIO,
+        title = resources.getString(R.string.follow_up_required_title),
+        entries = resources.getStringArray(R.array.follow_up_required_options),
+        trueIndex = 0,
+        falseIndex = 1,
+        required = true,
+        hasDependants = true
+    )
+
+    protected fun createFollowUpDate(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.follow_up_date_title),
+        required = false
+    )
+
+    protected fun addReferralFollowUpElements(list: MutableList<FormElement>) {
+        list.add(referralRequired)
+        if (referralRequired.value == optionYes) {
+            referralLevel.required = true
+            list.add(referralLevel)
+            list.add(reasonForReferral)
+        }
+        list.add(followUpRequired)
+        if (followUpRequired.value == optionYes) {
+            followUpDate.required = true
+            followUpDate.min = System.currentTimeMillis()
+            followUpDate.max = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365 * 10)
+            list.add(followUpDate)
+        }
+        // Case closure fields are always visible below follow-up
+        list.add(caseStatus)
+        if (caseStatus.value == optionDeath) {
+            list.add(dateOfDeath)
+        }
+        list.add(remarks)
+    }
+    protected fun createCaseStatus(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.DROPDOWN,
+        title = resources.getString(R.string.case_status_title),
+        entries = resources.getStringArray(R.array.case_status_options),
+        required = true,
+        hasDependants = true
+    )
+
+    protected fun createDateOfDeath(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.DATE_PICKER,
+        title = resources.getString(R.string.date_of_death_title),
+        required = true,
+        max = System.currentTimeMillis()
+    )
+
+    protected fun createRemarks(id: Int) = FormElement(
+        id = id,
+        inputType = InputType.EDIT_TEXT,
+        title = resources.getString(R.string.remarks),
+        required = false,
+        etMaxLength = 250
+    )
+
+    protected suspend fun handleReferralFollowUpChange(formId: Int, index: Int): Int {
+        return when (formId) {
+            referralRequired.id -> {
+                if (index == referralRequired.trueIndex) {
+                    referralLevel.required = true
+                    triggerDependants(
+                        source = referralRequired,
+                        addItems = listOf(referralLevel, reasonForReferral),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    referralLevel.value = null
+                    referralLevel.required = false
+                    reasonForReferral.value = null
+                    triggerDependants(
+                        source = referralRequired,
+                        addItems = emptyList(),
+                        removeItems = listOf(referralLevel, reasonForReferral)
+                    )
+                }
+                referralRequired.id
+            }
+            caseStatus.id -> {
+                if (caseStatus.value == optionDeath) {
+                    triggerDependants(
+                        source = caseStatus,
+                        addItems = listOf(dateOfDeath),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    dateOfDeath.value = null
+                    triggerDependants(
+                        source = caseStatus,
+                        addItems = emptyList(),
+                        removeItems = listOf(dateOfDeath)
+                    )
+                }
+                caseStatus.id
+            }
+            followUpRequired.id -> {
+                if (index == followUpRequired.trueIndex) {
+                    followUpDate.required = true
+                    followUpDate.min = System.currentTimeMillis()
+                    followUpDate.max = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365 * 10)
+                    triggerDependants(
+                        source = followUpRequired,
+                        addItems = listOf(followUpDate),
+                        removeItems = emptyList()
+                    )
+                } else {
+                    followUpDate.value = null
+                    followUpDate.required = false
+                    triggerDependants(
+                        source = followUpRequired,
+                        addItems = emptyList(),
+                        removeItems = listOf(followUpDate)
+                    )
+                }
+                followUpRequired.id
+            }
+            else -> -1
+        }
+    }
+
+    protected fun populateReferralFollowUpFromCache(cacheValue: ReferralFollowUpModel) {
+        referralRequired.value = when (cacheValue.referralRequired) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        // cacheValue.* dropdown fields are stored in English; re-localize for display
+        // so the user sees the form in their current UI language.
+        referralLevel.value = getLocalValueInArray(R.array.referral_level_options, cacheValue.referralLevel)
+        reasonForReferral.value = getLocalValueInArray(R.array.reason_for_referral_options, cacheValue.reasonForReferral)
+        followUpRequired.value = when (cacheValue.followUpRequired) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        followUpDate.value = cacheValue.followUpDate
+        caseStatus.value = getLocalValueInArray(R.array.case_status_options, cacheValue.caseStatus)
+        dateOfDeath.value = cacheValue.dateOfDeath
+        remarks.value = cacheValue.remarks
+    }
+
+    protected fun mapReferralFollowUpValues(cacheValue: ReferralFollowUpModel) {
+        cacheValue.referralRequired = when (referralRequired.value) {
+            optionYes -> true
+            optionNo -> false
+            else -> null
+        }
+        // Persist dropdowns in English canonical form so the DB stays locale-neutral.
+        if (cacheValue.referralRequired == true) {
+            cacheValue.referralLevel = getEnglishValueInArray(R.array.referral_level_options, referralLevel.value)
+            cacheValue.reasonForReferral = getEnglishValueInArray(R.array.reason_for_referral_options, reasonForReferral.value)
+        } else {
+            cacheValue.referralLevel = null
+            cacheValue.reasonForReferral = null
+        }
+
+        // Follow-up and closure fields are always visible, persist regardless of referral
+        cacheValue.followUpRequired = when (followUpRequired.value) {
+            optionYes -> true
+            optionNo -> false
+            else -> null
+        }
+        if (cacheValue.followUpRequired == true) {
+            cacheValue.followUpDate = followUpDate.value
+        } else {
+            cacheValue.followUpDate = null
+        }
+        cacheValue.caseStatus = getEnglishValueInArray(R.array.case_status_options, caseStatus.value)
+        // caseStatus.value is local; optionDeath is local — same-locale compare.
+        cacheValue.dateOfDeath = if (caseStatus.value == optionDeath) dateOfDeath.value else null
+        cacheValue.remarks = remarks.value
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/configuration/ThroatDiagnosisDataset.kt b/app/src/main/java/org/piramalswasthya/cho/configuration/ThroatDiagnosisDataset.kt
new file mode 100644
index 000000000..57e1438e2
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/configuration/ThroatDiagnosisDataset.kt
@@ -0,0 +1,301 @@
+package org.piramalswasthya.cho.configuration
+
+import android.content.Context
+import org.piramalswasthya.cho.helpers.Languages
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
+
+class ThroatDiagnosisDataset(
+    private val context: Context,
+    currentLanguage: Languages
+) : Dataset(context, currentLanguage) {
+
+    private lateinit var cache: ThroatDiagnosisAssessment
+
+    var onShowAlert: ((String) -> Unit)? = null
+
+    private val optionYes = context.getString(R.string.yes)
+    private val optionNo = context.getString(R.string.no)
+
+
+
+    private val symptoms = FormElement(
+        id = 1,
+        inputType = InputType.CHECKBOXES,
+        title = context.getString(R.string.throat_diagnosis_symptoms),
+        entries = arrayOf(
+            context.getString(R.string.throat_symptom_pain),
+            context.getString(R.string.throat_symptom_soreness),
+            context.getString(R.string.throat_symptom_cold),
+            context.getString(R.string.throat_symptom_itching),
+            context.getString(R.string.throat_symptom_hoarseness)
+        ),
+        required = true
+    )
+
+    private val neckSwelling = FormElement(
+        id = 2,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_neck_swelling),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val difficultySwallowing = FormElement(
+        id = 3,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_difficulty_swallowing),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val tonsillitis = FormElement(
+        id = 4,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_tonsillitis),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val pharyngitis = FormElement(
+        id = 5,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_pharyngitis),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val laryngitis = FormElement(
+        id = 6,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_laryngitis),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val sinusitis = FormElement(
+        id = 7,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_sinusitis),
+        entries = arrayOf(optionYes, optionNo),
+        required = false
+    )
+
+    private val cleftLip = FormElement(
+        id = 8,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_cleft_lip),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    private val cleftPalate = FormElement(
+        id = 9,
+        inputType = InputType.RADIO,
+        title = context.getString(R.string.throat_diagnosis_cleft_palate),
+        entries = arrayOf(optionYes, optionNo),
+        required = false,
+        hasAlertError = true
+    )
+
+    /* -------------------- PAGE SETUP -------------------- */
+
+    suspend fun setUpPage(savedRecord: ThroatDiagnosisAssessment?) {
+        cache = savedRecord ?: createDefaultCache()
+        populateFromCache(cache)
+
+        val list = mutableListOf<FormElement>()
+        list.add(symptoms)
+        list.addAll(
+            listOf(
+                neckSwelling,
+                difficultySwallowing,
+                tonsillitis,
+                pharyngitis,
+                laryngitis,
+                sinusitis,
+                cleftLip,
+                cleftPalate
+            )
+        )
+        setUpPage(list)
+    }
+
+    /* -------------------- VALUE CHANGE -------------------- */
+
+    override suspend fun handleListOnValueChanged(formId: Int, index: Int): Int {
+        return when (formId) {
+
+
+            neckSwelling.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(context.getString(R.string.throat_alert_neck_swelling))
+                }
+                neckSwelling.id
+            }
+
+            difficultySwallowing.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(context.getString(R.string.throat_alert_difficulty_swallowing))
+                }
+                difficultySwallowing.id
+            }
+
+            cleftLip.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(context.getString(R.string.throat_alert_cleft_lip))
+                }
+                cleftLip.id
+            }
+
+            cleftPalate.id -> {
+                if (index == 0) {
+                    onShowAlert?.invoke(context.getString(R.string.throat_alert_cleft_palate))
+                }
+                cleftPalate.id
+            }
+
+            symptoms.id -> symptoms.id
+
+            else -> -1
+        }
+    }
+
+    /* -------------------- MULTI-SELECT TRIGGER -------------------- */
+
+    var onTriggerMultiSelect: ((formId: Int, title: String, items: Array<String>, selectedItems: BooleanArray) -> Unit)? =
+        null
+
+    fun triggerMultiSelect(formId: Int) {
+        when (formId) {
+            symptoms.id -> {
+                val symptomList = symptoms.entries!!
+                val selectedSymptoms = symptoms.value
+                    ?.split(",")
+                    ?.map { it.trim() }
+                    ?.filter { it.isNotEmpty() }
+                    ?: emptyList()
+                val selectedItems = BooleanArray(symptomList.size) {
+                    selectedSymptoms.contains(symptomList[it])
+                }
+                onTriggerMultiSelect?.invoke(
+                    formId,
+                    symptoms.title!!,
+                    symptomList,
+                    selectedItems
+                )
+            }
+        }
+    }
+
+    suspend fun updateMultiSelectValue(formId: Int, selectedItems: List<String>) {
+        val valueString = if (selectedItems.isEmpty()) null else selectedItems.joinToString(", ")
+        when (formId) {
+            symptoms.id -> {
+                symptoms.value = valueString
+            }
+        }
+        updateList(formId, -1)
+    }
+
+    /* -------------------- CACHE -------------------- */
+
+    private fun createDefaultCache() =
+        ThroatDiagnosisAssessment(patientId = "", benVisitNo = null)
+
+    private fun populateFromCache(cache: ThroatDiagnosisAssessment) {
+        symptoms.value = cache.symptoms?.joinToString(", ")
+        neckSwelling.value = when (cache.neckSwelling) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        difficultySwallowing.value = when (cache.difficultySwallowing) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        tonsillitis.value = when (cache.tonsillitis) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        pharyngitis.value = when (cache.pharyngitis) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        laryngitis.value = when (cache.laryngitis) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        sinusitis.value = when (cache.sinusitis) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        cleftLip.value = when (cache.cleftLip) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+        cleftPalate.value = when (cache.cleftPalate) {
+            true -> optionYes
+            false -> optionNo
+            else -> null
+        }
+    }
+
+    override fun mapValues(cacheModel: FormDataModel, pageNumber: Int) {
+        (cacheModel as ThroatDiagnosisAssessment).apply {
+            symptoms =
+                this@ThroatDiagnosisDataset.symptoms.value?.split(", ")?.filter { it.isNotBlank() }
+            neckSwelling = when (this@ThroatDiagnosisDataset.neckSwelling.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            difficultySwallowing = when (this@ThroatDiagnosisDataset.difficultySwallowing.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            tonsillitis = when (this@ThroatDiagnosisDataset.tonsillitis.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            pharyngitis = when (this@ThroatDiagnosisDataset.pharyngitis.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            laryngitis = when (this@ThroatDiagnosisDataset.laryngitis.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            sinusitis = when (this@ThroatDiagnosisDataset.sinusitis.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            cleftLip = when (this@ThroatDiagnosisDataset.cleftLip.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+            cleftPalate = when (this@ThroatDiagnosisDataset.cleftPalate.value) {
+                optionYes -> true
+                optionNo -> false
+                else -> null
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/coroutines/CoroutinesModule.kt b/app/src/main/java/org/piramalswasthya/cho/coroutines/CoroutinesModule.kt
new file mode 100644
index 000000000..3c13cfead
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/coroutines/CoroutinesModule.kt
@@ -0,0 +1,17 @@
+package org.piramalswasthya.cho.coroutines
+
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@dagger.Module
+@InstallIn(SingletonComponent::class)
+object CoroutinesModule {
+
+    @Provides
+    @Singleton
+    fun provideDispatcherProvider(
+        defaultDispatcherProvider: DefaultDispatcherProvider
+    ): DispatcherProvider = defaultDispatcherProvider
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/coroutines/DispatcherProvider.kt b/app/src/main/java/org/piramalswasthya/cho/coroutines/DispatcherProvider.kt
new file mode 100644
index 000000000..9cc85970c
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/coroutines/DispatcherProvider.kt
@@ -0,0 +1,23 @@
+package org.piramalswasthya.cho.coroutines
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Inject
+
+interface DispatcherProvider {
+    val main: CoroutineDispatcher
+    val io: CoroutineDispatcher
+    val default: CoroutineDispatcher
+    val unconfined: CoroutineDispatcher
+}
+
+class DefaultDispatcherProvider @Inject constructor() : DispatcherProvider {
+    override val main: CoroutineDispatcher
+        get() = Dispatchers.Main
+    override val io: CoroutineDispatcher
+        get() = Dispatchers.IO
+    override val default: CoroutineDispatcher
+        get() = Dispatchers.Default
+    override val unconfined: CoroutineDispatcher
+        get() = Dispatchers.Unconfined
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/converters/MasterDataListConverter.kt b/app/src/main/java/org/piramalswasthya/cho/database/converters/MasterDataListConverter.kt
index 3fc595d19..673f29fc3 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/converters/MasterDataListConverter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/converters/MasterDataListConverter.kt
@@ -3,7 +3,7 @@ package org.piramalswasthya.cho.database.converters
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import org.piramalswasthya.cho.moddel.OccupationMaster
+import org.piramalswasthya.cho.model.OccupationMaster
 import org.piramalswasthya.cho.model.AgeUnit
 import org.piramalswasthya.cho.model.AlcoholDropdown
 import org.piramalswasthya.cho.model.AllergicReactionDropdown
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/InAppDb.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/InAppDb.kt
index 92b2a5697..59883a621 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/InAppDb.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/InAppDb.kt
@@ -29,16 +29,20 @@ import org.piramalswasthya.cho.database.room.dao.CaseRecordeDao
 import org.piramalswasthya.cho.database.room.dao.CbacDao
 import org.piramalswasthya.cho.database.room.dao.ChiefComplaintMasterDao
 import org.piramalswasthya.cho.database.room.dao.DeliveryOutcomeDao
+import org.piramalswasthya.cho.database.room.dao.NeonatalOutcomeDao
 import org.piramalswasthya.cho.database.room.dao.DistrictMasterDao
 import org.piramalswasthya.cho.database.room.dao.EcrDao
 import org.piramalswasthya.cho.database.room.dao.GovIdEntityMasterDao
 import org.piramalswasthya.cho.database.room.dao.HealthCenterDao
 import org.piramalswasthya.cho.database.room.dao.HistoryDao
 import org.piramalswasthya.cho.database.room.dao.ImmunizationDao
+import org.piramalswasthya.cho.database.room.dao.InfantRegDao
 import org.piramalswasthya.cho.database.room.dao.InvestigationDao
 import org.piramalswasthya.cho.database.room.dao.LanguageDao
 import org.piramalswasthya.cho.database.room.dao.LoginSettingsDataDao
+import org.piramalswasthya.cho.database.room.dao.AshaDueListDao
 import org.piramalswasthya.cho.database.room.dao.MaternalHealthDao
+import org.piramalswasthya.cho.database.room.dao.OphthalmicDao
 import org.piramalswasthya.cho.database.room.dao.OtherGovIdEntityMasterDao
 import org.piramalswasthya.cho.database.room.dao.OutreachDao
 import org.piramalswasthya.cho.database.room.dao.PatientDao
@@ -51,6 +55,7 @@ import org.piramalswasthya.cho.database.room.dao.ProcedureMasterDao
 import org.piramalswasthya.cho.database.room.dao.ReferRevisitDao
 import org.piramalswasthya.cho.database.room.dao.RegistrarMasterDataDao
 import org.piramalswasthya.cho.database.room.dao.StateMasterDao
+import org.piramalswasthya.cho.database.room.dao.StatusOfWomanDao
 import org.piramalswasthya.cho.database.room.dao.SubCatVisitDao
 import org.piramalswasthya.cho.database.room.dao.UserAuthDao
 import org.piramalswasthya.cho.database.room.dao.UserDao
@@ -58,8 +63,14 @@ import org.piramalswasthya.cho.database.room.dao.VaccinationTypeAndDoseDao
 import org.piramalswasthya.cho.database.room.dao.VillageMasterDao
 import org.piramalswasthya.cho.database.room.dao.VisitReasonsAndCategoriesDao
 import org.piramalswasthya.cho.database.room.dao.VitalsDao
-import org.piramalswasthya.cho.moddel.OccupationMaster
+import org.piramalswasthya.cho.model.OccupationMaster
+import org.piramalswasthya.cho.database.room.dao.EarDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.NoseDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.PainAndSymptomAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.OralHealthDao
+import org.piramalswasthya.cho.database.room.dao.PsychosocialCaregiverSupportDao
 import org.piramalswasthya.cho.model.AgeUnit
+import org.piramalswasthya.cho.model.AshaDueListCache
 import org.piramalswasthya.cho.model.AlcoholDropdown
 import org.piramalswasthya.cho.model.AllergicReactionDropdown
 import org.piramalswasthya.cho.model.AssociateAilmentsDropdown
@@ -85,7 +96,10 @@ import org.piramalswasthya.cho.model.DistrictMaster
 import org.piramalswasthya.cho.model.DoseType
 import org.piramalswasthya.cho.model.DrugFormMaster
 import org.piramalswasthya.cho.model.DrugFrequencyMaster
+import org.piramalswasthya.cho.model.EligibleCoupleRegCache
 import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
 import org.piramalswasthya.cho.model.FamilyMemberDiseaseTypeDropdown
 import org.piramalswasthya.cho.model.FamilyMemberDropdown
 import org.piramalswasthya.cho.model.GenderMaster
@@ -104,6 +118,7 @@ import org.piramalswasthya.cho.model.MasterLocation
 import org.piramalswasthya.cho.model.MedicationHistory
 import org.piramalswasthya.cho.model.OtherGovIdEntityMaster
 import org.piramalswasthya.cho.model.OutreachDropdownList
+import org.piramalswasthya.cho.model.OphthalmicVisit
 import org.piramalswasthya.cho.model.PNCVisitCache
 import org.piramalswasthya.cho.model.PastIllnessHistory
 import org.piramalswasthya.cho.model.PastSurgeryHistory
@@ -127,6 +142,7 @@ import org.piramalswasthya.cho.model.ReferRevisitModel
 import org.piramalswasthya.cho.model.RelationshipMaster
 import org.piramalswasthya.cho.model.ReligionMaster
 import org.piramalswasthya.cho.model.StateMaster
+import org.piramalswasthya.cho.model.StatusOfWomanMaster
 import org.piramalswasthya.cho.model.SubVisitCategory
 import org.piramalswasthya.cho.model.SurgeryDropdown
 import org.piramalswasthya.cho.model.TobaccoAlcoholHistory
@@ -140,6 +156,18 @@ import org.piramalswasthya.cho.model.VisitCategory
 import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.model.VisitReason
 import org.piramalswasthya.cho.model.fhir.SelectedOutreachProgram
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
+import org.piramalswasthya.cho.model.OralHealth
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+import org.piramalswasthya.cho.database.room.dao.MentalHealthScreeningDao
+import org.piramalswasthya.cho.database.room.dao.ThroatDiagnosisAssessmentDao
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
+import org.piramalswasthya.cho.database.room.dao.ElderlyHealthAssessmentDao
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
+
 
 @Database(
     entities = [
@@ -218,16 +246,29 @@ import org.piramalswasthya.cho.model.fhir.SelectedOutreachProgram
         Vaccine::class,
         ImmunizationCache::class,
         DeliveryOutcomeCache::class,
+        NeonatalOutcomeCache::class,
+        EligibleCoupleRegCache::class,
         EligibleCoupleTrackingCache::class,
+        InfantRegCache::class,
         PrescriptionTemplateDB::class,
         CbacCache::class,
         ProcedureMaster::class,
         ComponentDetailsMaster::class,
-        ComponentOptionsMaster::class
-
+        ComponentOptionsMaster::class,
+        AshaDueListCache::class,
+        StatusOfWomanMaster::class,
+        OphthalmicVisit::class,
+        EarDiagnosisAssessment::class,
+        NoseDiagnosisAssessment::class,
+        PainAndSymptomAssessment::class,
+        PsychosocialCaregiverSupport::class,
+        OralHealth::class,
+        MentalHealthScreeningCache::class,
+        ThroatDiagnosisAssessment::class,
+        ElderlyHealthAssessment::class
     ],
     views = [PrescriptionWithItemMasterAndDrugFormMaster::class],
-    version = 110, exportSchema = false
+    version = 148, exportSchema = false
 )
 
 
@@ -286,12 +327,28 @@ abstract class InAppDb : RoomDatabase() {
     abstract val procedureDao: ProcedureDao
     abstract val prescriptionTemplateDao:PrescriptionTemplateDao
     abstract val maternalHealthDao: MaternalHealthDao
+    abstract val ashaDueListDao: AshaDueListDao
     abstract val immunizationDao: ImmunizationDao
     abstract val deliveryOutcomeDao: DeliveryOutcomeDao
+    abstract val neonatalOutcomeDao: NeonatalOutcomeDao
     abstract val pncDao: PncDao
     abstract val ecrDao: EcrDao
+    abstract val infantRegDao: InfantRegDao
     abstract val cbacDao: CbacDao
     abstract val procedureMasterDao: ProcedureMasterDao
+    abstract val painAndSymptomAssessmentDao: PainAndSymptomAssessmentDao
+    abstract val psychosocialCaregiverSupportDao: PsychosocialCaregiverSupportDao
+
+
+    // This comment is for Github glitch
+    abstract val statusOfWomanDao: StatusOfWomanDao
+    abstract val ophthalmicDao: OphthalmicDao
+    abstract val earDiagnosisAssessmentDao: EarDiagnosisAssessmentDao
+    abstract val oralHealthDao: OralHealthDao
+    abstract val noseDiagnosisAssessmentDao: NoseDiagnosisAssessmentDao
+    abstract val mentalHealthScreeningDao: MentalHealthScreeningDao
+    abstract val throatDiagnosisAssessmentDao: ThroatDiagnosisAssessmentDao
+    abstract val elderlyHealthAssessmentDao: ElderlyHealthAssessmentDao
 
     companion object {
         @Volatile
@@ -320,6 +377,838 @@ abstract class InAppDb : RoomDatabase() {
                 database.execSQL("ALTER TABLE BenFlow ADD COLUMN externalInvestigation TEXT")
             }
         }
+
+        val MIGRATION_110_111 = object : Migration(110, 111) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Lab procedure master seed is now applied via ProcedureRepo.ensureLabProcedureMasterSeed() (DAO) when user opens lab technician
+            }
+        }
+
+        val MIGRATION_111_112 = object : Migration(111, 112) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Remove duplicate radio options (keep one Negative, one Positive per component)
+                database.execSQL(
+                    "DELETE FROM component_options_master WHERE id NOT IN (SELECT MIN(id) FROM component_options_master GROUP BY component_details_id, name)"
+                )
+            }
+        }
+
+        //        There was conflict i have fixed and inform to Abhilash and shiva to verify
+        val MIGRATION_112_113 = object : Migration(112, 113) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS ELIGIBLE_COUPLE_REG (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        patientID TEXT NOT NULL,
+                        dateOfReg INTEGER NOT NULL,
+                        lmpDate INTEGER,
+                        noOfChildren INTEGER NOT NULL,
+                        noOfLiveChildren INTEGER NOT NULL,
+                        noOfMaleChildren INTEGER NOT NULL,
+                        noOfFemaleChildren INTEGER NOT NULL,
+                        isRegistered INTEGER NOT NULL,
+                        processed TEXT,
+                        createdBy TEXT NOT NULL,
+                        createdDate INTEGER NOT NULL,
+                        updatedBy TEXT NOT NULL,
+                        updatedDate INTEGER NOT NULL,
+                        syncState INTEGER NOT NULL,
+                        FOREIGN KEY(patientID) REFERENCES PATIENT(patientID) ON UPDATE CASCADE ON DELETE CASCADE
+                    )
+                """.trimIndent())
+                database.execSQL("CREATE INDEX IF NOT EXISTS ecrInd ON ELIGIBLE_COUPLE_REG(patientID)")
+            }
+        }
+
+        val MIGRATION_113_114 = object : Migration(113, 114) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS INFANT_REG (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        childPatientID TEXT,
+                        motherPatientID TEXT NOT NULL,
+                        isActive INTEGER NOT NULL,
+                        babyName TEXT,
+                        babyIndex INTEGER NOT NULL,
+                        infantTerm TEXT,
+                        corticosteroidGiven TEXT,
+                        genderID INTEGER,
+                        babyCriedAtBirth INTEGER,
+                        resuscitation INTEGER,
+                        referred TEXT,
+                        hadBirthDefect TEXT,
+                        birthDefect TEXT,
+                        otherDefect TEXT,
+                        weight REAL,
+                        breastFeedingStarted INTEGER,
+                        opv0Dose INTEGER,
+                        bcgDose INTEGER,
+                        hepBDose INTEGER,
+                        vitkDose INTEGER,
+                        processed TEXT,
+                        createdBy TEXT NOT NULL,
+                        createdDate INTEGER NOT NULL,
+                        updatedBy TEXT NOT NULL,
+                        updatedDate INTEGER NOT NULL,
+                        syncState INTEGER NOT NULL,
+                        FOREIGN KEY(motherPatientID) REFERENCES PATIENT(patientID) ON UPDATE CASCADE ON DELETE CASCADE
+                    )
+                """.trimIndent())
+                database.execSQL("CREATE INDEX IF NOT EXISTS infRegInd ON INFANT_REG(motherPatientID)")
+            }
+        }
+
+        val MIGRATION_114_115 = object : Migration(114, 115) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Recreate component_details_master so FK references procedure_master(id) instead of procedure(id).
+                database.execSQL("PRAGMA foreign_keys=OFF")
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS component_details_master_new (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        test_component_id INTEGER NOT NULL,
+                        procedure_id INTEGER NOT NULL,
+                        range_normal_min INTEGER,
+                        range_normal_max INTEGER,
+                        range_min INTEGER,
+                        range_max INTEGER,
+                        isDecimal INTEGER,
+                        inputType TEXT NOT NULL,
+                        measurement_nit TEXT,
+                        test_component_name TEXT NOT NULL,
+                        test_component_desc TEXT NOT NULL,
+                        FOREIGN KEY(procedure_id) REFERENCES procedure_master(id) ON UPDATE NO ACTION ON DELETE CASCADE
+                    )
+                """.trimIndent())
+                database.execSQL("""
+                    INSERT INTO component_details_master_new (
+                        id, test_component_id, procedure_id, range_normal_min, range_normal_max,
+                        range_min, range_max, isDecimal, inputType, measurement_nit,
+                        test_component_name, test_component_desc
+                    ) SELECT
+                        id, test_component_id, procedure_id, range_normal_min, range_normal_max,
+                        range_min, range_max, isDecimal, inputType, measurement_nit,
+                        test_component_name, test_component_desc
+                    FROM component_details_master
+                """.trimIndent())
+                database.execSQL("DROP TABLE component_details_master")
+                database.execSQL("ALTER TABLE component_details_master_new RENAME TO component_details_master")
+                database.execSQL("PRAGMA foreign_keys=ON")
+            }
+        }
+
+        val MIGRATION_115_116 = object : Migration(115, 116) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add new columns to ELIGIBLE_COUPLE_TRACKING table
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN financialYear TEXT")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN visitMonth TEXT")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN lmpDate INTEGER")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN anyOtherMethod TEXT")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN antraDose TEXT")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN antraInjectionDate INTEGER")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN antraDueDate INTEGER")
+                database.execSQL("ALTER TABLE ELIGIBLE_COUPLE_TRACKING ADD COLUMN dateOfSterilization INTEGER")
+            }
+        }
+
+        val MIGRATION_116_117 = object : Migration(116, 117) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS ASHA_DUE_LIST (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        patientID TEXT NOT NULL,
+                        beneficiaryID INTEGER,
+                        listType TEXT NOT NULL DEFAULT 'ANC',
+                        addedDate INTEGER NOT NULL,
+                        ashaId INTEGER NOT NULL DEFAULT 0,
+                        createdBy TEXT NOT NULL,
+                        syncState INTEGER NOT NULL,
+                        FOREIGN KEY(patientID) REFERENCES PATIENT(patientID) ON UPDATE CASCADE ON DELETE CASCADE
+                    )
+                """.trimIndent())
+                database.execSQL("CREATE INDEX IF NOT EXISTS ind_asha_due ON ASHA_DUE_LIST(patientID, listType)")
+            }
+        }
+
+        val MIGRATION_117_118 = object : Migration(117, 118) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("DROP INDEX IF EXISTS ind_asha_due")
+                database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS ind_asha_due ON ASHA_DUE_LIST(patientID, listType)")
+            }
+        }
+
+        val MIGRATION_118_119 = object : Migration(118, 119) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN motherCondition TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN maternalComplications TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN motherCurrentlyAdmitted INTEGER")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN isDeath INTEGER")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN isDeathValue TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN dateOfDeath TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN placeOfDeath TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN placeOfDeathId INTEGER")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN otherPlaceOfDeath TEXT")
+            }
+        }
+
+        val MIGRATION_119_120 = object : Migration(119, 120) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add new columns to PATIENT table
+                database.execSQL("ALTER TABLE PATIENT ADD COLUMN statusOfWomanID INTEGER")
+
+                // Create STATUS_OF_WOMAN_MASTER table
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS STATUS_OF_WOMAN_MASTER (
+                        statusID INTEGER PRIMARY KEY NOT NULL,
+                        statusName TEXT NOT NULL,
+                        statusCode TEXT NOT NULL
+                    )
+                """)
+
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (1, 'Eligible Couple', 'EC')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (2, 'Pregnant Woman', 'PW')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (3, 'Postnatal', 'PN')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (4, 'Elderly', 'EL')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (5, 'Adolescent', 'AD')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (6, 'Permanent Sterilization', 'ST')")
+                database.execSQL("INSERT OR IGNORE INTO STATUS_OF_WOMAN_MASTER (statusID, statusName, statusCode) VALUES (7, 'Not Applicable', 'NA')")
+            }
+        }
+
+        val MIGRATION_120_121 = object : Migration(120, 121) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add missing ANC tracking fields from FLW app
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN lmpDate INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN visitDate INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN weekOfPregnancy INTEGER")
+
+                // Abortion extended fields
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN serialNo TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN methodOfTermination TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN methodOfTerminationId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN terminationDoneBy TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN terminationDoneById INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN isPaiucdId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN isYesOrNo INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN isPaiucd TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN dateSterilisation INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN remarks TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN abortionImg1 TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN abortionImg2 TEXT")
+
+                // Maternal death extended fields
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN placeOfDeath TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN placeOfDeathId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN otherPlaceOfDeath TEXT")
+
+                // MCP card image paths
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN frontFilePath TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN backFilePath TEXT")
+            }
+        }
+
+        val MIGRATION_121_122 = object : Migration(121, 122) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add JIRA validation requirement fields
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN bloodSugarFasting INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN urineSugar TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN urineSugarId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN fetalHeartRate REAL")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN calciumGiven INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN dangerSigns TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN dangerSignsId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN counsellingProvided INTEGER")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN counsellingTopics TEXT")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN counsellingTopicsId INTEGER DEFAULT 0")
+                database.execSQL("ALTER TABLE PREGNANCY_ANC ADD COLUMN nextAncVisitDate INTEGER")
+            }
+        }
+
+        val MIGRATION_122_123 = object : Migration(122, 123) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN gestationalAgeAtDelivery TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN deliveryConductedBy TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN modeOfDelivery TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN indicationForLSCS TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN indicationForLSCSOther TEXT")
+                database.execSQL("ALTER TABLE DELIVERY_OUTCOME ADD COLUMN privateHospitalName TEXT")
+            }
+        }
+
+        val MIGRATION_123_124 = object : Migration(123, 124) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    "ALTER TABLE PREGNANCY_REGISTER ADD COLUMN isFirstAncSubmitted INTEGER NOT NULL DEFAULT 0"
+                )
+                db.execSQL(
+                    "ALTER TABLE PREGNANCY_REGISTER ADD COLUMN historyOfAbortions INTEGER"
+                )
+                db.execSQL(
+                    "ALTER TABLE PREGNANCY_REGISTER ADD COLUMN previousLSCS INTEGER"
+                )
+            }
+        }
+
+
+        val MIGRATION_124_125 = object : Migration(124, 125) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // Create NEONATAL_OUTCOME table for tracking detailed newborn health information
+                db.execSQL("""
+                    CREATE TABLE IF NOT EXISTS NEONATAL_OUTCOME (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        deliveryOutcomeId INTEGER NOT NULL,
+                        neonateIndex INTEGER NOT NULL,
+                        neonateUniqueId TEXT,
+                        outcomeAtBirth TEXT,
+                        outcomeAtBirthId INTEGER,
+                        sex TEXT,
+                        sexId INTEGER,
+                        criedImmediately TEXT,
+                        criedImmediatelyId INTEGER,
+                        typeOfResuscitation TEXT,
+                        birthWeight INTEGER,
+                        congenitalAnomalyDetected TEXT,
+                        congenitalAnomalyDetectedId INTEGER,
+                        typeOfCongenitalAnomaly TEXT,
+                        otherCongenitalAnomaly TEXT,
+                        newbornComplications TEXT,
+                        currentStatusOfBaby TEXT,
+                        currentStatusOfBabyId INTEGER,
+                        causeOfDeath TEXT,
+                        otherCauseOfDeath TEXT,
+                        birthDoseVaccinesGiven TEXT,
+                        reasonForNoVaccines TEXT,
+                        vitaminKInjectionGiven INTEGER,
+                        reasonForNoVitaminK TEXT,
+                        birthCertificateIssued TEXT,
+                        birthCertificateIssuedId INTEGER,
+                        isStillbirth INTEGER,
+                        isNeonatalDeath INTEGER,
+                        processed TEXT,
+                        createdBy TEXT NOT NULL,
+                        createdDate INTEGER NOT NULL,
+                        updatedBy TEXT NOT NULL,
+                        updatedDate INTEGER NOT NULL,
+                        syncState INTEGER NOT NULL,
+                        FOREIGN KEY(deliveryOutcomeId) REFERENCES DELIVERY_OUTCOME(id) ON UPDATE CASCADE ON DELETE CASCADE
+                    )
+                """.trimIndent())
+                db.execSQL("CREATE INDEX IF NOT EXISTS neonatalOutcomeInd ON NEONATAL_OUTCOME(deliveryOutcomeId)")
+            }
+        }
+
+        val MIGRATION_125_126 = object : Migration(125, 126) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // Add BRD Neonatal Outcome fields to INFANT_REG table
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN outcomeAtBirth TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN typeOfResuscitation TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN newbornComplications TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN currentStatusOfBaby TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN causeOfDeath TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN otherCauseOfDeath TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN birthDoseVaccinesGiven TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN reasonForNoVaccines TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN vitaminKInjectionGiven INTEGER")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN reasonForNoVitaminK TEXT")
+                db.execSQL("ALTER TABLE INFANT_REG ADD COLUMN birthCertificateIssued TEXT")
+            }
+        }
+
+        val MIGRATION_126_127 = object : Migration(126, 127) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS `OPHTHALMIC_VISIT` (" +
+                            "`visitId` TEXT NOT NULL, " +
+                            "`patientID` TEXT NOT NULL, " +
+                            "`benVisitNo` INTEGER NOT NULL, " +
+                            "`isDiabetic` INTEGER, " +
+                            "`screeningPerformed` INTEGER, " +
+                            "`visualAcuityChartUsed` TEXT, " +
+                            "`distVARight` TEXT, " +
+                            "`distVALeft` TEXT, " +
+                            "`nearVA` TEXT, " +
+                            "`caseIdConditions` TEXT, " +
+                            "`cataractSymptoms` INTEGER, " +
+                            "`glaucomaSymptoms` INTEGER, " +
+                            "`diabeticRetinopathySymptoms` INTEGER, " +
+                            "`presbyopiaSymptoms` INTEGER, " +
+                            "`trachomaStatus` TEXT, " +
+                            "`cornealDiseaseType` TEXT, " +
+                            "`vitaminADeficiency` INTEGER, " +
+                            "`injuryType` TEXT, " +
+                            "`foreignBodyRemoval` TEXT, " +
+                            "`chemicalExposure` INTEGER, " +
+                            "`createdBy` TEXT NOT NULL, " +
+                            "`createdDate` INTEGER NOT NULL, " +
+                            "`updatedBy` TEXT NOT NULL, " +
+                            "`updatedDate` INTEGER NOT NULL, " +
+                            "`syncState` INTEGER NOT NULL, " +
+                            "PRIMARY KEY(`visitId`), " +
+                            "FOREIGN KEY(`patientID`) REFERENCES `PATIENT`(`patientID`) ON UPDATE NO ACTION ON DELETE CASCADE )"
+                )
+                db.execSQL("CREATE INDEX IF NOT EXISTS `index_ophthalmic_visit_patientID` ON `OPHTHALMIC_VISIT` (`patientID`)")
+            }
+        }
+        val MIGRATION_127_128 = object : Migration(127, 128) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS EAR_DIAGNOSIS_ASSESSMENT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                difficulty_hearing INTEGER,
+                whisper_test_response TEXT,
+                hearing_test_outcome TEXT,
+                ear_pain INTEGER,
+                ear_discharge_present INTEGER,
+                foreign_body_in_ear TEXT,
+                ear_condition_type TEXT,
+                congenital_ear_malformation INTEGER
+            )
+        """.trimIndent()
+                )
+            }
+        }
+        val MIGRATION_128_129 = object : Migration(128, 129) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS PAIN_SYMPTOM_ASSESSMENT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                pain_severity TEXT,
+                pain_duration TEXT,
+                symptoms_present INTEGER,
+                other_symptoms_severity TEXT,
+                immediate_relief_provided INTEGER
+            )
+            """.trimIndent()
+                )
+            }
+        }
+        val MIGRATION_129_130 = object : Migration(129, 130) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS PSYCHOSOCIAL_CAREGIVER_SUPPORT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                psychosocial_counselling_provided INTEGER,
+                caregiver_counselling_provided INTEGER,
+                caregiver_distress_identified INTEGER,
+                counselling_remarks TEXT
+            )
+            """.trimIndent()
+                )
+            }
+        }
+        val MIGRATION_130_131 = object : Migration(130, 131) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS ORAL_HEALTH (
+                oral_health_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                tooth_decay_present INTEGER,
+                tooth_decay_symptoms TEXT,
+                gum_disease_present INTEGER,
+                gum_disease_symptoms TEXT,
+                irregular_teeth_jaws INTEGER,
+                abnormal_growth_ulcer INTEGER,
+                cleft_lip_palate INTEGER,
+                dental_fluorosis INTEGER,
+                dental_emergency TEXT,
+                created_date INTEGER,
+                created_by TEXT
+            )
+            """.trimIndent()
+                )
+                database.execSQL(
+                    "CREATE INDEX IF NOT EXISTS index_oral_health_patient_id " +
+                            "ON ORAL_HEALTH(patient_id)"
+                )
+                database.execSQL(
+                    "CREATE INDEX IF NOT EXISTS index_oral_health_patient_visit " +
+                            "ON ORAL_HEALTH(patient_id, ben_visit_no)"
+                )
+            }
+        }
+
+        val MIGRATION_131_132 = object : Migration(131, 132) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN referral_required INTEGER")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN referral_level TEXT")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN reason_for_referral TEXT")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN follow_up_required INTEGER")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN follow_up_date TEXT")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN referral_required INTEGER")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN referral_level TEXT")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN reason_for_referral TEXT")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN follow_up_required INTEGER")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN follow_up_date TEXT")
+            }
+        }
+
+        val MIGRATION_132_133 = object : Migration(132, 133) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS NOSE_DIAGNOSIS_ASSESSMENT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                difficulty_breathing INTEGER,
+                open_mouth_breathing INTEGER
+            )
+            """.trimIndent()
+                )
+            }
+        }
+        val MIGRATION_133_134 = object : Migration(133, 134) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS MENTAL_HEALTH_SCREENING (
+                        screening_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                        patient_id TEXT NOT NULL,
+                        ben_visit_no INTEGER,
+                        emotional_behavioural_concerns INTEGER,
+                        substance_use_concerns INTEGER,
+                        self_harm_suicide_thoughts INTEGER,
+                        memory_loss_confusion INTEGER,
+                        seizures_fits_loc INTEGER,
+                        is_postpartum INTEGER,
+                        phq9_little_interest INTEGER,
+                        phq9_feeling_down INTEGER,
+                        phq9_sleep_trouble INTEGER,
+                        phq9_feeling_tired INTEGER,
+                        phq9_appetite INTEGER,
+                        phq9_feeling_bad INTEGER,
+                        phq9_concentration INTEGER,
+                        phq9_moving_slowly INTEGER,
+                        phq9_self_harm_thoughts INTEGER,
+                        phq9_total_score INTEGER,
+                        substance_alcohol_use INTEGER,
+                        substance_tobacco_use INTEGER,
+                        substance_other_use INTEGER,
+                        substance_other_specify TEXT,
+                        substance_frequency TEXT,
+                        brief_intervention_given INTEGER,
+                        suicide_current_thoughts INTEGER,
+                        suicide_plan INTEGER,
+                        suicide_previous_attempt INTEGER,
+                        suicide_hopelessness INTEGER,
+                        suicide_risk_level TEXT,
+                        dementia_progressive_memory_loss INTEGER,
+                        dementia_forgetting_recent INTEGER,
+                        dementia_disorientation INTEGER,
+                        dementia_daily_activities INTEGER,
+                        dementia_behavioural_changes INTEGER,
+                        epilepsy_recurrent_seizures INTEGER,
+                        epilepsy_jerky_movements INTEGER,
+                        epilepsy_tongue_bite INTEGER,
+                        epilepsy_confusion_after INTEGER,
+                        epilepsy_loc_duration TEXT,
+                        referral_required INTEGER,
+                        referral_level TEXT,
+                        reason_for_referral TEXT,
+                        follow_up_required INTEGER,
+                        follow_up_date TEXT,
+                        phq9_depression_severity TEXT,
+                        phq9_system_action TEXT,
+                        substance_current_tobacco_use INTEGER,
+                        substance_tobacco_type TEXT,
+                        substance_tobacco_frequency TEXT,
+                        substance_tobacco_outcome TEXT,
+                        substance_system_action TEXT
+                    )
+                """.trimIndent())
+                database.execSQL(
+                    "CREATE INDEX IF NOT EXISTS index_mhs_patient_id ON MENTAL_HEALTH_SCREENING(patient_id)"
+                )
+                database.execSQL(
+                    "CREATE INDEX IF NOT EXISTS index_mhs_patient_visit ON MENTAL_HEALTH_SCREENING(patient_id, ben_visit_no)"
+                )
+            }
+        }
+        val MIGRATION_134_135 = object : Migration(134, 135) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS THROAT_DIAGNOSIS_ASSESSMENT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER,
+                symptoms TEXT,
+                neck_swelling INTEGER,
+                difficulty_swallowing INTEGER,
+                tonsillitis INTEGER,
+                pharyngitis INTEGER,
+                laryngitis INTEGER,
+                sinusitis INTEGER,
+                cleft_lip INTEGER,
+                cleft_palate INTEGER
+            )
+            """.trimIndent()
+                )
+            }
+        }
+
+        val MIGRATION_135_136 = object : Migration(135, 136) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add missing columns to NOSE_DIAGNOSIS_ASSESSMENT
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "nose_bleed", "INTEGER")
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "systolic_bp", "INTEGER")
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "diastolic_bp", "INTEGER")
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "foreign_body_nose", "TEXT")
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "sinusitis", "INTEGER")
+
+                // Add missing column to MENTAL_HEALTH_SCREENING
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "suicide_immediate_assess", "INTEGER")
+            }
+        }
+
+        val MIGRATION_136_137 = object : Migration(136, 137) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS ELDERLY_HEALTH_ASSESSMENT (
+                assessment_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                patient_id TEXT NOT NULL,
+                ben_visit_no INTEGER NOT NULL,
+                geriatric_complaints INTEGER,
+                multiple_chronic_conditions INTEGER,
+                recent_falls INTEGER,
+                difficulty_walking_balance INTEGER,
+                visual_hearing_difficulty INTEGER,
+                functional_decline INTEGER,
+                memory_loss INTEGER,
+                dementia_memory_loss INTEGER,
+                dementia_disorientation INTEGER,
+                dementia_behavioural_changes INTEGER,
+                dementia_self_care_decline INTEGER,
+                dementia_screening_outcome TEXT,
+                dementia_referral_required INTEGER
+            )
+            """.trimIndent()
+                )
+                database.execSQL(
+                    "CREATE UNIQUE INDEX IF NOT EXISTS index_elderly_health_assessment_patient_visit " +
+                            "ON ELDERLY_HEALTH_ASSESSMENT(patient_id, ben_visit_no)"
+                )
+            }
+        }
+
+        val MIGRATION_137_138 = object : Migration(137, 138) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_impact INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_withdrawal INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_problematic INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_classification TEXT"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_system_action TEXT"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_frequency TEXT"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN substance_alcohol_loss INTEGER"
+                )
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN edRecurrentEpisodeloss INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_recurrent_jerky_movements INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_progressive_memory_loss INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_confusion_disorientation INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_functional_decline INTEGER"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_screening_outcome TEXT"
+                )
+
+                database.execSQL(
+                    "ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_referral_required TEXT"
+                )
+                database.execSQL("ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_psychosocial_intervention_provided INTEGER")
+                database.execSQL("ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_intervention_type TEXT")
+                database.execSQL("ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_session_date TEXT")
+                database.execSQL("ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_duration_minutes INTEGER")
+                database.execSQL("ALTER TABLE MENTAL_HEALTH_SCREENING ADD COLUMN ed_remarks TEXT")
+            }
+        }
+        val MIGRATION_138_139 = object : Migration(138, 139) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                safeAddColumn(database, "BENFLOW", "reproductiveStatusId", "INTEGER")
+                safeAddColumn(database, "BENFLOW", "reproductiveStatus", "TEXT")
+            }
+        }
+        val MIGRATION_139_140 = object : Migration(139, 140) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "improvement_noted", "TEXT")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "referral_escalation_required", "INTEGER")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "case_closure_reason", "TEXT")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "referral_date", "TEXT")
+            }
+        }
+        val MIGRATION_140_141 = object : Migration(140, 141) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // ELDERLY_HEALTH_ASSESSMENT
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "referral_required", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "referral_level", "TEXT")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "reason_for_referral", "TEXT")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "follow_up_required", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "follow_up_date", "TEXT")
+                database.execSQL("ALTER TABLE ELDERLY_HEALTH_ASSESSMENT ADD COLUMN case_status TEXT")
+                database.execSQL("ALTER TABLE ELDERLY_HEALTH_ASSESSMENT ADD COLUMN date_of_death TEXT")
+                database.execSQL("ALTER TABLE ELDERLY_HEALTH_ASSESSMENT ADD COLUMN remarks TEXT")
+
+                // PAIN_SYMPTOM_ASSESSMENT
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN case_status TEXT")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN date_of_death TEXT")
+                database.execSQL("ALTER TABLE PAIN_SYMPTOM_ASSESSMENT ADD COLUMN remarks TEXT")
+
+                // PSYCHOSOCIAL_CAREGIVER_SUPPORT
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN case_status TEXT")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN date_of_death TEXT")
+                database.execSQL("ALTER TABLE PSYCHOSOCIAL_CAREGIVER_SUPPORT ADD COLUMN remarks TEXT")
+            }
+        }
+        val MIGRATION_141_142 = object : Migration(141, 142) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add palliative care identification columns to PAIN_SYMPTOM_ASSESSMENT
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "persistent_pain_present", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "pain_assessment_enabled", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "distressing_symptoms_present", "TEXT")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "bedridden_or_severely_dependent", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "life_limiting_illness_known", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "caregiver_support_required", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "palliative_care_eligible", "INTEGER")
+            }
+        }
+
+        val MIGRATION_142_143 = object : Migration(142, 143) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Add ADL assessment columns to ELDERLY_HEALTH_ASSESSMENT
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "bathing", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "dressing", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "toileting", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "transferring", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "continence", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "feeding", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "total_score", "INTEGER")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "functional_status", "TEXT")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "functional_decline_flag", "INTEGER")
+            }
+        }
+        val MIGRATION_143_144 = object : Migration(143, 144) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "ed_reason", "TEXT")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "ed_confusion_ordrowsiness", "INTEGER")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "adherence_to_advice", "TEXT")
+            }
+        }
+
+        val MIGRATION_144_145 = object : Migration(144, 145) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "basic_symptoms_selected", "TEXT")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "basic_symptom_relief_provided", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "basic_psychosocial_support_provided", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "basic_caregiver_counselling_provided", "INTEGER")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "basic_management_remarks", "TEXT")
+            }
+        }
+        val MIGRATION_145_146 = object : Migration(145, 146) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                safeAddColumn(database, "EAR_DIAGNOSIS_ASSESSMENT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "NOSE_DIAGNOSIS_ASSESSMENT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "THROAT_DIAGNOSIS_ASSESSMENT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "ORAL_HEALTH", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "ELDERLY_HEALTH_ASSESSMENT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "MENTAL_HEALTH_SCREENING", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "PAIN_SYMPTOM_ASSESSMENT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+                safeAddColumn(database, "PSYCHOSOCIAL_CAREGIVER_SUPPORT", "syncState", "INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+
+        // Scrub abortionImg1/2 values that the new save path can't handle:
+        //   1. Inline base64 (LENGTH > 1024) — pre-fix bloat that overflows
+        //      SQLite's 2 MB CursorWindow.
+        //   2. Raw gallery `content://` URIs — these carry only transient
+        //      permission from the picker activity; once that dies the URI
+        //      can never be reloaded by Glide / contentResolver and the
+        //      "view" path throws SecurityException.
+        // Going forward, abortionImg1/2 hold an internal-storage file path;
+        // base64 encoding happens lazily at upload time. Affected records
+        // never successfully uploaded, so no server-side state is lost.
+        val MIGRATION_146_147 = object : Migration(146, 147) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("UPDATE PREGNANCY_ANC SET abortionImg1 = NULL WHERE LENGTH(abortionImg1) > 1024")
+                database.execSQL("UPDATE PREGNANCY_ANC SET abortionImg2 = NULL WHERE LENGTH(abortionImg2) > 1024")
+                database.execSQL("UPDATE PREGNANCY_ANC SET abortionImg1 = NULL WHERE abortionImg1 LIKE 'content://%'")
+                database.execSQL("UPDATE PREGNANCY_ANC SET abortionImg2 = NULL WHERE abortionImg2 LIKE 'content://%'")
+            }
+        }
+
+        val MIGRATION_147_148 = object : Migration(147, 148) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // HWC API now sends/uses facilityID for benflow-linked operations.
+                safeAddColumn(database, "BENFLOW", "facilityID", "INTEGER")
+                safeAddColumn(database, "USER", "facilityID", "INTEGER")
+                safeAddColumn(database, "USER", "facilityType", "TEXT")
+                safeAddColumn(database, "USER", "facilityName", "TEXT")
+                safeAddColumn(database, "USER", "employeeId", "TEXT")
+                safeAddColumn(database, "USER", "locationType", "TEXT")
+            }
+        }
+
+        /**
+         * Safely adds a column to a table, ignoring the error if the column already exists.
+         * This handles cases where an older version of a CREATE TABLE migration already
+         * included the column.
+         */
+        private fun safeAddColumn(
+            database: SupportSQLiteDatabase,
+            table: String,
+            column: String,
+            type: String
+        ) {
+            try {
+                database.execSQL("ALTER TABLE $table ADD COLUMN $column $type")
+            } catch (_: Exception) {
+                // Column already exists — safe to ignore
+            }
+        }
+
+
         fun getInstance(appContext: Context): InAppDb {
 
             synchronized(this) {
@@ -334,7 +1223,46 @@ abstract class InAppDb : RoomDatabase() {
                         .addMigrations(
                             MIGRATION_106_107,
                             MIGRATION_107_108,
-                            MIGRATION_108_109,MIGRATION_109_110
+                            MIGRATION_108_109,
+                            MIGRATION_109_110,
+                            MIGRATION_110_111,
+                            MIGRATION_111_112,
+                            MIGRATION_112_113,
+                            MIGRATION_113_114,
+                            MIGRATION_114_115,
+                            MIGRATION_115_116,
+                            MIGRATION_116_117,
+                            MIGRATION_117_118,
+                            MIGRATION_118_119,
+                            MIGRATION_119_120,
+                            MIGRATION_120_121,
+                            MIGRATION_121_122,
+                            MIGRATION_122_123,
+                            MIGRATION_123_124,
+                            MIGRATION_124_125,
+                            MIGRATION_125_126,
+                            MIGRATION_126_127,
+                            MIGRATION_127_128,
+                            MIGRATION_128_129,
+                            MIGRATION_129_130,
+                            MIGRATION_130_131,
+                            MIGRATION_131_132,
+                            MIGRATION_132_133,
+                            MIGRATION_133_134,
+                            MIGRATION_134_135,
+                            MIGRATION_135_136,
+                            MIGRATION_136_137,
+                            MIGRATION_137_138,
+                            MIGRATION_138_139,
+                            MIGRATION_139_140,
+                            MIGRATION_140_141,
+                            MIGRATION_141_142,
+                            MIGRATION_142_143,
+                            MIGRATION_143_144,
+                            MIGRATION_144_145,
+                            MIGRATION_145_146,
+                            MIGRATION_146_147,
+                            MIGRATION_147_148
                         )
                         .fallbackToDestructiveMigration()
                         .setQueryCallback(
@@ -354,4 +1282,4 @@ abstract class InAppDb : RoomDatabase() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/LabProcedureMasterSeed.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/LabProcedureMasterSeed.kt
new file mode 100644
index 000000000..8df4dcd56
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/LabProcedureMasterSeed.kt
@@ -0,0 +1,14 @@
+package org.piramalswasthya.cho.database.room
+
+/**
+ * Constants for [org.piramalswasthya.cho.repositories.ProcedureRepo.ensureLabProcedureMasterSeed].
+ * Procedure rows are taken from [org.piramalswasthya.cho.model.ProceduresMasterData] (Laboratory);
+ * component rows are built from [org.piramalswasthya.cho.network.AmritApiService.getProcedureFields].
+ */
+object LabProcedureMasterSeed {
+
+    const val PRESCRIPTION_ID = 2802381L
+
+    /** Default radio options when the API does not return option lists (RadioButton). */
+    val radioButtonDefaultOptions = listOf("Negative", "Positive")
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/SyncModuleIds.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/SyncModuleIds.kt
new file mode 100644
index 000000000..ab9bc1f83
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/SyncModuleIds.kt
@@ -0,0 +1,8 @@
+package org.piramalswasthya.cho.database.room
+
+object SyncModuleIds {
+    const val DELIVERY_OUTCOME = 9
+    const val PNC = 10
+    const val INFANT_REG = 11
+    const val CHILD_REG = 12
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/SyncStateValue.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/SyncStateValue.kt
new file mode 100644
index 000000000..1533a2f36
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/SyncStateValue.kt
@@ -0,0 +1,11 @@
+package org.piramalswasthya.cho.database.room
+
+/**
+ * Integer values for tables that persist sync state as Int columns.
+ * Keep these aligned with SyncState enum ordinal positions.
+ */
+object SyncStateValue {
+    const val UNSYNCED = 0
+    const val SYNCING = 1
+    const val SYNCED = 2
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/AshaDueListDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/AshaDueListDao.kt
new file mode 100644
index 000000000..a892938ff
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/AshaDueListDao.kt
@@ -0,0 +1,12 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import org.piramalswasthya.cho.model.AshaDueListCache
+
+@Dao
+fun interface AshaDueListDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(record: AshaDueListCache): Long
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/BenFlowDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/BenFlowDao.kt
index 26de21f39..04c072ffb 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/BenFlowDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/BenFlowDao.kt
@@ -6,6 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
+import kotlinx.coroutines.flow.Flow
 import org.piramalswasthya.cho.model.BenFlow
 import org.piramalswasthya.cho.model.BlockMaster
 
@@ -14,8 +15,37 @@ interface BenFlowDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertBenFlow(benFlow: BenFlow)
-    @Query("SELECT COUNT(*) FROM Visit_DB INNER JOIN PATIENT ON PATIENT.patientID = Visit_DB.patientID WHERE PATIENT.genderID = :genderID AND (Visit_DB.category LIKE 'General OPD') AND createdBy = :createdBy AND Visit_DB.benVisitDate LIKE '%' || :periodParam || '%' ")
-    suspend fun getOpdCount(genderID: Int, periodParam: String, createdBy: String) : Int?
+    @Query(
+        "SELECT COUNT(*) " +
+                "FROM PATIENT pat " +
+                "LEFT JOIN PATIENT_VISIT_INFO_SYNC vis ON pat.patientID = vis.patientID " +
+                "LEFT JOIN PATIENT_VISIT_INFO_SYNC AS latestVisit ON pat.patientID = latestVisit.patientID AND vis.benVisitNo < latestVisit.benVisitNo " +
+                "LEFT JOIN GENDER_MASTER gen ON gen.genderID = pat.genderID " +
+                "WHERE ( " +
+                "(:genderBucket = 'male' AND LOWER(IFNULL(gen.gender_name, '')) = 'male') " +
+                "OR (:genderBucket = 'female' AND LOWER(IFNULL(gen.gender_name, '')) = 'female') " +
+                "OR (:genderBucket = 'other' AND TRIM(IFNULL(gen.gender_name, '')) <> '' AND LOWER(IFNULL(gen.gender_name, '')) NOT IN ('male', 'female')) " +
+                ") " +
+                "AND vis.nurseFlag = 9 " +
+                "AND latestVisit.patientID IS NULL " +
+                "AND NOT (vis.doctorFlag = 9 AND IFNULL(vis.pharmacist_flag, 0) IN (0, 9)) " +
+                "AND vis.patientID IS NOT NULL " +
+                "AND COALESCE(vis.visitDate, pat.registrationDate) IS NOT NULL " +
+                "AND strftime('%Y-%m-%d', COALESCE(vis.visitDate, pat.registrationDate) / 1000, 'unixepoch', 'localtime') LIKE '%' || :periodParam || '%'"
+    )
+    suspend fun getDoctorModuleOpdCount(genderBucket: String, periodParam: String) : Int?
+
+    @Query(
+        "SELECT COUNT(*) " +
+                "FROM PATIENT pat " +
+                "LEFT JOIN PATIENT_VISIT_INFO_SYNC vis ON pat.patientID = vis.patientID " +
+                "LEFT JOIN PATIENT_VISIT_INFO_SYNC AS latestVisit ON pat.patientID = latestVisit.patientID AND vis.benVisitNo < latestVisit.benVisitNo " +
+                "WHERE vis.nurseFlag = 9 " +
+                "AND latestVisit.patientID IS NULL " +
+                "AND NOT (vis.doctorFlag = 9 AND IFNULL(vis.pharmacist_flag, 0) IN (0, 9)) " +
+                "AND vis.patientID IS NOT NULL"
+    )
+    fun observeDoctorModuleListCount(): Flow<Int>
 
     @Query("SELECT COUNT(*) FROM Visit_DB WHERE (Visit_DB.category LIKE 'ANC') AND createdBy = :createdBy AND Visit_DB.benVisitDate LIKE '%' || :periodParam || '%' ")
     suspend fun getAncCount(periodParam: String, createdBy: String) : Int?
@@ -23,6 +53,52 @@ interface BenFlowDao {
     @Query("SELECT COUNT(*) FROM Visit_DB WHERE (Visit_DB.category LIKE 'PNC') AND createdBy = :createdBy AND Visit_DB.benVisitDate LIKE '%' || :periodParam || '%' ")
     suspend fun getPncCount(periodParam: String, createdBy: String) : Int?
 
+    @Query(
+        "SELECT COUNT(*) FROM Visit_DB " +
+                "WHERE LOWER(TRIM(IFNULL(Visit_DB.category, ''))) LIKE '%ncd screening%' " +
+                "AND LOWER(TRIM(IFNULL(createdBy, ''))) = LOWER(TRIM(:createdBy)) " +
+                "AND IFNULL(Visit_DB.benVisitDate, '') LIKE '%' || :periodParam || '%'"
+    )
+    suspend fun getNcdCount(periodParam: String, createdBy: String) : Int?
+
+    @Query(
+        "SELECT COUNT(*) " +
+                "FROM Visit_DB " +
+                "INNER JOIN PATIENT pat ON pat.patientID = Visit_DB.patientID " +
+                "LEFT JOIN GENDER_MASTER gen ON gen.genderID = pat.genderID " +
+                "WHERE LOWER(TRIM(IFNULL(Visit_DB.category, ''))) LIKE '%ncd screening%' " +
+                "AND LOWER(TRIM(IFNULL(Visit_DB.createdBy, ''))) = LOWER(TRIM(:createdBy)) " +
+                "AND IFNULL(Visit_DB.benVisitDate, '') LIKE '%' || :periodParam || '%' " +
+                "AND ( " +
+                "(:genderBucket = 'male' AND LOWER(IFNULL(gen.gender_name, '')) = 'male') " +
+                "OR (:genderBucket = 'female' AND LOWER(IFNULL(gen.gender_name, '')) = 'female') " +
+                "OR (:genderBucket = 'other' AND TRIM(IFNULL(gen.gender_name, '')) <> '' AND LOWER(IFNULL(gen.gender_name, '')) NOT IN ('male', 'female')) " +
+                ")"
+    )
+    suspend fun getNcdCountByGender(
+        genderBucket: String,
+        periodParam: String,
+        createdBy: String
+    ) : Int?
+
+    @Query(
+        "SELECT COUNT(*) " +
+                "FROM Visit_DB " +
+                "INNER JOIN PATIENT pat ON pat.patientID = Visit_DB.patientID " +
+                "LEFT JOIN GENDER_MASTER gen ON gen.genderID = pat.genderID " +
+                "WHERE LOWER(TRIM(IFNULL(Visit_DB.category, ''))) LIKE '%ncd screening%' " +
+                "AND LOWER(TRIM(IFNULL(Visit_DB.createdBy, ''))) = LOWER(TRIM(:createdBy)) " +
+                "AND ( " +
+                "(:genderBucket = 'male' AND LOWER(IFNULL(gen.gender_name, '')) = 'male') " +
+                "OR (:genderBucket = 'female' AND LOWER(IFNULL(gen.gender_name, '')) = 'female') " +
+                "OR (:genderBucket = 'other' AND TRIM(IFNULL(gen.gender_name, '')) <> '' AND LOWER(IFNULL(gen.gender_name, '')) NOT IN ('male', 'female')) " +
+                ")"
+    )
+    suspend fun getNcdCountAllTimeByGender(
+        genderBucket: String,
+        createdBy: String
+    ) : Int?
+
     @Query("SELECT COUNT(*) FROM Visit_DB WHERE (Visit_DB.category LIKE 'Neonatal and Infant Health Care Services') AND createdBy = :createdBy AND Visit_DB.benVisitDate LIKE '%' || :periodParam || '%' ")
     suspend fun getImmunizationCount(periodParam: String, createdBy: String) : Int?
 
@@ -59,4 +135,7 @@ interface BenFlowDao {
     @Query("UPDATE BENFLOW SET nurseFlag = 9, doctorFlag = 9 WHERE benFlowID = :benFlowID")
     suspend fun updateDoctorCompletedWithoutTest(benFlowID: Long)
 
+    @Query("UPDATE BENFLOW SET facilityID = :facilityID WHERE facilityID IS NULL")
+    suspend fun backfillNullFacilityID(facilityID: Int): Int
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/DeliveryOutcomeDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/DeliveryOutcomeDao.kt
index f6122501e..6c0f25e34 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/DeliveryOutcomeDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/DeliveryOutcomeDao.kt
@@ -7,7 +7,11 @@ import androidx.room.MapInfo
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncModuleIds
+import org.piramalswasthya.cho.database.room.SyncStateValue
 import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.SyncStatusCache
 
 @Dao
 interface DeliveryOutcomeDao {
@@ -25,9 +29,27 @@ interface DeliveryOutcomeDao {
     suspend fun getAllUnprocessedDeliveryOutcomes(): List<DeliveryOutcomeCache>
 
     @Update
-    suspend fun updateDeliveryOutcome(it: DeliveryOutcomeCache)
+    suspend fun updateDeliveryOutcome(it: DeliveryOutcomeCache): Int
+
+    @Query(
+        """
+        SELECT
+            ${SyncModuleIds.DELIVERY_OUTCOME} AS id,
+            'Delivery Outcome' AS name,
+            COUNT(CASE WHEN do.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN do.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN do.syncState = :syncingState THEN 1 END) AS syncing
+        FROM DELIVERY_OUTCOME do
+        WHERE do.isActive = 1
+        """
+    )
+    fun getDeliveryOutcomeSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
 
 //    @MapInfo(keyColumn = "benId", valueColumn ="dateOfDelivery")
 //    @Query("select * from delivery_outcome where isActive = 1")
 //    suspend fun getAllBenIdAndDeliverDate(): Map<Long, Long>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EarDiagnosisAssessmentDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EarDiagnosisAssessmentDao.kt
new file mode 100644
index 000000000..496b64005
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EarDiagnosisAssessmentDao.kt
@@ -0,0 +1,48 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+
+@Dao
+interface EarDiagnosisAssessmentDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: EarDiagnosisAssessment): Long
+
+    @Update
+    suspend fun update(assessment: EarDiagnosisAssessment)
+
+    @Query("SELECT * FROM EAR_DIAGNOSIS_ASSESSMENT WHERE assessment_id = :id")
+    suspend fun getAssessmentById(id: Long): EarDiagnosisAssessment?
+
+    @Query(
+        "SELECT * FROM EAR_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientId(patientID: String): EarDiagnosisAssessment?
+
+
+    @Query(
+        "SELECT * FROM EAR_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "AND ben_visit_no = :benVisitNo " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientIdAndVisitNo(patientID: String, benVisitNo: Int): EarDiagnosisAssessment?
+    @Query("SELECT * FROM EAR_DIAGNOSIS_ASSESSMENT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<EarDiagnosisAssessment>
+
+    @Query(
+        "DELETE FROM EAR_DIAGNOSIS_ASSESSMENT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EcrDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EcrDao.kt
index 655c8358b..38fffdbee 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EcrDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/EcrDao.kt
@@ -1,43 +1,114 @@
 package org.piramalswasthya.cho.database.room.dao
 
 import androidx.room.*
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.EligibleCoupleRegCache
 import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithECRCache
+import org.piramalswasthya.cho.model.SyncStatusCache
 
 @Dao
 interface EcrDao {
 
-//    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//    suspend fun upsert(vararg ecrCache: EligibleCoupleRegCache)
-//
-//    @Query("SELECT * FROM ELIGIBLE_COUPLE_REG WHERE processed in ('N', 'U')")
-//    suspend fun getAllUnprocessedECR(): List<EligibleCoupleRegCache>
-//
+    // ===== Eligible Couple Registration Queries =====
+    
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun upsert(vararg ecrCache: EligibleCoupleRegCache)
+
+    @Query("SELECT * FROM ELIGIBLE_COUPLE_REG WHERE processed in ('N', 'U')")
+    suspend fun getAllUnprocessedECR(): List<EligibleCoupleRegCache>
+
+    @Query("select count(*) from ELIGIBLE_COUPLE_REG")
+    suspend fun ecrCount(): Int
+
+    @Query("SELECT * FROM ELIGIBLE_COUPLE_REG WHERE patientID = :patientId limit 1")
+    suspend fun getSavedECR(patientId: String): EligibleCoupleRegCache?
+
+    @Update
+    suspend fun update(it: EligibleCoupleRegCache)
+
+    @Transaction
+    @Query("SELECT * FROM PATIENT")
+    fun getAllPatientsWithECR(): Flow<List<PatientWithECRCache>>
+
+    @Transaction
+    @Query("SELECT * FROM PATIENT WHERE patientID = :patientId")
+    suspend fun getPatientWithECR(patientId: String): PatientWithECRCache?
+
+    // ===== Eligible Couple Tracking Queries =====
+    
     @Query("SELECT * FROM ELIGIBLE_COUPLE_TRACKING WHERE processed in ('N','U')")
     suspend fun getAllUnprocessedECT(): List<EligibleCoupleTrackingCache>
 
     @Query("SELECT * FROM ELIGIBLE_COUPLE_TRACKING WHERE patientID = :benId")
     suspend fun getAllECT(benId: String): List<EligibleCoupleTrackingCache>
-
-//
-//    @Query("select count(*) from ELIGIBLE_COUPLE_REG")
-//    suspend fun ecrCount(): Int
-//
-//    @Query("SELECT * FROM ELIGIBLE_COUPLE_REG WHERE benId =:benId limit 1")
-//    suspend fun getSavedECR(benId: Long): EligibleCoupleRegCache?
-//
-//    @Update
-//    suspend fun update(it: EligibleCoupleRegCache)
-//
     @Update
     suspend fun updateEligibleCoupleTracking(it: EligibleCoupleTrackingCache)
 
     @Query("select * from eligible_couple_tracking where patientID = :patientID and visitDate =:visitDate limit 1")
 //    @Query("select * from eligible_couple_tracking where benId = :benId and CAST((strftime('%s','now') - visitDate/1000)/60/60/24 AS INTEGER) < 30 order by visitDate limit 1")
-    fun getEct(patientID: String, visitDate : Long): EligibleCoupleTrackingCache?
+    suspend fun getEct(patientID: String, visitDate : Long): EligibleCoupleTrackingCache?
+
+    @Query(
+        """
+        SELECT * FROM eligible_couple_tracking
+        WHERE patientID = :patientID
+        AND date(visitDate / 1000, 'unixepoch', 'localtime') = date(:visitDate / 1000, 'unixepoch', 'localtime')
+        LIMIT 1
+        """
+    )
+    suspend fun getEctByVisitDay(patientID: String, visitDate: Long): EligibleCoupleTrackingCache?
 
-    @Query("select * from eligible_couple_tracking where patientID = :patientID order by visitDate desc limit 1")
+    @Query("select * from eligible_couple_tracking where patientID = :patientID and isActive = 1 order by visitDate desc limit 1")
     suspend fun getLatestEct(patientID: String) : EligibleCoupleTrackingCache?
 
+    @Query("""
+        SELECT p.* FROM PATIENT p
+        LEFT JOIN (
+            SELECT patientID, MAX(visitDate) AS lastVisitDate
+            FROM ELIGIBLE_COUPLE_TRACKING
+            WHERE isActive = 1
+            GROUP BY patientID
+        ) ect ON ect.patientID = p.patientID
+        WHERE p.statusOfWomanID = 1
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY COALESCE(ect.lastVisitDate, 0) DESC, p.registrationDate DESC
+    """)
+    fun getPatientsForTrackingList(): Flow<List<Patient>>
+
+    @Query("""
+        SELECT COUNT(*) FROM PATIENT
+        WHERE statusOfWomanID = 1
+        AND genderID = 2
+        AND age BETWEEN 15 AND 49
+    """)
+    fun getEligibleCoupleTrackingCount(): Flow<Int>
+
+    @Transaction
+    @Query(
+        """
+        SELECT
+            6 AS id,
+            'EC Tracking' AS name,
+            COUNT(CASE WHEN ect.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN ect.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN ect.syncState = :syncingState THEN 1 END) AS syncing
+        FROM ELIGIBLE_COUPLE_TRACKING ect
+        INNER JOIN PATIENT p ON p.patientID = ect.patientID
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+          AND p.statusOfWomanID = 1
+        """
+    )
+    fun getEligibleCoupleTrackingSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun upsert(vararg eligibleCoupleTrackingCache: EligibleCoupleTrackingCache)
 
@@ -45,4 +116,4 @@ interface EcrDao {
 //    suspend fun ectWithsameCreateDateExists(createdDate: Long): Boolean
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ElderlyHealthAssessmentDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ElderlyHealthAssessmentDao.kt
new file mode 100644
index 000000000..55c80311b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ElderlyHealthAssessmentDao.kt
@@ -0,0 +1,38 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
+
+@Dao
+interface ElderlyHealthAssessmentDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: ElderlyHealthAssessment)
+
+    @Update
+    suspend fun update(assessment: ElderlyHealthAssessment)
+
+    @Query("SELECT * FROM ELDERLY_HEALTH_ASSESSMENT WHERE assessment_id = :id")
+    suspend fun getAssessmentById(id: Long): ElderlyHealthAssessment?
+
+    @Query("SELECT * FROM ELDERLY_HEALTH_ASSESSMENT WHERE patient_id = :patientID ORDER BY assessment_id DESC LIMIT 1")
+    suspend fun getAssessmentByPatientId(patientID: String): ElderlyHealthAssessment?
+
+    @Query("SELECT * FROM ELDERLY_HEALTH_ASSESSMENT WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo")
+    suspend fun getAssessment(patientID: String, benVisitNo: Int): ElderlyHealthAssessment?
+
+    @Query("SELECT * FROM ELDERLY_HEALTH_ASSESSMENT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<ElderlyHealthAssessment>
+
+    @Query(
+        "DELETE FROM ELDERLY_HEALTH_ASSESSMENT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/HealthCenterDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/HealthCenterDao.kt
index edfc9c093..c89ac7f13 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/HealthCenterDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/HealthCenterDao.kt
@@ -45,6 +45,9 @@ interface HealthCenterDao {
     @Query("SELECT * from Item_Master_List where itemID = :id")
     fun getItemMasterListById(id:Int): ItemMasterList
 
+    @Query("SELECT quantityInHand FROM Item_Master_List WHERE itemID = :id")
+    suspend fun getItemMasterQtyInHandById(id: Int): Int?
+
     @Query("SELECT * from Counselling_Provided")
     fun getAllCounsellingProvided():LiveData<List<CounsellingProvided>>
 }
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/InfantRegDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/InfantRegDao.kt
new file mode 100644
index 000000000..d0bbdb6b0
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/InfantRegDao.kt
@@ -0,0 +1,138 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncModuleIds
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.InfantRegWithPatient
+import org.piramalswasthya.cho.model.PatientWithDeliveryOutcomeAndInfantRegCache
+import org.piramalswasthya.cho.model.SyncStatusCache
+
+@Dao
+interface InfantRegDao {
+
+    @Query("""
+        SELECT * FROM INFANT_REG
+        WHERE motherPatientID = :patientID
+        AND babyIndex = :babyIndex
+        AND isActive = 1
+        ORDER BY updatedDate DESC, createdDate DESC, id DESC
+        LIMIT 1
+    """)
+    suspend fun getInfantReg(patientID: String, babyIndex: Int): InfantRegCache?
+
+    @Query("SELECT * FROM INFANT_REG WHERE childPatientID = :childPatientID limit 1")
+    suspend fun getInfantRegFromChildPatientID(childPatientID: String): InfantRegCache?
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun saveInfantReg(infantRegCache: InfantRegCache)
+
+    @Query("SELECT * FROM INFANT_REG WHERE processed in ('N', 'U')")
+    suspend fun getAllUnprocessedInfantReg(): List<InfantRegCache>
+
+    @Update
+    suspend fun updateInfantReg(it: InfantRegCache)
+
+    @Query("select count(*) from INFANT_REG where isActive = 1 and motherPatientID = :patientID")
+    suspend fun getNumBabiesRegistered(patientID: String): Int
+
+    @Query("SELECT * FROM INFANT_REG WHERE motherPatientID in (:patientIDs) and isActive = 1")
+    suspend fun getAllInfantRegs(patientIDs: Set<String>): List<InfantRegCache>
+
+    /**
+     * Get all patients with delivery outcome for infant registration
+     * Returns patients who have active delivery outcome with liveBirth > 0
+     */
+    @Transaction
+    @Query("""
+        SELECT p.* FROM PATIENT p
+        INNER JOIN DELIVERY_OUTCOME do ON p.patientID = do.patientID
+        WHERE do.isActive = 1
+        AND do.liveBirth > 0
+        ORDER BY do.dateOfDelivery DESC
+    """)
+    fun getListForInfantRegister(): Flow<List<PatientWithDeliveryOutcomeAndInfantRegCache>>
+
+    /**
+     * Get count of infants eligible for registration (sum of liveBirth)
+     */
+    @Query("""
+        SELECT SUM(do.liveBirth)
+        FROM DELIVERY_OUTCOME do
+        INNER JOIN PATIENT p ON do.patientID = p.patientID
+        WHERE do.isActive = 1
+        AND do.liveBirth > 0
+    """)
+    fun getInfantRegisterCount(): Flow<Int>
+
+    @Query(
+        """
+        SELECT
+            ${SyncModuleIds.INFANT_REG} AS id,
+            'Infant Reg.' AS name,
+            COUNT(CASE WHEN ir.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN ir.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN ir.syncState = :syncingState THEN 1 END) AS syncing
+        FROM INFANT_REG ir
+        WHERE ir.isActive = 1
+        """
+    )
+    fun getInfantRegSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
+    /**
+     * Get patient with delivery outcome and infant reg by patientID
+     */
+    @Transaction
+    @Query("SELECT * FROM PATIENT WHERE patientID = :patientID")
+    suspend fun getPatientWithDeliveryOutcomeAndInfantRegByID(patientID: String): PatientWithDeliveryOutcomeAndInfantRegCache?
+
+    /**
+     * Get all registered infants for child registration list
+     * Returns active infants from INFANT_REG (independent of mother PATIENT completeness).
+     */
+    @Transaction
+    @Query("""
+        SELECT ir.* FROM INFANT_REG ir
+        WHERE ir.isActive = 1
+        ORDER BY ir.updatedDate DESC, ir.createdDate DESC
+    """)
+    fun getAllRegisteredInfants(): Flow<List<InfantRegWithPatient>>
+
+    /**
+     * Get count of registered infants
+     */
+    @Query("""
+        SELECT COUNT(*) FROM INFANT_REG ir
+        WHERE ir.isActive = 1
+    """)
+    fun getAllRegisteredInfantsCount(): Flow<Int>
+
+    @Query(
+        """
+        SELECT
+            ${SyncModuleIds.CHILD_REG} AS id,
+            'Child Reg.' AS name,
+            COUNT(CASE WHEN ir.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN ir.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN ir.syncState = :syncingState THEN 1 END) AS syncing
+        FROM INFANT_REG ir
+        WHERE ir.isActive = 1
+          AND (ir.childPatientID IS NOT NULL OR ir.processed = 'C')
+        """
+    )
+    fun getChildRegSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/LanguageDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/LanguageDao.kt
index 30f8a9c78..66a216c02 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/LanguageDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/LanguageDao.kt
@@ -13,4 +13,7 @@ interface LanguageDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAllLanguages(language: Language)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertLanguages(languages: List<Language>)
 }
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MaternalHealthDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MaternalHealthDao.kt
index b71e8fe17..2d0b9fbf7 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MaternalHealthDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MaternalHealthDao.kt
@@ -3,13 +3,18 @@ package org.piramalswasthya.cho.database.room.dao
 import androidx.lifecycle.LiveData
 import androidx.room.*
 import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncStateValue
 import org.piramalswasthya.cho.model.*
+import org.piramalswasthya.cho.model.SyncStatusCache
 
 @Dao
 interface MaternalHealthDao {
     @Query("select * from pregnancy_register where patientID = :patientID and active = 1 limit 1")
     suspend fun getSavedRecord(patientID: String): PregnantWomanRegistrationCache?
 
+    @Query("select * from pregnancy_register where patientID = :patientID order by createdDate desc limit 1")
+    suspend fun getLatestRegistrationRecord(patientID: String): PregnantWomanRegistrationCache?
+
 //    @Query("select * from pregnancy_register where patientID = :patientID and active = 1 limit 1")
 //    fun getSavedRecordObserve(patientID: String): LiveData<PregnantWomanRegistrationCache?>
 
@@ -22,15 +27,24 @@ interface MaternalHealthDao {
     @Query("select * from pregnancy_anc where patientID = :patientID order by ancDate desc limit 1")
     suspend fun getLastAnc(patientID: String): PregnantWomanAncCache?
 
+    @Query("select * from pregnancy_anc where patientID = :patientID and weight IS NOT NULL and isActive = 1 order by visitNumber desc limit 1")
+    suspend fun getLastCompletedAnc(patientID: String): PregnantWomanAncCache?
+
     @Query("select visitNumber from pregnancy_anc where patientID = :patientID order by visitNumber desc limit 1")
     suspend fun getLastVisitNumber(patientID: String): Int?
 
+    @Query("select visitNumber from pregnancy_anc where patientID = :patientID and isActive = 1 order by visitNumber desc limit 1")
+    suspend fun getLastActiveVisitNumber(patientID: String): Int?
+
     @Query("select * from pregnancy_anc where patientID = :patientID and visitNumber = :visitNumber limit 1")
     suspend fun getSavedRecord(patientID: String, visitNumber: Int): PregnantWomanAncCache?
 
     @Query("select * from pregnancy_anc where isActive = 1 and patientID = :patientID")
     suspend fun getAllActiveAncRecords(patientID: String): List<PregnantWomanAncCache>
 
+    @Query("select * from pregnancy_anc where isActive = 1 and patientID = :patientID and weight IS NOT NULL order by visitNumber")
+    suspend fun getCompletedActiveAncRecords(patientID: String): List<PregnantWomanAncCache>
+
 //    @Query("select * from pregnancy_anc where isActive = 1 and patientID = :patientID")
 //    fun getAllActiveAncRecordsObserve(patientID: String): LiveData<List<PregnantWomanAncCache>>
 //    @Query("select * from pregnancy_anc where benId in (:benId) and isActive = 1")
@@ -43,7 +57,7 @@ interface MaternalHealthDao {
 //    fun getLatestAnc(benId: Long): PregnantWomanAncCache?
 //
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun saveRecord(pregnancyRegistrationForm: PregnantWomanRegistrationCache)
+    suspend fun saveRecord(pregnancyRegistrationForm: PregnantWomanRegistrationCache): Long
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun saveRecord(ancCache: PregnantWomanAncCache)
@@ -65,14 +79,319 @@ interface MaternalHealthDao {
     @Query("SELECT * FROM pregnancy_register WHERE processed in ('N', 'U')")
     suspend fun getAllUnprocessedPWRs(): List<PregnantWomanRegistrationCache>
 
+    @Query("SELECT * FROM pregnancy_register WHERE active = 1")
+    suspend fun getAllActivePregnancyRegistrations(): List<PregnantWomanRegistrationCache>
+
     @Update
     suspend fun updateANC(vararg it: PregnantWomanAncCache)
-//
-//    @Update
-//    suspend fun updatePwr(it: PregnantWomanRegistrationCache)
-//    @Query("select * from HRP_NON_PREGNANT_ASSESS assess where ((select count(*) from BEN_BASIC_CACHE b where benId = assess.benId and b.reproductiveStatusId = 1) = 1)")
-//    fun getAllNonPregnancyAssessRecords(): Flow<List<HRPNonPregnantAssessCache>>
-//
-//    @Query("select * from HRP_PREGNANT_ASSESS assess where ((select count(*) from BEN_BASIC_CACHE b where benId = assess.benId and b.reproductiveStatusId = 2) = 1)")
-//    fun getAllPregnancyAssessRecords(): Flow<List<HRPPregnantAssessCache>>
-}
\ No newline at end of file
+
+    /** Targeted upsert of post-upload sync state. Avoids whole-row writes
+     *  that can race with other workers in the sync chain re-writing the
+     *  same row with a stale snapshot. */
+    @Query("UPDATE pregnancy_anc SET syncState = 2, processed = 'P' WHERE id = :id")
+    suspend fun markAncSynced(id: Long)
+
+    @Update
+    suspend fun updatePwr(vararg it: PregnantWomanRegistrationCache)
+
+    /**
+     * Get all patients with their pregnancy registration data
+     * Returns only patients who have an active pregnancy registration
+     * Returns Flow for reactive updates
+     */
+    @Transaction
+    @Query("""
+        SELECT DISTINCT p.* FROM PATIENT p
+        LEFT OUTER JOIN PREGNANCY_REGISTER pwr ON p.patientID = pwr.patientID
+        WHERE (pwr.patientID IS NULL OR pwr.active = 1)
+        AND p.genderID = 2
+        AND p.maritalStatusID = 2
+        AND p.statusOfWomanID IN (2, 3)
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY p.registrationDate DESC
+    """)
+    fun getAllPatientsWithPWR(): Flow<List<PatientWithPwrCache>>
+
+    @Transaction
+    @Query("""
+        SELECT DISTINCT p.* FROM PATIENT p
+        LEFT OUTER JOIN PREGNANCY_REGISTER pwr ON p.patientID = pwr.patientID
+        WHERE (pwr.patientID IS NULL OR pwr.active = 1)
+        AND p.genderID = 2
+        AND p.maritalStatusID = 2
+        AND p.statusOfWomanID IN (2)
+        AND p.age BETWEEN 15 AND 49
+        AND NOT EXISTS (
+            SELECT 1 FROM PREGNANCY_ANC anc
+            WHERE anc.patientID = p.patientID
+              AND anc.isActive = 1
+              AND anc.pregnantWomanDelivered = 1
+        )
+        ORDER BY p.registrationDate DESC
+    """)
+    fun getAllPatientsWithANC(): Flow<List<PatientWithPwrCache>>
+
+    @Transaction
+    @Query("""
+        SELECT p.* FROM PATIENT p
+        WHERE EXISTS (
+            SELECT 1 FROM ELIGIBLE_COUPLE_TRACKING ect
+            WHERE ect.patientID = p.patientID
+            AND (
+                LOWER(IFNULL(ect.pregnancyTestResult, '')) = 'positive'
+                OR LOWER(IFNULL(ect.isPregnant, '')) IN ('yes', 'true')
+            )
+        )
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        AND p.statusOfWomanID IN (2)
+        ORDER BY p.registrationDate DESC
+    """)
+    fun getAllPatientsWithPWRFromEligibleCoupleTracking(): Flow<List<PatientWithPwrCache>>
+
+
+    /**
+     * Get specific patient with pregnancy registration
+     */
+    @Transaction
+    @Query("SELECT * FROM PATIENT WHERE patientID = :patientID")
+    suspend fun getPatientWithPWR(patientID: String): PatientWithPwrCache?
+
+    /**
+     * Get count of pregnant women registrations
+     */
+    @Query("SELECT COUNT(DISTINCT patientID) FROM pregnancy_register WHERE active = 1")
+    fun getPWRCount(): Flow<Int>
+
+    @Transaction
+    @Query(
+        """
+        SELECT
+            7 AS id,
+            'PW Registration' AS name,
+            COUNT(CASE WHEN pwr.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN pwr.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN pwr.syncState = :syncingState THEN 1 END) AS syncing
+        FROM PREGNANCY_REGISTER pwr
+        WHERE pwr.active = 1
+        """
+    )
+    fun getPregnancyRegistrationSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
+    /**
+     * Get patientIDs for Delivery Outcome list from ANC (isDelivered=true) + DELIVERY_OUTCOME.
+     */
+    @Query("""
+        SELECT src.patientID
+        FROM (
+            SELECT patientID, MAX(updatedDate) AS lastUpdated
+            FROM PREGNANCY_ANC
+            WHERE isActive = 1
+              AND pregnantWomanDelivered = 1
+            GROUP BY patientID
+            UNION ALL
+            SELECT patientID, MAX(updatedDate) AS lastUpdated
+            FROM DELIVERY_OUTCOME
+            WHERE isActive = 1
+            GROUP BY patientID
+        ) src
+        INNER JOIN PATIENT p ON src.patientID = p.patientID
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+        GROUP BY src.patientID
+        ORDER BY MAX(src.lastUpdated) DESC
+    """)
+    fun getDeliveredWomenPatientIDs(): Flow<List<String>>
+
+    /**
+     * Get count of delivered women from ANC (isDelivered=true) + DELIVERY_OUTCOME.
+     */
+    @Query("""
+        SELECT COUNT(DISTINCT src.patientID)
+        FROM (
+            SELECT patientID
+            FROM PREGNANCY_ANC
+            WHERE isActive = 1
+              AND pregnantWomanDelivered = 1
+            UNION
+            SELECT patientID
+            FROM DELIVERY_OUTCOME
+            WHERE isActive = 1
+        ) src
+        INNER JOIN PATIENT p ON src.patientID = p.patientID
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+    """)
+    fun getDeliveredWomenCount(): Flow<Int>
+
+    @Transaction
+    @Query(
+        """
+        SELECT
+            8 AS id,
+            'PW ANC' AS name,
+            COUNT(CASE WHEN anc.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN anc.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN anc.syncState = :syncingState THEN 1 END) AS syncing
+        FROM PREGNANCY_ANC anc
+        WHERE anc.isActive = 1
+        """
+    )
+    fun getAncSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
+    /**
+     * Get count of women with saved delivery outcome only (for neonatal outcome module).
+     */
+    @Query("""
+        SELECT COUNT(DISTINCT do.patientID)
+        FROM DELIVERY_OUTCOME do
+        INNER JOIN PATIENT p ON do.patientID = p.patientID
+        WHERE do.isActive = 1
+          AND p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+    """)
+    fun getSavedDeliveryOutcomeWomenCount(): Flow<Int>
+
+    /**
+     * Get patient with PWR by patientID
+     */
+    @Transaction
+    @Query("SELECT * FROM PATIENT WHERE patientID = :patientID")
+    suspend fun getPatientWithPWRByID(patientID: String): PatientWithPwrCache?
+
+    /**
+     * Get delivered women by patientIDs (batch query to avoid N+1).
+     * Keeps LEFT join on pregnancy register so list still shows if PWR row is missing locally.
+     */
+    @Transaction
+    @Query("""
+        SELECT DISTINCT p.* FROM PATIENT p
+        LEFT JOIN PREGNANCY_REGISTER pwr ON p.patientID = pwr.patientID
+        WHERE p.patientID IN (:patientIDs)
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY p.registrationDate DESC
+    """)
+    suspend fun getDeliveredWomenByIDs(patientIDs: List<String>): List<PatientWithPwrCache>
+
+    /**
+     * Get all patients with abortion records (isAborted = 1 and abortionDate is not null)
+     * Joins Patient, PWR, and ANC to find women with abortions
+     */
+    @Transaction
+    @Query("""
+        SELECT DISTINCT p.* FROM PATIENT p
+        INNER JOIN PREGNANCY_ANC anc ON p.patientID = anc.patientID
+        WHERE anc.isAborted = 1
+        AND anc.abortionDate IS NOT NULL
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY anc.abortionDate DESC
+    """)
+    fun getAllAbortionWomenList(): Flow<List<PatientWithPwrAndAncCache>>
+
+    /**
+     * Get count of abortion women
+     */
+    @Query("""
+        SELECT COUNT(DISTINCT p.patientID) FROM PATIENT p
+        INNER JOIN PREGNANCY_ANC anc ON p.patientID = anc.patientID
+        WHERE anc.isAborted = 1
+        AND anc.abortionDate IS NOT NULL
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+    """)
+    fun getAllAbortionWomenCount(): Flow<Int>
+
+    @Transaction
+    @Query(
+        """
+        SELECT
+            13 AS id,
+            'Abortion List' AS name,
+            COUNT(CASE WHEN anc.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN anc.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN anc.syncState = :syncingState THEN 1 END) AS syncing
+        FROM PREGNANCY_ANC anc
+        WHERE anc.isAborted = 1
+          AND anc.abortionDate IS NOT NULL
+        """
+    )
+    fun getAbortionSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
+    /**
+     * Get all patients registered for pregnancy (eligible for PMSMA)
+     * Returns patients with active pregnancy registration
+     */
+    @Transaction
+    @Query("""
+        SELECT DISTINCT p.* FROM PATIENT p
+        INNER JOIN PREGNANCY_REGISTER pwr ON p.patientID = pwr.patientID
+        WHERE pwr.active = 1
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY pwr.createdDate DESC
+    """)
+    fun getAllRegisteredPmsmaWomenList(): Flow<List<PatientWithPwrForPmsmaCache>>
+
+    /**
+     * Get count of PMSMA eligible women
+     */
+    @Query("""
+        SELECT COUNT(DISTINCT p.patientID) FROM PATIENT p
+        INNER JOIN PREGNANCY_REGISTER pwr ON p.patientID = pwr.patientID
+        WHERE pwr.active = 1
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+    """)
+    fun getAllRegisteredPmsmaWomenCount(): Flow<Int>
+
+    /**
+     * Get patientIDs of women who have at least one active ANC visit with anyHighRisk = true.
+     * Intersected against the ANC eligibility Flow in the repo to guarantee
+     * e-PMSMA list ⊆ ANC list.
+     */
+    @Query("""
+        SELECT DISTINCT anc.patientID FROM PREGNANCY_ANC anc
+        WHERE anc.isActive = 1
+        AND anc.anyHighRisk = 1
+    """)
+    fun getHighRiskAncPatientIDs(): Flow<List<String>>
+
+    /**
+     * Get patientIDs of women who have a saved delivery outcome (eligible for neonatal outcome)
+     */
+    @Query("""
+        SELECT DISTINCT do.patientID FROM DELIVERY_OUTCOME do
+        INNER JOIN PATIENT p ON do.patientID = p.patientID
+        WHERE do.isActive = 1
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+        ORDER BY do.updatedDate DESC
+    """)
+    fun getNeonatalOutcomeEligibleWomenPatientIDs(): Flow<List<String>>
+
+    /**
+     * Get count of women eligible for neonatal outcome
+     */
+    @Query("""
+        SELECT COUNT(DISTINCT do.patientID) FROM DELIVERY_OUTCOME do
+        INNER JOIN PATIENT p ON do.patientID = p.patientID
+        WHERE do.isActive = 1
+        AND p.genderID = 2
+        AND p.age BETWEEN 15 AND 49
+    """)
+    fun getNeonatalOutcomeEligibleWomenCount(): Flow<Int>
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MentalHealthScreeningDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MentalHealthScreeningDao.kt
new file mode 100644
index 000000000..2129a7933
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/MentalHealthScreeningDao.kt
@@ -0,0 +1,54 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+
+@Dao
+interface MentalHealthScreeningDao {
+
+    @Insert(onConflict = OnConflictStrategy.Companion.REPLACE)
+    suspend fun insert(screening: MentalHealthScreeningCache): Long
+
+    @Update
+    suspend fun update(screening: MentalHealthScreeningCache)
+
+    @Query(
+        "SELECT * FROM MENTAL_HEALTH_SCREENING " +
+                "WHERE screening_id = :id"
+    )
+    suspend fun getScreeningById(id: Long): MentalHealthScreeningCache?
+
+    @Query(
+        "SELECT * FROM MENTAL_HEALTH_SCREENING " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY screening_id DESC LIMIT 1"
+    )
+    suspend fun getScreeningByPatientId(patientID: String): MentalHealthScreeningCache?
+
+    @Query(
+        "SELECT * FROM MENTAL_HEALTH_SCREENING " +
+                "WHERE patient_id = :patientID " +
+                "AND ben_visit_no = :benVisitNo " +
+                "ORDER BY screening_id DESC LIMIT 1"
+    )
+    suspend fun getScreeningByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): MentalHealthScreeningCache?
+
+    @Query("SELECT * FROM MENTAL_HEALTH_SCREENING WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<MentalHealthScreeningCache>
+
+    @Query(
+        "DELETE FROM MENTAL_HEALTH_SCREENING " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NeonatalOutcomeDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NeonatalOutcomeDao.kt
new file mode 100644
index 000000000..45bb38b9b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NeonatalOutcomeDao.kt
@@ -0,0 +1,87 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
+
+@Dao
+interface NeonatalOutcomeDao {
+    
+    /**
+     * Insert a new neonatal outcome record
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertNeonatalOutcome(neonatalOutcome: NeonatalOutcomeCache): Long
+    
+    /**
+     * Insert multiple neonatal outcome records (for twins/triplets)
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertNeonatalOutcomes(neonatalOutcomes: List<NeonatalOutcomeCache>): List<Long>
+    
+    /**
+     * Update an existing neonatal outcome record
+     */
+    @Update
+    suspend fun updateNeonatalOutcome(neonatalOutcome: NeonatalOutcomeCache): Int
+    
+    /**
+     * Get all neonatal outcomes for a specific delivery
+     * Ordered by neonateIndex (Baby 1, Baby 2, etc.)
+     */
+    @Query("SELECT * FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId ORDER BY neonateIndex ASC")
+    suspend fun getNeonatalOutcomesByDeliveryId(deliveryOutcomeId: Long): List<NeonatalOutcomeCache>
+    
+    /**
+     * Get all neonatal outcomes for a specific delivery as Flow (for reactive UI)
+     */
+    @Query("SELECT * FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId ORDER BY neonateIndex ASC")
+    fun getNeonatalOutcomesByDeliveryIdFlow(deliveryOutcomeId: Long): Flow<List<NeonatalOutcomeCache>>
+    
+    /**
+     * Get a specific neonatal outcome by ID
+     */
+    @Query("SELECT * FROM NEONATAL_OUTCOME WHERE id = :neonatalOutcomeId")
+    suspend fun getNeonatalOutcomeById(neonatalOutcomeId: Long): NeonatalOutcomeCache?
+    
+    /**
+     * Get a specific neonate by delivery ID and neonate index
+     */
+    @Query("SELECT * FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId AND neonateIndex = :neonateIndex")
+    suspend fun getNeonatalOutcomeByIndexAndDelivery(deliveryOutcomeId: Long, neonateIndex: Int): NeonatalOutcomeCache?
+    
+    /**
+     * Get all neonatal outcomes that need to be synced with server
+     */
+    @Query("SELECT * FROM NEONATAL_OUTCOME WHERE syncState = :syncState")
+    suspend fun getAllPendingSync(syncState: SyncState = SyncState.UNSYNCED): List<NeonatalOutcomeCache>
+    
+    /**
+     * Get count of neonates for a delivery
+     */
+    @Query("SELECT COUNT(*) FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId")
+    suspend fun getCountByDeliveryId(deliveryOutcomeId: Long): Int
+    
+    /**
+     * Update sync state for a neonatal outcome
+     */
+    @Query("UPDATE NEONATAL_OUTCOME SET syncState = :syncState WHERE id = :id")
+    suspend fun updateSyncState(id: Long, syncState: SyncState): Int
+    
+    /**
+     * Delete neonatal outcomes for a specific delivery (cascade should handle this, but adding for explicit control)
+     */
+    @Query("DELETE FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId")
+    suspend fun deleteByDeliveryId(deliveryOutcomeId: Long): Int
+    
+    /**
+     * Check if neonatal outcomes exist for a delivery
+     */
+    @Query("SELECT COUNT(*) > 0 FROM NEONATAL_OUTCOME WHERE deliveryOutcomeId = :deliveryOutcomeId")
+    suspend fun hasNeonatalOutcomes(deliveryOutcomeId: Long): Boolean
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NoseDiagnosisAssessmentDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NoseDiagnosisAssessmentDao.kt
new file mode 100644
index 000000000..0d4f1544f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/NoseDiagnosisAssessmentDao.kt
@@ -0,0 +1,54 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+
+@Dao
+interface NoseDiagnosisAssessmentDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: NoseDiagnosisAssessment): Long
+
+    @Update
+    suspend fun update(assessment: NoseDiagnosisAssessment)
+
+    @Query(
+        "SELECT * FROM NOSE_DIAGNOSIS_ASSESSMENT " +
+                "WHERE assessment_id = :id"
+    )
+    suspend fun getAssessmentById(id: Long): NoseDiagnosisAssessment?
+
+    @Query(
+        "SELECT * FROM NOSE_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientId(patientID: String): NoseDiagnosisAssessment?
+
+    @Query(
+        "SELECT * FROM NOSE_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): NoseDiagnosisAssessment?
+
+
+    @Query("SELECT * FROM NOSE_DIAGNOSIS_ASSESSMENT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<NoseDiagnosisAssessment>
+
+    @Query(
+        "DELETE FROM NOSE_DIAGNOSIS_ASSESSMENT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OphthalmicDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OphthalmicDao.kt
new file mode 100644
index 000000000..0b258e299
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OphthalmicDao.kt
@@ -0,0 +1,36 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.OphthalmicVisit
+
+@Dao
+interface OphthalmicDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertOphthalmicVisit(visit: OphthalmicVisit)
+
+    @Update
+    suspend fun updateOphthalmicVisit(visit: OphthalmicVisit)
+
+    @Query("SELECT * FROM OPHTHALMIC_VISIT WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
+    suspend fun getOphthalmicVisit(patientID: String, benVisitNo: Int): OphthalmicVisit?
+
+    @Query("SELECT * FROM OPHTHALMIC_VISIT WHERE visitId = :visitId")
+    suspend fun getOphthalmicVisitById(visitId: String): OphthalmicVisit?
+    
+    @Query("SELECT * FROM OPHTHALMIC_VISIT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedOphthalmicVisits(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<OphthalmicVisit>
+
+    @Query(
+        "DELETE FROM OPHTHALMIC_VISIT " +
+            "WHERE patientID = :patientID AND benVisitNo = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OralHealthDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OralHealthDao.kt
new file mode 100644
index 000000000..4e66c7016
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/OralHealthDao.kt
@@ -0,0 +1,52 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.OralHealth
+
+@Dao
+interface OralHealthDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(oralHealth: OralHealth)
+
+    @Update
+    suspend fun update(oralHealth: OralHealth)
+
+    @Query("SELECT * FROM ORAL_HEALTH WHERE oral_health_id = :id")
+    suspend fun getById(id: Long): OralHealth?
+
+    @Query(
+        "SELECT * FROM ORAL_HEALTH " +
+            "WHERE patient_id = :patientID " +
+            "ORDER BY oral_health_id DESC LIMIT 1"
+    )
+    suspend fun getByPatientId(patientID: String): OralHealth?
+
+    @Query(
+        "SELECT * FROM ORAL_HEALTH " +
+            "WHERE patient_id = :patientID " +
+            "AND ben_visit_no = :benVisitNo " +
+            "ORDER BY oral_health_id DESC LIMIT 1"
+    )
+    suspend fun getByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): OralHealth?
+
+    @Query("SELECT * FROM ORAL_HEALTH WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<OralHealth>
+
+    @Query(
+        "DELETE FROM ORAL_HEALTH " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PainAndSymptomAssessmentDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PainAndSymptomAssessmentDao.kt
new file mode 100644
index 000000000..8b1d91a6a
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PainAndSymptomAssessmentDao.kt
@@ -0,0 +1,56 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
+
+@Dao
+interface PainAndSymptomAssessmentDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: PainAndSymptomAssessment)
+
+    @Update
+    suspend fun update(assessment: PainAndSymptomAssessment)
+
+    @Query(
+        "SELECT * FROM PAIN_SYMPTOM_ASSESSMENT " +
+                "WHERE assessment_id = :id"
+    )
+    suspend fun getAssessmentById(id: Long): PainAndSymptomAssessment?
+
+    @Query(
+        "SELECT * FROM PAIN_SYMPTOM_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientId(
+        patientID: String
+    ): PainAndSymptomAssessment?
+
+    @Query(
+        "SELECT * FROM PAIN_SYMPTOM_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "AND ben_visit_no = :benVisitNo " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): PainAndSymptomAssessment?
+
+    @Query("SELECT * FROM PAIN_SYMPTOM_ASSESSMENT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<PainAndSymptomAssessment>
+
+    @Query(
+        "DELETE FROM PAIN_SYMPTOM_ASSESSMENT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientDao.kt
index 61e97a9a1..c0599e7f4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientDao.kt
@@ -8,11 +8,13 @@ import androidx.room.Transaction
 import androidx.room.Update
 import kotlinx.coroutines.flow.Flow
 import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.SyncStateValue
 import org.piramalswasthya.cho.model.DistrictMaster
 import org.piramalswasthya.cho.model.GenderMaster
 import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.PatientDisplay
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.SyncStatusCache
 import java.util.Date
 
 @Dao
@@ -20,6 +22,10 @@ interface PatientDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertPatient(patient: Patient)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllPatients(patients: List<Patient>)
+
     @Query("SELECT EXISTS(SELECT 1 FROM patient WHERE beneficiaryRegID = :benRegId)")
     suspend fun existsByBeneficiaryRegId(benRegId: Long?): Boolean
 
@@ -84,7 +90,8 @@ interface PatientDao {
             "LEFT JOIN VILLAGE_MASTER vilN ON pat.districtBranchID = vilN.districtBranchID "+
             "LEFT JOIN AGE_UNIT age ON age.id = pat.ageUnitID " +
             "LEFT JOIN MARITAL_STATUS_MASTER mat on mat.maritalStatusID = pat.maritalStatusID " +
-            "WHERE latestVisit.patientID IS NULL")
+            "WHERE latestVisit.patientID IS NULL " +
+            "ORDER BY pat.registrationDate DESC, vis.benVisitNo DESC")
     fun getPatientDisplayListForNurse(): Flow<List<PatientDisplayWithVisitInfo>>
 
 
@@ -98,7 +105,9 @@ interface PatientDao {
             "LEFT JOIN VILLAGE_MASTER vilN ON pat.districtBranchID = vilN.districtBranchID "+
             "LEFT JOIN AGE_UNIT age ON age.id = pat.ageUnitID " +
             "LEFT JOIN MARITAL_STATUS_MASTER mat on mat.maritalStatusID = pat.maritalStatusID " +
-            "WHERE vis.nurseFlag = 9 AND latestVisit.patientID IS NULL")
+            "WHERE vis.nurseFlag = 9 AND latestVisit.patientID IS NULL " +
+            "AND NOT (vis.doctorFlag = 9 AND IFNULL(vis.pharmacist_flag, 0) IN (0, 9)) " +
+            "ORDER BY pat.registrationDate DESC, vis.benVisitNo DESC")
     fun getPatientDisplayListForDoctor(): Flow<List<PatientDisplayWithVisitInfo>>
 
     @Query("SELECT pat.*, gen.gender_name as genderName, vilN.village_name as villageName,age.age_name as ageUnit, mat.status as maritalStatus, " +
@@ -161,6 +170,9 @@ interface PatientDao {
     @Query("SELECT * FROM PATIENT WHERE beneficiaryId =:benId LIMIT 1")
     suspend fun getBen(benId: Long): Patient?
 
+    @Query("SELECT * FROM PATIENT WHERE beneficiaryID = :id OR beneficiaryRegID = :id LIMIT 1")
+    suspend fun getPatientByAnyBeneficiaryId(id: Long): Patient?
+
 //    @Transaction
 //    @Query("UPDATE PATIENT SET nurseFlag = 9, doctorFlag = 1 WHERE beneficiaryRegID = :beneficiaryRegID")
 //    suspend fun updateNurseCompleted(beneficiaryRegID: Long)
@@ -174,4 +186,99 @@ interface PatientDao {
 
     @Query("SELECT COUNT(*) FROM Patient WHERE registrationDate = :registrationDate")
     suspend fun countPatientsByRegistrationDate(registrationDate: Date): Int
-}
\ No newline at end of file
+
+    /**
+     * Get all infants (0–365 days).
+     * Calculates age in days from DOB (stored as milliseconds since epoch).
+     * WHO RMNCHA+ standard: infant = 0–365 days inclusive.
+     */
+    @Transaction
+    @Query("""
+        SELECT * FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 0 AND 365
+        ORDER BY dob DESC
+    """)
+    fun getAllInfantList(): Flow<List<PatientDisplay>>
+
+    /**
+     * Get count of infants (0–365 days).
+     * WHO RMNCHA+ standard: infant = 0–365 days inclusive.
+     */
+    @Query("""
+        SELECT COUNT(*) FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 0 AND 365
+    """)
+    fun getInfantListCount(): Flow<Int>
+
+    /**
+     * Get all children (365–3285 days, i.e. 1–9 years).
+     * Calculates age in days from DOB (stored as milliseconds since epoch).
+     * WHO RMNCHA+ standard: child = 365–3285 days inclusive (1–9 years).
+     */
+    @Transaction
+    @Query("""
+        SELECT * FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 365 AND 3285
+        ORDER BY dob DESC
+    """)
+    fun getAllChildList(): Flow<List<PatientDisplay>>
+
+    /**
+     * Get count of children (365–3285 days, i.e. 1–9 years).
+     * WHO RMNCHA+ standard: child = 365–3285 days inclusive (1–9 years).
+     */
+    @Query("""
+        SELECT COUNT(*) FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 365 AND 3285
+    """)
+    fun getChildListCount(): Flow<Int>
+
+    /**
+     * Get all adolescents (age between 10-19 years, i.e., 3650-6935 days)
+     * Calculates age in days from DOB (stored as milliseconds since epoch)
+     * Aligned with RMNCHA+ guidelines (10-19 years)
+     */
+    @Transaction
+    @Query("""
+        SELECT * FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 3650 AND 6935
+        ORDER BY dob DESC
+    """)
+    fun getAllAdolescentList(): Flow<List<PatientDisplay>>
+
+    /**
+     * Get count of adolescents (age between 10-19 years)
+     * Aligned with RMNCHA+ guidelines (10-19 years)
+     */
+    @Query("""
+        SELECT COUNT(*) FROM PATIENT 
+        WHERE dob IS NOT NULL 
+        AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 3650 AND 6935
+    """)
+    fun getAdolescentListCount(): Flow<Int>
+
+    @Query(
+        """
+        SELECT
+            14 AS id,
+            'Adolescent List' AS name,
+            COUNT(CASE WHEN syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN syncState = :syncingState THEN 1 END) AS syncing
+        FROM PATIENT
+        WHERE dob IS NOT NULL
+          AND CAST(((strftime('%s','now') * 1000 - dob) / 86400000) AS INTEGER) BETWEEN 3650 AND 6935
+        """
+    )
+    fun getAdolescentSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientVisitInfoSyncDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientVisitInfoSyncDao.kt
index 52c5fea5b..d5309cd65 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientVisitInfoSyncDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PatientVisitInfoSyncDao.kt
@@ -6,11 +6,12 @@ import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
-import org.piramalswasthya.cho.model.Patient
-import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.PatientDisplay
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVisitInfoSyncWithPatient
 import org.piramalswasthya.cho.model.SyncStatusCache
 import java.util.Date
@@ -57,8 +58,25 @@ interface PatientVisitInfoSyncDao {
     suspend fun getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID: String, benVisitNo: Int): PatientVisitInfoSync?
 
     @Transaction
-    @Query("UPDATE PATIENT_VISIT_INFO_SYNC SET benFlowId = :benFlowId, pharmacist_flag= :pharmacistFlag, visitCategory = :visitCategory WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
-    suspend fun updateBenFlowIdByPatientIdAndBenVisitNo(benFlowId: Long, pharmacistFlag:Int, patientID: String, benVisitNo: Int, visitCategory: String)
+    @Query(
+        "UPDATE PATIENT_VISIT_INFO_SYNC " +
+                "SET benFlowId = :benFlowId, " +
+                "pharmacist_flag = CASE " +
+                "WHEN pharmacist_flag = 9 AND :pharmacistFlag <> 9 THEN pharmacist_flag " +
+                "WHEN pharmacistDataSynced IN (:unSynced, :syncing) THEN pharmacist_flag " +
+                "ELSE :pharmacistFlag END, " +
+                "visitCategory = :visitCategory " +
+                "WHERE patientID = :patientID AND benVisitNo = :benVisitNo"
+    )
+    suspend fun updateBenFlowIdByPatientIdAndBenVisitNo(
+        benFlowId: Long,
+        pharmacistFlag: Int,
+        patientID: String,
+        benVisitNo: Int,
+        visitCategory: String,
+        unSynced: SyncState? = SyncState.UNSYNCED,
+        syncing: SyncState? = SyncState.SYNCING
+    )
 
     @Query("SELECT * FROM PATIENT_VISIT_INFO_SYNC WHERE createNewBenFlow = :createNewBenFlow AND benVisitNo > 1 ORDER BY benVisitNo ASC")
     suspend fun getUnsyncedRevisitRecords(createNewBenFlow: Boolean? = true): List<PatientVisitInfoSync>
@@ -76,8 +94,17 @@ interface PatientVisitInfoSyncDao {
     suspend fun getPatientDoctorDataUnsyncedForOfflineTransfer(unSynced: SyncState? = SyncState.UNSYNCED) : List<PatientVisitInfoSyncWithPatient>
 
 
-    @Query("SELECT * FROM PATIENT_VISIT_INFO_SYNC WHERE doctorDataSynced = :unSynced AND nurseDataSynced = :synced AND labtechFlag = 1 ORDER BY benVisitNo ASC")
-    suspend fun getPatientDoctorDataAfterTestUnsynced(unSynced: SyncState? = SyncState.UNSYNCED, synced: SyncState? = SyncState.SYNCED, ) : List<PatientVisitInfoSyncWithPatient>
+    @Query(
+        "SELECT * FROM PATIENT_VISIT_INFO_SYNC " +
+                "WHERE doctorDataSynced = :unSynced " +
+                "AND nurseDataSynced = :synced " +
+                "AND labtechFlag IN (1, 9) " +
+                "ORDER BY benVisitNo ASC"
+    )
+    suspend fun getPatientDoctorDataAfterTestUnsynced(
+        unSynced: SyncState? = SyncState.UNSYNCED,
+        synced: SyncState? = SyncState.SYNCED,
+    ) : List<PatientVisitInfoSyncWithPatient>
 
 //    @Transaction
 //    @Query("UPDATE PATIENT_VISIT_INFO_SYNC SET beneficiaryID = :beneficiaryID, beneficiaryRegID = :beneficiaryRegID WHERE patientID = :patientID")
@@ -137,6 +164,32 @@ interface PatientVisitInfoSyncDao {
     @Query("UPDATE PATIENT_VISIT_INFO_SYNC SET pharmacist_flag = 9 WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun updatePharmacistFlag(patientID: String, benVisitNo: Int)
 
+    @Transaction
+    @Query(
+        "UPDATE PATIENT_VISIT_INFO_SYNC " +
+                "SET pharmacist_flag = 9, pharmacistDataSynced = :unSynced " +
+                "WHERE patientID = :patientID AND benVisitNo = :benVisitNo"
+    )
+    suspend fun markPharmacistDispensedLocally(
+        patientID: String,
+        benVisitNo: Int,
+        unSynced: SyncState? = SyncState.UNSYNCED
+    )
+
+    @Transaction
+    @Query(
+        "UPDATE PATIENT_VISIT_INFO_SYNC " +
+                "SET pharmacist_flag = 1, " +
+                "pharmacistDataSynced = :unSynced, " +
+                "visitCategory = 'General OPD' " +
+                "WHERE patientID = :patientID AND benVisitNo = :benVisitNo"
+    )
+    suspend fun updatePharmacistFlagToPending(
+        patientID: String,
+        benVisitNo: Int,
+        unSynced: SyncState? = SyncState.UNSYNCED
+    )
+
     @Transaction
     @Query("UPDATE PATIENT_VISIT_INFO_SYNC SET doctorDataSynced = :syncing WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun updatePatientDoctorDataSyncSyncing(syncing: SyncState? = SyncState.SYNCING, patientID: String, benVisitNo: Int)
@@ -177,7 +230,10 @@ interface PatientVisitInfoSyncDao {
             "LEFT JOIN VILLAGE_MASTER vilN ON pat.districtBranchID = vilN.districtBranchID "+
             "LEFT JOIN AGE_UNIT age ON age.id = pat.ageUnitID " +
             "LEFT JOIN MARITAL_STATUS_MASTER mat on mat.maritalStatusID = pat.maritalStatusID " +
-            "WHERE vis.nurseFlag = 9 AND vis.visitCategory = 'General OPD' ORDER BY pat.registrationDate DESC")
+            "WHERE vis.nurseFlag = 9 " +
+            "AND vis.visitCategory = 'General OPD' " +
+            "AND NOT (vis.doctorFlag = 9 AND IFNULL(vis.pharmacist_flag, 0) IN (0, 9)) " +
+            "ORDER BY pat.registrationDate DESC")
     fun getPatientDisplayListForDoctor(): Flow<List<PatientDisplayWithVisitInfo>>
 
     @Transaction
@@ -199,40 +255,46 @@ interface PatientVisitInfoSyncDao {
             "LEFT JOIN VILLAGE_MASTER vilN ON pat.districtBranchID = vilN.districtBranchID "+
             "LEFT JOIN AGE_UNIT age ON age.id = pat.ageUnitID " +
             "LEFT JOIN MARITAL_STATUS_MASTER mat on mat.maritalStatusID = pat.maritalStatusID " +
-            "WHERE vis.doctorFlag = 9 AND vis.visitCategory = 'General OPD' AND vis.pharmacist_flag = 1")
+            "WHERE vis.visitCategory = 'General OPD' AND vis.pharmacist_flag = 1 AND (vis.doctorFlag = 9 OR vis.doctorFlag = 2 OR vis.doctorFlag = 3) " +
+            "ORDER BY IFNULL((SELECT MAX(p.id) FROM Prescription p WHERE p.patientID = vis.patientID AND p.benVisitNo = vis.benVisitNo), 0) DESC, " +
+            "IFNULL(vis.benVisitNo, 0) DESC")
     fun getPatientDisplayListForPharmacist(): Flow<List<PatientDisplayWithVisitInfo>>
 
     @Transaction
     @Query("SELECT " +
         "1 as id,'Patient' as name," +
-        "COUNT(CASE WHEN syncState = 2 THEN 1 END) AS synced," +
-        "COUNT(CASE WHEN syncState = 1 THEN 1 END) AS syncing," +
-        "COUNT(CASE WHEN syncState = 0 THEN 1 END) AS notSynced" +
+        "COUNT(CASE WHEN syncState = :syncedState THEN 1 END) AS synced," +
+        "COUNT(CASE WHEN syncState = :syncingState THEN 1 END) AS syncing," +
+        "COUNT(CASE WHEN syncState = :unsyncedState THEN 1 END) AS notSynced" +
         " FROM PATIENT UNION SELECT " +
         "2 as id,'Nurse' as name," +
-        "COUNT(CASE WHEN nurseDataSynced = 2 THEN 1 END) AS synced," +
-        "COUNT(CASE WHEN nurseDataSynced = 1 THEN 1 END) AS syncing," +
-        "COUNT(CASE WHEN nurseDataSynced = 0 THEN 1 END) AS notSynced" +
+        "COUNT(CASE WHEN nurseDataSynced = :syncedState THEN 1 END) AS synced," +
+        "COUNT(CASE WHEN nurseDataSynced = :syncingState THEN 1 END) AS syncing," +
+        "COUNT(CASE WHEN nurseDataSynced = :unsyncedState THEN 1 END) AS notSynced" +
         " FROM PATIENT_VISIT_INFO_SYNC WHERE nurseFlag = 9 UNION SELECT " +
         "3 as id,'Doctor' as name," +
-        "COUNT(CASE WHEN doctorDataSynced = 2 THEN 1 END) AS synced," +
-        "COUNT(CASE WHEN doctorDataSynced = 1 THEN 1 END) AS syncing," +
-        "COUNT(CASE WHEN doctorDataSynced = 0 THEN 1 END) AS notSynced" +
+        "COUNT(CASE WHEN doctorDataSynced = :syncedState THEN 1 END) AS synced," +
+        "COUNT(CASE WHEN doctorDataSynced = :syncingState THEN 1 END) AS syncing," +
+        "COUNT(CASE WHEN doctorDataSynced = :unsyncedState THEN 1 END) AS notSynced" +
         " FROM PATIENT_VISIT_INFO_SYNC WHERE doctorFlag > 1 UNION SELECT " +
         "4 as id,'Lab Technician' as name," +
-        "COUNT(CASE WHEN labDataSynced = 2 THEN 1 END) AS synced," +
-        "COUNT(CASE WHEN labDataSynced = 1 THEN 1 END) AS syncing," +
-        "COUNT(CASE WHEN labDataSynced = 0 THEN 1 END) AS notSynced" +
+        "COUNT(CASE WHEN labDataSynced = :syncedState THEN 1 END) AS synced," +
+        "COUNT(CASE WHEN labDataSynced = :syncingState THEN 1 END) AS syncing," +
+        "COUNT(CASE WHEN labDataSynced = :unsyncedState THEN 1 END) AS notSynced" +
         " FROM PATIENT_VISIT_INFO_SYNC WHERE doctorFlag = 3 UNION SELECT " +
         "5 as id,'Pharmacist' as name," +
-        "COUNT(CASE WHEN pharmacistDataSynced = 2 THEN 1 END) AS synced," +
-        "COUNT(CASE WHEN pharmacistDataSynced = 1 THEN 1 END) AS syncing," +
-        "COUNT(CASE WHEN pharmacistDataSynced = 0 THEN 1 END) AS notSynced" +
+        "COUNT(CASE WHEN pharmacistDataSynced = :syncedState THEN 1 END) AS synced," +
+        "COUNT(CASE WHEN pharmacistDataSynced = :syncingState THEN 1 END) AS syncing," +
+        "COUNT(CASE WHEN pharmacistDataSynced = :unsyncedState THEN 1 END) AS notSynced" +
         " FROM PATIENT_VISIT_INFO_SYNC WHERE doctorFlag = 9 AND pharmacist_flag = 9 ORDER BY id")
-    fun getSyncStatus(): Flow<List<SyncStatusCache>>
+    fun getSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
 
     @Transaction
     @Query("UPDATE PATIENT_VISIT_INFO_SYNC SET referDate = :referDate, referTo = :referTo, referralReason = :referralReason WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun updatePatientReferData(referDate: String?, referTo: String?, referralReason: String?, patientID: String, benVisitNo: Int) : Int
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PncDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PncDao.kt
index b7fab1369..efb9c64f5 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PncDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PncDao.kt
@@ -5,8 +5,14 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
+import androidx.room.Transaction
 import androidx.room.Update
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncModuleIds
+import org.piramalswasthya.cho.database.room.SyncStateValue
 import org.piramalswasthya.cho.model.PNCVisitCache
+import org.piramalswasthya.cho.model.PatientWithDeliveryOutcomeAndPncCache
+import org.piramalswasthya.cho.model.SyncStatusCache
 
 @Dao
 interface PncDao {
@@ -21,7 +27,7 @@ interface PncDao {
     suspend fun getLastSavedRecord(patientID: String): PNCVisitCache?
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insert(pncCache: PNCVisitCache)
+    suspend fun insert(pncCache: PNCVisitCache): Long
 
     @Query("SELECT * FROM pnc_visit WHERE processed in ('N', 'U')")
     suspend fun getAllUnprocessedPncVisits(): List<PNCVisitCache>
@@ -35,5 +41,90 @@ interface PncDao {
     @Query("select * from pnc_visit where patientID = :patientID and isActive = 1")
     suspend fun getAllPNCsByPatId(patientID: String): List<PNCVisitCache>
 
+    @Query(
+        """
+        SELECT
+            ${SyncModuleIds.PNC} AS id,
+            'PNC' AS name,
+            COUNT(CASE WHEN pnc.syncState = :syncedState THEN 1 END) AS synced,
+            COUNT(CASE WHEN pnc.syncState = :unsyncedState THEN 1 END) AS notSynced,
+            COUNT(CASE WHEN pnc.syncState = :syncingState THEN 1 END) AS syncing
+        FROM PNC_VISIT pnc
+        WHERE pnc.isActive = 1
+        """
+    )
+    fun getPncSyncStatus(
+        syncedState: Int = SyncStateValue.SYNCED,
+        syncingState: Int = SyncStateValue.SYNCING,
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): Flow<List<SyncStatusCache>>
 
-}
\ No newline at end of file
+    /**
+     * Get patientIDs of women eligible for PNC mothers list.
+     * Source: Patient status postnatal (same pattern as EC/PWR lists), excluding completed 42-day PNC.
+     */
+    @Query("""
+        SELECT p.patientID
+        FROM PATIENT p
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+          AND p.maritalStatusID = 2
+          AND p.statusOfWomanID = 3
+          AND NOT EXISTS (
+              SELECT 1 FROM PNC_VISIT p42
+              WHERE p42.patientID = p.patientID
+                AND p42.isActive = 1
+                AND p42.pncPeriod = 42
+          )
+    """)
+    fun getPNCMothersPatientIDs(): Flow<List<String>>
+
+    /**
+     * Get count of women eligible for PNC mothers list.
+     */
+    @Query("""
+        SELECT COUNT(*)
+        FROM PATIENT p
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+          AND p.maritalStatusID = 2
+          AND p.statusOfWomanID = 3
+          AND NOT EXISTS (
+              SELECT 1 FROM PNC_VISIT p42
+              WHERE p42.patientID = p.patientID
+                AND p42.isActive = 1
+                AND p42.pncPeriod = 42
+          )
+    """)
+    fun getPNCMothersCount(): Flow<Int>
+
+    /**
+     * Get patient with delivery outcome and PNC by patientID
+     */
+    @Transaction
+    @Query("SELECT * FROM PATIENT WHERE patientID = :patientID")
+    suspend fun getPatientWithDeliveryOutcomeAndPncByID(patientID: String): PatientWithDeliveryOutcomeAndPncCache?
+
+    /**
+     * Get all PNC mothers with their delivery outcome and PNC data.
+     * Source of truth: Patient status postnatal (delivery outcome joined via Room relation).
+     */
+    @Transaction
+    @Query("""
+        SELECT p.*
+        FROM PATIENT p
+        WHERE p.genderID = 2
+          AND p.age BETWEEN 15 AND 49
+          AND p.maritalStatusID = 2
+          AND p.statusOfWomanID = 3
+          AND NOT EXISTS (
+              SELECT 1 FROM PNC_VISIT p42
+              WHERE p42.patientID = p.patientID
+                AND p42.isActive = 1
+                AND p42.pncPeriod = 42
+          )
+        ORDER BY p.registrationDate DESC
+    """)
+    fun getAllPNCMothersWithData(): Flow<List<PatientWithDeliveryOutcomeAndPncCache>>
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PrescriptionDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PrescriptionDao.kt
index 3467530a6..0abd7699b 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PrescriptionDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PrescriptionDao.kt
@@ -35,6 +35,10 @@ interface PrescriptionDao {
     @Query("delete from prescription where patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun deletePrescriptionByPatientIDAndBenVisitNo(patientID: String, benVisitNo: Int): Int
 
+    @Transaction
+    @Query("delete from prescription where id = :id")
+    suspend fun deletePrescriptionById(id: Long): Int
+
 //    @Transaction
 //    @Query("delete from prescription where prescriptionID = :prescriptionID and beneficiaryRegID = :beneficiaryRegID")
 //    suspend fun deletePrescriptionByIDAndBenRegID(prescriptionID: Long, beneficiaryRegID: Long): Int
@@ -43,21 +47,36 @@ interface PrescriptionDao {
     @Query("delete from Prescription_Cases_Recorde where patientID =:patientID")
     suspend fun deletePrescriptionByPatientId(patientID: String): Int
 
-    @Query("select * from prescription where patientID = :patientID AND benVisitNo = :benVisitNo")
+    @Query("select * from prescription where patientID = :patientID AND benVisitNo = :benVisitNo order by id desc")
     suspend fun getPrescriptionsByPatientIdAndBenVisitNo(patientID: String, benVisitNo: Int): List<Prescription>?
 
+    @Transaction
+    @Query(
+        "delete from prescription " +
+                "where id = (" +
+                "select id from prescription where patientID = :patientID and benVisitNo = :benVisitNo order by id desc limit 1" +
+                ")"
+    )
+    suspend fun deleteLatestPrescriptionByPatientIDAndBenVisitNo(patientID: String, benVisitNo: Int): Int
+
     @Update
     suspend fun updatePharmacistPrescription(prescription: Prescription)
 
     @Query("select * from prescription where patientID = :patientID and benVisitNo = :benVisitNo and prescriptionID = :prescriptionID limit 1")
     fun getPrescription(patientID: String, benVisitNo: Int, prescriptionID: Long): Prescription
 
+    @Query("select * from prescription where patientID = :patientID and benVisitNo = :benVisitNo order by id desc limit 1")
+    suspend fun getLatestPrescriptionByPatientIdAndBenVisitNo(patientID: String, benVisitNo: Int): Prescription?
+
     @Query("select * from prescribed_drugs where prescriptionID = :prescriptionID")
     suspend fun getPrescribedDrugs(prescriptionID: Long): List<PrescribedDrugs>?
 
     @Query("select * from prescribed_drugs_batch where drugID = :drugID")
     fun getPrescribedDrugsBatch(drugID: Long): List<PrescribedDrugsBatch>?
 
+    @Query("delete from prescribed_drugs_batch where drugID = :drugID")
+    suspend fun deletePrescribedDrugsBatchByDrugId(drugID: Long): Int
+
     @Delete
     fun deletePrescribedDrugsBatch(prescribedDrugsBatch: PrescribedDrugsBatch)
 
@@ -68,10 +87,27 @@ interface PrescriptionDao {
     @Transaction
     @Query("UPDATE prescription SET issueType = :issueType WHERE prescriptionID =:prescriptionID")
     suspend fun updatePrescription(issueType: String?, prescriptionID: Long) : Int
+
+    @Query(
+        "UPDATE prescription SET " +
+                "prescriptionID = :prescriptionID, " +
+                "visitCode = :visitCode, " +
+                "consultantName = :consultantName " +
+                "WHERE id = (" +
+                "select id from prescription where patientID = :patientID and benVisitNo = :benVisitNo order by id desc limit 1" +
+                ")"
+    )
+    suspend fun updatePrescriptionHeader(
+        patientID: String,
+        benVisitNo: Int,
+        prescriptionID: Long,
+        visitCode: Long,
+        consultantName: String?
+    ): Int
 //
 //    @Query("select * from component_details where procedure_id = :procedureId and test_component_id = :testComponentID")
 //    fun getComponentDetails(procedureId: Long, testComponentID: Long): ComponentDetails
     @Query("delete from Prescription_Cases_Recorde where patientID =:patientID and benVisitNo = :benVisitNo")
     suspend fun deletePrescriptionByPatientIdAndBenVisitNo(patientID: String, benVisitNo: Int): Int
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureDao.kt
index f57f8a8a7..54f06b705 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureDao.kt
@@ -37,7 +37,7 @@ interface ProcedureDao {
     @Query("select * from component_option where component_details_id = :componentId")
     fun getComponentOptions(componentId: Long): List<ComponentOption>?
 
-    @Query("update component_details set test_result_value = :testResultValue and remarks = :remarks where id = :id")
+    @Query("update component_details set test_result_value = :testResultValue, remarks = :remarks where id = :id")
     fun addComponentResult(id: Long, testResultValue: String?, remarks: String?)
 
     @Query("select * from procedure where patientID = :patientID and benVisitNo = :benVisitNo and procedure_id = :procedureID limit 1")
@@ -55,6 +55,7 @@ interface ProcedureDao {
     @Query("delete from PROCEDURE_DATA_DOWNSYNC where patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun deleteProcedureDownsyncByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
 
+    @Transaction
     @Query("select * from PROCEDURE_DATA_DOWNSYNC where patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun getProceduresWithComponent(patientID: String, benVisitNo: Int): List<ProcedureDataWithComponent>
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureMasterDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureMasterDao.kt
index 2e924b09f..79f5ae6a0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureMasterDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ProcedureMasterDao.kt
@@ -22,6 +22,12 @@ public interface ProcedureMasterDao {
     @Query("select * from procedure_master where procedure_id = :procedureID limit 1")
     suspend fun getMasterProcedureById(procedureID: Long): ProcedureMaster?
 
+    @Query("delete from procedure_master where id = :rowId")
+    suspend fun deleteMasterProcedureByRowId(rowId: Long)
+
+    @Query("select * from procedure_master order by procedure_id")
+    suspend fun getAllProcedures(): List<ProcedureMaster>
+
     @Query("select * from component_details_master where procedure_id = :procedureID")
     suspend fun getComponentDetails(procedureID: Long): List<ComponentDetailsMaster>
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PsychosocialCaregiverSupportDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PsychosocialCaregiverSupportDao.kt
new file mode 100644
index 000000000..935944fd3
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/PsychosocialCaregiverSupportDao.kt
@@ -0,0 +1,58 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+
+@Dao
+interface PsychosocialCaregiverSupportDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: PsychosocialCaregiverSupport)
+
+    @Update
+    suspend fun update(assessment: PsychosocialCaregiverSupport)
+
+    @Query(
+        "SELECT * FROM PSYCHOSOCIAL_CAREGIVER_SUPPORT " +
+                "WHERE assessment_id = :id"
+    )
+    suspend fun getAssessmentById(
+        id: Long
+    ): PsychosocialCaregiverSupport?
+
+    @Query(
+        "SELECT * FROM PSYCHOSOCIAL_CAREGIVER_SUPPORT " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientId(
+        patientID: String
+    ): PsychosocialCaregiverSupport?
+
+    @Query(
+        "SELECT * FROM PSYCHOSOCIAL_CAREGIVER_SUPPORT " +
+                "WHERE patient_id = :patientID " +
+                "AND ben_visit_no = :benVisitNo " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): PsychosocialCaregiverSupport?
+
+    @Query("SELECT * FROM PSYCHOSOCIAL_CAREGIVER_SUPPORT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<PsychosocialCaregiverSupport>
+
+    @Query(
+        "DELETE FROM PSYCHOSOCIAL_CAREGIVER_SUPPORT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/RegistrarMasterDataDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/RegistrarMasterDataDao.kt
index 8b83a8430..f4ac77612 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/RegistrarMasterDataDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/RegistrarMasterDataDao.kt
@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import org.piramalswasthya.cho.moddel.OccupationMaster
+import org.piramalswasthya.cho.model.OccupationMaster
 import org.piramalswasthya.cho.model.AgeUnit
 import org.piramalswasthya.cho.model.CommunityMaster
 import org.piramalswasthya.cho.model.GenderMaster
@@ -32,6 +32,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertGender(genderMaster: GenderMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllGenders(list: List<GenderMaster>)
+
 
     //AGE UNIT
     @Query("SELECT * FROM AGE_UNIT")
@@ -40,6 +43,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertAgeUnit(ageUnit: AgeUnit)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllAgeUnits(list: List<AgeUnit>)
+
 
     //INCOME_MASTER
     @Query("SELECT * FROM INCOME_MASTER")
@@ -48,6 +54,8 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertIncomeStatus(incomeMaster: IncomeMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllIncomeStatuses(list: List<IncomeMaster>)
 
 
     //LITERACY_STATUS
@@ -57,6 +65,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertLiteracyStatus(literacyStatus: LiteracyStatus)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllLiteracyStatuses(list: List<LiteracyStatus>)
+
 
     //COMMUNITY_MASTER
     @Query("SELECT * FROM COMMUNITY_MASTER")
@@ -65,6 +76,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertCommunity(communityMaster: CommunityMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllCommunities(list: List<CommunityMaster>)
+
     //MARITAL_STATUS
     @Query("SELECT * FROM MARITAL_STATUS_MASTER")
     suspend fun getMaritalStatus(): List<MaritalStatusMaster>
@@ -72,6 +86,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertMaritalStatus(maritalStatusMaster: MaritalStatusMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllMaritalStatuses(list: List<MaritalStatusMaster>)
+
     //GOV_ID_ENTITY_MASTER
     @Query("SELECT * FROM GOV_ID_ENTITY_MASTER")
     suspend fun getGovIdMaster(): List<GovIdEntityMaster>
@@ -79,6 +96,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertGovIdMaster(govIdEntityMaster: GovIdEntityMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllGovIdMasters(list: List<GovIdEntityMaster>)
+
 
     //OTHER_GOV_ID_ENTITY_MASTER
     @Query("SELECT * FROM OTHER_GOV_ID_ENTITY_MASTER")
@@ -87,6 +107,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertOtherGovIdEntityMaster(maritalStatusMaster: OtherGovIdEntityMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllOtherGovIdEntityMasters(list: List<OtherGovIdEntityMaster>)
+
     //RELATIONSHIP_MASTER
     @Query("SELECT * FROM RELATIONSHIP_MASTER")
     suspend fun getRelationshipMaster(): List<RelationshipMaster>
@@ -94,6 +117,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRelationshipMaster(relationshipMaster: RelationshipMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllRelationshipMasters(list: List<RelationshipMaster>)
+
     //RELIGION_MASTER
     @Query("SELECT * FROM RELIGION_MASTER")
     suspend fun getReligionMaster(): List<ReligionMaster>
@@ -101,6 +127,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertReligionMaster(religionMaster: ReligionMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllReligionMasters(list: List<ReligionMaster>)
+
     //QUALIFICATION_MASTER
     @Query("SELECT * FROM QUALIFICATION_MASTER")
     suspend fun getQualificationMaster(): List<QualificationMaster>
@@ -108,6 +137,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertQualificationMaster(qualificationMaster: QualificationMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllQualificationMasters(list: List<QualificationMaster>)
+
 
     //OCCUPATION_MASTER
     @Query("SELECT * FROM OCCUPATION_MASTER")
@@ -116,6 +148,9 @@ interface RegistrarMasterDataDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertOccupationMaster(occupationMaster: OccupationMaster)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAllOccupationMasters(list: List<OccupationMaster>)
+
 
 
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/StatusOfWomanDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/StatusOfWomanDao.kt
new file mode 100644
index 000000000..96b746146
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/StatusOfWomanDao.kt
@@ -0,0 +1,26 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import org.piramalswasthya.cho.model.StatusOfWomanMaster
+
+@Dao
+interface StatusOfWomanDao {
+
+    @Query("SELECT * FROM STATUS_OF_WOMAN_MASTER")
+    suspend fun getAllStatusOfWoman(): List<StatusOfWomanMaster>
+
+    @Query("SELECT * FROM STATUS_OF_WOMAN_MASTER WHERE statusID = :statusId")
+    suspend fun getStatusById(statusId: Int): StatusOfWomanMaster?
+
+    @Query("SELECT * FROM STATUS_OF_WOMAN_MASTER WHERE statusID IN (:statusIds)")
+    suspend fun getStatusByIds(statusIds: List<Int>): List<StatusOfWomanMaster>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(statuses: List<StatusOfWomanMaster>)
+
+    @Query("SELECT COUNT(*) FROM STATUS_OF_WOMAN_MASTER")
+    suspend fun getCount(): Int
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ThroatDiagnosisAssessmentDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ThroatDiagnosisAssessmentDao.kt
new file mode 100644
index 000000000..fa2f0c2ce
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/ThroatDiagnosisAssessmentDao.kt
@@ -0,0 +1,54 @@
+package org.piramalswasthya.cho.database.room.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import org.piramalswasthya.cho.database.room.SyncStateValue
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
+
+@Dao
+interface ThroatDiagnosisAssessmentDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(assessment: ThroatDiagnosisAssessment)
+
+    @Update
+    suspend fun update(assessment: ThroatDiagnosisAssessment)
+
+    @Query(
+        "SELECT * FROM THROAT_DIAGNOSIS_ASSESSMENT " +
+                "WHERE assessment_id = :id"
+    )
+    suspend fun getAssessmentById(id: Long): ThroatDiagnosisAssessment?
+
+    @Query(
+        "SELECT * FROM THROAT_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientId(patientID: String): ThroatDiagnosisAssessment?
+
+    @Query(
+        "SELECT * FROM THROAT_DIAGNOSIS_ASSESSMENT " +
+                "WHERE patient_id = :patientID " +
+                "AND ben_visit_no = :benVisitNo " +
+                "ORDER BY assessment_id DESC LIMIT 1"
+    )
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): ThroatDiagnosisAssessment?
+
+    @Query("SELECT * FROM THROAT_DIAGNOSIS_ASSESSMENT WHERE syncState = :unsyncedState")
+    suspend fun getUnsyncedAssessments(
+        unsyncedState: Int = SyncStateValue.UNSYNCED
+    ): List<ThroatDiagnosisAssessment>
+
+    @Query(
+        "DELETE FROM THROAT_DIAGNOSIS_ASSESSMENT " +
+            "WHERE patient_id = :patientID AND ben_visit_no = :benVisitNo"
+    )
+    suspend fun deleteByPatientIdAndVisitNo(patientID: String, benVisitNo: Int)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/VisitReasonAndCategoriesDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/VisitReasonAndCategoriesDao.kt
index 6fab6238a..0f4560af7 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/room/dao/VisitReasonAndCategoriesDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/room/dao/VisitReasonAndCategoriesDao.kt
@@ -55,6 +55,12 @@ interface VisitReasonsAndCategoriesDao {
     @Query("SELECT * FROM Visit_DB WHERE patientID = :patientID AND benVisitNo = :benVisitNo")
     suspend fun getVisitDbByBenRegIdAndBenVisitNo(patientID: String, benVisitNo: Int) : VisitDB?
 
+    @Query(
+        "SELECT * FROM Visit_DB WHERE patientID = :patientID AND benVisitNo = :benVisitNo " +
+            "ORDER BY rowid DESC LIMIT 1"
+    )
+    suspend fun getLatestVisitDbByPatientIDAndBenVisitNo(patientID: String, benVisitNo: Int): VisitDB?
+
     @Query("SELECT benVisitDate FROM Visit_DB WHERE patientID = :patientId ORDER BY benVisitNo DESC LIMIT 1")
     fun getLatestVisitIdByPatientId(patientId: String): LiveData<String?>
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/database/shared_preferences/PreferenceDao.kt b/app/src/main/java/org/piramalswasthya/cho/database/shared_preferences/PreferenceDao.kt
index 204973ebd..2054d4953 100644
--- a/app/src/main/java/org/piramalswasthya/cho/database/shared_preferences/PreferenceDao.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/database/shared_preferences/PreferenceDao.kt
@@ -1,9 +1,12 @@
 package org.piramalswasthya.cho.database.shared_preferences
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
+import androidx.security.crypto.EncryptedSharedPreferences
+import androidx.security.crypto.MasterKey
 import com.google.gson.Gson
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.piramalswasthya.cho.R
@@ -25,6 +28,28 @@ class PreferenceDao @Inject constructor(@ApplicationContext private val context:
 
     private val pref = PreferenceManager.getInstance(context)
 
+    // EncryptedSharedPreferences for secure credential storage
+    private val encryptedPref: SharedPreferences by lazy {
+        try {
+            EncryptedSharedPreferences.create(
+                context,
+                "secret_shared_prefs",
+                MasterKey.Builder(context).setKeyScheme(MasterKey.KeyScheme.AES256_GCM).build(),
+                EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
+                EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM
+            )
+        } catch (e: Exception) {
+            Log.e("PreferenceDao", "Failed to create EncryptedSharedPreferences, falling back to standard preferences", e)
+            // Fallback to standard preferences or throw a more informative error
+            pref
+        }
+    }
+
+    init {
+        // Run one-time migration of plain-text credentials to encrypted storage
+        migrateCredentialsIfNeeded()
+    }
+
     @RequiresApi(Build.VERSION_CODES.O)
     val date = LocalDate.of(2023, 11, 1)
 
@@ -34,11 +59,11 @@ class PreferenceDao @Inject constructor(@ApplicationContext private val context:
 
     fun getPrimaryApiToken(): String? {
         val prefKey = context.getString(R.string.PREF_primary_API_KEY)
-        return pref.getString(prefKey, null)
+        return encryptedPref.getString(prefKey, null)
     }
-//
+
     fun registerPrimaryApiToken(token: String) {
-        val editor = pref.edit()
+        val editor = encryptedPref.edit()
         val prefKey = context.getString(R.string.PREF_primary_API_KEY)
         editor.putString(prefKey, token)
         editor.apply()
@@ -46,16 +71,23 @@ class PreferenceDao @Inject constructor(@ApplicationContext private val context:
 
     fun getJWTAmritToken(): String? {
         val prefKey = context.getString(R.string.PREF_primary_JWT_API_KEY)
-        return pref.getString(prefKey, null)
+        return encryptedPref.getString(prefKey, null)
     }
 
     fun registerJWTAmritToken(token: String) {
-        val editor = pref.edit()
+        val editor = encryptedPref.edit()
         val prefKey = context.getString(R.string.PREF_primary_JWT_API_KEY)
         editor.putString(prefKey, token)
         editor.apply()
     }
 
+    fun clearAmritTokens() {
+        val editor = encryptedPref.edit()
+        editor.remove(context.getString(R.string.PREF_primary_API_KEY))
+        editor.remove(context.getString(R.string.PREF_primary_JWT_API_KEY))
+        editor.apply()
+    }
+
     fun getWorkingLocationID(): Int {
         val prefKey = context.getString(R.string.WORK_LOCATION_ID)
         return pref.getInt(prefKey, 21)
@@ -187,6 +219,13 @@ class PreferenceDao @Inject constructor(@ApplicationContext private val context:
         return pref.getString(prefKey, null) ?: DateTimeUtil.formatCustDateAndTime(epochTimestamp)
     }
 
+    // Watermark that pulls the FULL benflow worklist (same value used for a first-ever sync).
+    // Used by the upsync/form-save benflow re-pull to land a JUST-created benflow that the
+    // incremental (hour-truncated) watermark would otherwise filter out.
+    fun getEpochBenflowSyncTime(): String {
+        return DateTimeUtil.formatCustDateAndTime(epochTimestamp)
+    }
+
     @RequiresApi(Build.VERSION_CODES.O)
     fun setLastBenflowSyncTime(currTimeStamp: Long){
         val prefKey = context.getString(R.string.last_benflow_sync_time)
@@ -224,54 +263,144 @@ class PreferenceDao @Inject constructor(@ApplicationContext private val context:
         editor.apply()
     }
 
+    fun clearSyncTimestamps() {
+        val editor = pref.edit()
+        editor.remove(context.getString(R.string.last_benflow_sync_time))
+        editor.remove(context.getString(R.string.last_cbac_sync_time))
+        editor.remove(context.getString(R.string.last_patient_sync_time))
+        editor.remove(context.getString(R.string.last_sync_time))
+        editor.apply()
+    }
+
     fun getLastSyncTime(): String {
         val prefKey = context.getString(R.string.last_sync_time)
         return pref.getString(prefKey, null) ?: DateTimeUtil.formatCustDateAndTime(epochTimestamp)
     }
 
-    fun registerLoginCred(userName: String,password: String) {
-        val editor = pref.edit()
+    /**
+     * One-time migration: Move plain-text credentials from regular prefs to encrypted prefs.
+     * Runs once on class initialization.
+     */
+    private fun migrateCredentialsIfNeeded() {
+        try {
+            val prefUserKey = context.getString(R.string.PREF_rem_me_uname)
+            val prefPasswordKey = context.getString(R.string.password_local_saved)
+
+            // Read plain-text values from regular prefs
+            val plainUserName = pref.getString(prefUserKey, null)
+            val plainPassword = pref.getString(prefPasswordKey, null)
+
+            // Check if encrypted versions already exist
+            val encryptedUserName = encryptedPref.getString(prefUserKey, null)
+
+            // Migrate if plain-text exists but encrypted doesn't
+            if (plainUserName != null && encryptedUserName == null) {
+                registerLoginCred(plainUserName, plainPassword ?: "")
+            }
+
+            // Clean up plain-text credentials from regular prefs
+            if (plainUserName != null || plainPassword != null) {
+                val editor = pref.edit()
+                editor.remove(prefUserKey)
+                editor.remove(prefPasswordKey)
+                editor.apply()
+            }
+
+            // Migrate Esanjeevani credentials as well
+            val prefEsUserKey = context.getString(R.string.esanjeevaniusername_local_saved)
+            val prefEsPasswordKey = context.getString(R.string.esanjeevanipassword_local_saved)
+
+            val plainEsUserName = pref.getString(prefEsUserKey, null)
+            val plainEsPassword = pref.getString(prefEsPasswordKey, null)
+            val encryptedEsUserName = encryptedPref.getString(prefEsUserKey, null)
+
+            if (plainEsUserName != null && encryptedEsUserName == null) {
+                registerEsanjeevaniCred(plainEsUserName, plainEsPassword ?: "")
+            }
+
+            if (plainEsUserName != null || plainEsPassword != null) {
+                val editor = pref.edit()
+                editor.remove(prefEsUserKey)
+                editor.remove(prefEsPasswordKey)
+                editor.apply()
+            }
+
+            // Migrate Amrit API + JWT tokens from plain prefs to encryptedPref.
+            val prefApiTokenKey = context.getString(R.string.PREF_primary_API_KEY)
+            val prefJwtTokenKey = context.getString(R.string.PREF_primary_JWT_API_KEY)
+
+            val plainApiToken = pref.getString(prefApiTokenKey, null)
+            val plainJwtToken = pref.getString(prefJwtTokenKey, null)
+            val encryptedApiToken = encryptedPref.getString(prefApiTokenKey, null)
+            val encryptedJwtToken = encryptedPref.getString(prefJwtTokenKey, null)
+
+            if (plainApiToken != null && encryptedApiToken == null) {
+                encryptedPref.edit().putString(prefApiTokenKey, plainApiToken).apply()
+            }
+            if (plainJwtToken != null && encryptedJwtToken == null) {
+                encryptedPref.edit().putString(prefJwtTokenKey, plainJwtToken).apply()
+            }
+
+            if (plainApiToken != null || plainJwtToken != null) {
+                val editor = pref.edit()
+                editor.remove(prefApiTokenKey)
+                editor.remove(prefJwtTokenKey)
+                editor.apply()
+            }
+        } catch (e: Exception) {
+            Log.e("PreferenceDao", "Error during credential migration: ${e.message}")
+        }
+    }
+
+    fun registerLoginCred(userName: String, password: String) {
+        val editor = encryptedPref.edit()
         val prefUserKey = context.getString(R.string.PREF_rem_me_uname)
         val prefPasswordKey = context.getString(R.string.password_local_saved)
         editor.putString(prefUserKey, userName)
         editor.putString(prefPasswordKey, password)
         editor.apply()
     }
+
     fun getRememberedUserName(): String? {
         val key = context.getString(R.string.PREF_rem_me_uname)
-        return pref.getString(key, null)
+        return encryptedPref.getString(key, null)
     }
+
     fun getRememberedPassword(): String? {
         val prefPasswordKey = context.getString(R.string.password_local_saved)
-        return pref.getString(prefPasswordKey, null)
+        return encryptedPref.getString(prefPasswordKey, null)
+    }
+
+    fun registerEsanjeevaniCred(userName: String, password: String) {
+        val editor = encryptedPref.edit()
+        val prefUserKey = context.getString(R.string.esanjeevaniusername_local_saved)
+        val prefPasswordKey = context.getString(R.string.esanjeevanipassword_local_saved)
+        editor.putString(prefUserKey, userName)
+        editor.putString(prefPasswordKey, password)
+        editor.apply()
     }
 
-fun registerEsanjeevaniCred(userName: String,password: String) {
-    val editor = pref.edit()
-    val prefUserKey = context.getString(R.string.esanjeevaniusername_local_saved)
-    val prefPasswordKey = context.getString(R.string.esanjeevanipassword_local_saved)
-    editor.putString(prefUserKey, userName)
-    editor.putString(prefPasswordKey, password)
-    editor.apply()
-}
     fun getEsanjeevaniUserName(): String? {
         val key = context.getString(R.string.esanjeevaniusername_local_saved)
-        return pref.getString(key, null)
+        return encryptedPref.getString(key, null)
     }
+
     fun getEsanjeevaniPassword(): String? {
         val prefPasswordKey = context.getString(R.string.esanjeevanipassword_local_saved)
-        return pref.getString(prefPasswordKey, null)
+        return encryptedPref.getString(prefPasswordKey, null)
     }
+
     fun deleteEsanjeevaniCreds() {
-        val editor = pref.edit()
+        val editor = encryptedPref.edit()
         val prefUserKeyEs = context.getString(R.string.esanjeevaniusername_local_saved)
         val prefPasswordKeyEs = context.getString(R.string.esanjeevanipassword_local_saved)
         editor.remove(prefUserKeyEs)
         editor.remove(prefPasswordKeyEs)
         editor.apply()
     }
+
     fun deleteLoginCred() {
-        val editor = pref.edit()
+        val editor = encryptedPref.edit()
         val prefUserKey = context.getString(R.string.PREF_rem_me_uname)
         val prefPasswordKey = context.getString(R.string.password_local_saved)
         editor.remove(prefUserKey)
@@ -331,6 +460,8 @@ fun registerEsanjeevaniCred(userName: String,password: String) {
         return when (pref.getString(key, null)) {
             Languages.ENGLISH.symbol -> Languages.ENGLISH
             Languages.KANNADA.symbol -> Languages.KANNADA
+            Languages.HINDI.symbol -> Languages.HINDI
+            Languages.ASSAMESE.symbol -> Languages.ASSAMESE
             else -> Languages.ENGLISH
         }
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/di/AppModule.kt b/app/src/main/java/org/piramalswasthya/cho/di/AppModule.kt
index f5a40a3f6..dcf660869 100644
--- a/app/src/main/java/org/piramalswasthya/cho/di/AppModule.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/di/AppModule.kt
@@ -11,6 +11,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import org.piramalswasthya.cho.BuildConfig
 import org.piramalswasthya.cho.database.room.InAppDb
 import org.piramalswasthya.cho.database.room.dao.BatchDao
 import org.piramalswasthya.cho.database.room.dao.BenFlowDao
@@ -19,20 +20,24 @@ import org.piramalswasthya.cho.database.room.dao.CaseRecordeDao
 import org.piramalswasthya.cho.database.room.dao.CbacDao
 import org.piramalswasthya.cho.database.room.dao.ChiefComplaintMasterDao
 import org.piramalswasthya.cho.database.room.dao.DeliveryOutcomeDao
+import org.piramalswasthya.cho.database.room.dao.NeonatalOutcomeDao
 import org.piramalswasthya.cho.database.room.dao.DistrictMasterDao
 import org.piramalswasthya.cho.database.room.dao.EcrDao
 import org.piramalswasthya.cho.database.room.dao.GovIdEntityMasterDao
 import org.piramalswasthya.cho.database.room.dao.HealthCenterDao
 import org.piramalswasthya.cho.database.room.dao.HistoryDao
 import org.piramalswasthya.cho.database.room.dao.ImmunizationDao
+import org.piramalswasthya.cho.database.room.dao.InfantRegDao
 import org.piramalswasthya.cho.database.room.dao.InvestigationDao
 import org.piramalswasthya.cho.database.room.dao.LanguageDao
 import org.piramalswasthya.cho.database.room.dao.LoginSettingsDataDao
+import org.piramalswasthya.cho.database.room.dao.AshaDueListDao
 import org.piramalswasthya.cho.database.room.dao.MaternalHealthDao
 import org.piramalswasthya.cho.database.room.dao.OtherGovIdEntityMasterDao
 import org.piramalswasthya.cho.database.room.dao.OutreachDao
 import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.room.dao.PatientVisitInfoSyncDao
+import org.piramalswasthya.cho.database.room.dao.OphthalmicDao
 import org.piramalswasthya.cho.database.room.dao.PncDao
 import org.piramalswasthya.cho.database.room.dao.PrescriptionDao
 import org.piramalswasthya.cho.database.room.dao.PrescriptionTemplateDao
@@ -41,6 +46,7 @@ import org.piramalswasthya.cho.database.room.dao.ProcedureMasterDao
 import org.piramalswasthya.cho.database.room.dao.ReferRevisitDao
 import org.piramalswasthya.cho.database.room.dao.RegistrarMasterDataDao
 import org.piramalswasthya.cho.database.room.dao.StateMasterDao
+import org.piramalswasthya.cho.database.room.dao.StatusOfWomanDao
 import org.piramalswasthya.cho.database.room.dao.SubCatVisitDao
 import org.piramalswasthya.cho.database.room.dao.UserAuthDao
 import org.piramalswasthya.cho.database.room.dao.UserDao
@@ -53,6 +59,7 @@ import org.piramalswasthya.cho.network.AbhaApiService
 import org.piramalswasthya.cho.network.AmritApiService
 import org.piramalswasthya.cho.network.ESanjeevaniApiService
 import org.piramalswasthya.cho.network.FlwApiService
+import org.piramalswasthya.cho.network.interceptors.AuthRefreshInterceptor
 import org.piramalswasthya.cho.network.interceptors.ContentTypeInterceptor
 import org.piramalswasthya.cho.network.interceptors.TokenESanjeevaniInterceptor
 import org.piramalswasthya.cho.network.interceptors.TokenInsertAbhaInterceptor
@@ -63,6 +70,14 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import java.util.concurrent.TimeUnit
 import javax.inject.Named
 import javax.inject.Singleton
+import org.piramalswasthya.cho.database.room.dao.EarDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.NoseDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.PainAndSymptomAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.OralHealthDao
+import org.piramalswasthya.cho.database.room.dao.PsychosocialCaregiverSupportDao
+import org.piramalswasthya.cho.database.room.dao.MentalHealthScreeningDao
+import org.piramalswasthya.cho.database.room.dao.ThroatDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.ElderlyHealthAssessmentDao
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -72,7 +87,12 @@ object AppModule {
 
     private val baseClient =
         OkHttpClient.Builder()
-            .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
+            .addInterceptor(
+                HttpLoggingInterceptor().setLevel(
+                    if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BASIC
+                    else HttpLoggingInterceptor.Level.NONE
+                )
+            )
             .addInterceptor(ContentTypeInterceptor())
             .build()
 
@@ -96,6 +116,7 @@ object AppModule {
             .readTimeout(600, TimeUnit.SECONDS)
             .writeTimeout(600, TimeUnit.SECONDS)
             .addInterceptor(TokenInsertTmcInterceptor())
+            .addInterceptor(AuthRefreshInterceptor())
             .build()
     }
     @Singleton
@@ -293,6 +314,10 @@ fun provideESanjeevaniApiService(
     @Provides
     fun provideMaternalHealthDao(database: InAppDb): MaternalHealthDao = database.maternalHealthDao
 
+    @Singleton
+    @Provides
+    fun provideAshaDueListDao(database: InAppDb): AshaDueListDao = database.ashaDueListDao
+
     @Singleton
     @Provides
     fun provideImmunizationDao(database: InAppDb): ImmunizationDao = database.immunizationDao
@@ -301,6 +326,10 @@ fun provideESanjeevaniApiService(
     @Provides
     fun provideDeliveryOutcomeDao(database: InAppDb): DeliveryOutcomeDao = database.deliveryOutcomeDao
 
+    @Singleton
+    @Provides
+    fun provideNeonatalOutcomeDao(database: InAppDb): NeonatalOutcomeDao = database.neonatalOutcomeDao
+
     @Singleton
     @Provides
     fun providePncDao(database: InAppDb): PncDao = database.pncDao
@@ -309,6 +338,10 @@ fun provideESanjeevaniApiService(
     @Provides
     fun provideEcrDao(database: InAppDb): EcrDao = database.ecrDao
 
+    @Singleton
+    @Provides
+    fun provideInfantRegDao(database: InAppDb): InfantRegDao = database.infantRegDao
+
     @Singleton
     @Provides
     fun providePreferenceDao(@ApplicationContext context: Context) = PreferenceDao(context)
@@ -336,4 +369,47 @@ fun provideESanjeevaniApiService(
     @Singleton
     @Provides
     fun provideCbacDao(database: InAppDb): CbacDao = database.cbacDao
+
+    @Singleton
+    @Provides
+    fun provideStatusOfWomanDao(database: InAppDb): StatusOfWomanDao = database.statusOfWomanDao
+
+    @Singleton
+    @Provides
+    fun provideOphthalmicDao(database: InAppDb): OphthalmicDao = database.ophthalmicDao
+
+    @Singleton
+    @Provides
+    fun provideEarDiagnosisAssessmentDao(database: InAppDb): EarDiagnosisAssessmentDao = database.earDiagnosisAssessmentDao
+
+    @Singleton
+    @Provides
+    fun provideNoseDiagnosisAssessmentDao(database: InAppDb): NoseDiagnosisAssessmentDao = database.noseDiagnosisAssessmentDao
+
+    @Singleton
+    @Provides
+    fun providePainAndSymptomAssessmentDao(database: InAppDb): PainAndSymptomAssessmentDao = database.painAndSymptomAssessmentDao
+
+    @Singleton
+    @Provides
+    fun provideOralHealthDao(database: InAppDb): OralHealthDao =
+        database.oralHealthDao
+
+    @Singleton
+    @Provides
+    fun providePsychosocialCaregiverSupportDao(database: InAppDb): PsychosocialCaregiverSupportDao = database.psychosocialCaregiverSupportDao
+    @Singleton
+    @Provides
+    fun provideMentalHealthScreeningDao(database: InAppDb): MentalHealthScreeningDao = database.mentalHealthScreeningDao
+
+    @Singleton
+    @Provides
+    fun provideThroatDiagnosisAssessmentDao(database: InAppDb): ThroatDiagnosisAssessmentDao =
+        database.throatDiagnosisAssessmentDao
+
+    @Singleton
+    @Provides
+    fun provideElderlyHealthAssessmentDao(database: InAppDb): ElderlyHealthAssessmentDao = database.elderlyHealthAssessmentDao
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/di/TokenRefreshModule.kt b/app/src/main/java/org/piramalswasthya/cho/di/TokenRefreshModule.kt
new file mode 100644
index 000000000..4d31732bd
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/di/TokenRefreshModule.kt
@@ -0,0 +1,18 @@
+package org.piramalswasthya.cho.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.piramalswasthya.cho.network.TokenRefreshProvider
+import org.piramalswasthya.cho.network.TokenRefreshProviderImpl
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class TokenRefreshModule {
+
+    @Binds
+    @Singleton
+    abstract fun bindTokenRefreshProvider(impl: TokenRefreshProviderImpl): TokenRefreshProvider
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/facenet/Models.kt b/app/src/main/java/org/piramalswasthya/cho/facenet/Models.kt
index 928c47e38..27f5bb7c7 100644
--- a/app/src/main/java/org/piramalswasthya/cho/facenet/Models.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/facenet/Models.kt
@@ -7,7 +7,7 @@ class Models {
             "FaceNet" ,
             "facenet.tflite" ,
             0.4f ,
-            10f ,
+            5.0f ,
             128 ,
             160
         )
diff --git a/app/src/main/java/org/piramalswasthya/cho/helpers/CaseClosureManager.kt b/app/src/main/java/org/piramalswasthya/cho/helpers/CaseClosureManager.kt
new file mode 100644
index 000000000..ee995bc30
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/helpers/CaseClosureManager.kt
@@ -0,0 +1,197 @@
+package org.piramalswasthya.cho.helpers
+
+import org.piramalswasthya.cho.database.room.dao.CaseRecordeDao
+import org.piramalswasthya.cho.database.room.dao.PrescriptionDao
+import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.PatientVisitInfoSync
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Centralized business logic for case closure workflow.
+ * 
+ * RULES:
+ * 1. AUTO-CLOSE: Only medicine prescribed (no lab) + medicine dispensed
+ * 2. AUTO-CLOSE: Nothing prescribed (no lab, no medicine)
+ * 3. MANUAL-CLOSE: Lab test involved (with or without medicine)
+ * 4. CANNOT CLOSE: Pending lab test or undispensed medicine
+ */
+@Singleton
+class CaseClosureManager @Inject constructor(
+    private val caseRecordeDao: CaseRecordeDao,
+    private val prescriptionDao: PrescriptionDao
+) {
+
+    /**
+     * Determines if case should auto-close based on prescription type.
+     * 
+     * @return true if case should auto-close, false if manual closure required
+     */
+    suspend fun shouldAutoClose(visitInfo: PatientVisitInfoSync): Boolean {
+        val hasMedicine = hasMedicinePrescribed(visitInfo.patientID, visitInfo.benVisitNo)
+        val hasLab = hasLabTestPrescribed(visitInfo.patientID, visitInfo.benVisitNo)
+        val medicineDispensed = visitInfo.pharmacist_flag == 9
+
+        return when {
+            // Scenario 1: Nothing prescribed -> auto close
+            !hasMedicine && !hasLab -> {
+                Timber.d("CaseClosureManager: Auto-close - nothing prescribed")
+                true
+            }
+            // Scenario 2: Only medicine + dispensed -> auto close
+            hasMedicine && !hasLab && medicineDispensed -> {
+                Timber.d("CaseClosureManager: Auto-close - only medicine dispensed")
+                true
+            }
+            // All other scenarios require manual closure
+            else -> {
+                Timber.d("CaseClosureManager: Manual close required - hasLab=$hasLab, hasMedicine=$hasMedicine, dispensed=$medicineDispensed")
+                false
+            }
+        }
+    }
+
+    /**
+     * Checks if case can be manually closed by doctor.
+     * Validates that all prerequisites are met.
+     * 
+     * @return Pair<Boolean, String?> - (canClose, errorMessage)
+     */
+    suspend fun canManuallyClose(visitInfo: PatientVisitInfoSync): Pair<Boolean, String?> {
+        val hasPendingLab = hasLabTestPending(visitInfo)
+        val hasUndispensedMedicine = hasUndispensedMedicine(visitInfo)
+
+        return when {
+            hasPendingLab -> {
+                Timber.w("CaseClosureManager: Cannot close - pending lab test")
+                false to "Cannot close case: Lab test is pending"
+            }
+            hasUndispensedMedicine -> {
+                Timber.w("CaseClosureManager: Cannot close - undispensed medicine")
+                false to "Cannot close case: Medicine has not been dispensed"
+            }
+            else -> {
+                Timber.d("CaseClosureManager: Can manually close")
+                true to null
+            }
+        }
+    }
+
+    /**
+     * Checks if lab test was ever prescribed for this visit.
+     * Lab involvement determines if closure should be manual.
+     */
+    suspend fun hasLabTestPrescribed(patientID: String, benVisitNo: Int): Boolean {
+        return try {
+            val investigation = caseRecordeDao.getPrescriptionCasesRecordByPatientIDAndBenVisitNo(
+                patientID,
+                benVisitNo
+            )
+            val hasTests = !investigation?.previousTestIds.isNullOrBlank() || 
+                          !investigation?.newTestIds.isNullOrBlank()
+            Timber.d("CaseClosureManager: hasLabTestPrescribed=$hasTests for $patientID/$benVisitNo")
+            hasTests
+        } catch (e: Exception) {
+            Timber.e(e, "Error checking lab test prescription")
+            false
+        }
+    }
+
+    /**
+     * Checks if medicine was prescribed for this visit.
+     */
+    suspend fun hasMedicinePrescribed(patientID: String, benVisitNo: Int): Boolean {
+        return try {
+            val prescriptions = caseRecordeDao.getPrescriptionByPatientIDAndBenVisitNo(
+                patientID,
+                benVisitNo
+            )
+            val hasMedicine = !prescriptions.isNullOrEmpty()
+            Timber.d("CaseClosureManager: hasMedicinePrescribed=$hasMedicine for $patientID/$benVisitNo")
+            hasMedicine
+        } catch (e: Exception) {
+            Timber.e(e, "Error checking medicine prescription")
+            false
+        }
+    }
+
+    /**
+     * Checks if lab test is pending (prescribed but not completed).
+     */
+    private suspend fun hasLabTestPending(visitInfo: PatientVisitInfoSync): Boolean {
+        val hasLab = hasLabTestPrescribed(visitInfo.patientID, visitInfo.benVisitNo)
+        // Backward compatibility: older records may stay at labtechFlag=1 even after lab submission,
+        // but doctorFlag=3 represents the post-lab review state.
+        val isLabCompleted = (visitInfo.labtechFlag ?: 0) == 9 || (visitInfo.doctorFlag ?: 0) == 3
+        val isPending = hasLab && !isLabCompleted
+        Timber.d("CaseClosureManager: hasLabTestPending=$isPending (hasLab=$hasLab, labtechFlag=${visitInfo.labtechFlag}, doctorFlag=${visitInfo.doctorFlag})")
+        return isPending
+    }
+
+    /**
+     * Checks if medicine is prescribed but not dispensed.
+     */
+    private suspend fun hasUndispensedMedicine(visitInfo: PatientVisitInfoSync): Boolean {
+        val hasMedicine = hasMedicinePrescribed(visitInfo.patientID, visitInfo.benVisitNo)
+        // Medicine is undispensed if prescribed but pharmacist_flag != 9 (not dispensed)
+        val isUndispensed = hasMedicine && (visitInfo.pharmacist_flag ?: 0) != 9
+        Timber.d("CaseClosureManager: hasUndispensedMedicine=$isUndispensed (hasMedicine=$hasMedicine, pharmacist_flag=${visitInfo.pharmacist_flag})")
+        return isUndispensed
+    }
+
+    /**
+     * Determines if case requires manual closure confirmation dialog.
+     */
+    suspend fun requiresManualClosureConfirmation(visitInfo: PatientVisitInfoSync): Boolean {
+        // Manual confirmation required if lab was ever involved
+        val hasLab = hasLabTestPrescribed(visitInfo.patientID, visitInfo.benVisitNo)
+        Timber.d("CaseClosureManager: requiresManualClosureConfirmation=$hasLab")
+        return hasLab
+    }
+
+    /**
+     * Helper for PatientDisplayWithVisitInfo overload.
+     */
+    suspend fun shouldAutoClose(benVisitInfo: PatientDisplayWithVisitInfo): Boolean {
+        val visitInfo = PatientVisitInfoSync(
+            patientID = benVisitInfo.patient.patientID,
+            benVisitNo = benVisitInfo.benVisitNo ?: 0,
+            pharmacist_flag = benVisitInfo.pharmacist_flag,
+            labtechFlag = benVisitInfo.labtechFlag,
+            doctorFlag = benVisitInfo.doctorFlag,
+            nurseFlag = benVisitInfo.nurseFlag
+        )
+        return shouldAutoClose(visitInfo)
+    }
+
+    /**
+     * Helper for PatientDisplayWithVisitInfo overload.
+     */
+    suspend fun canManuallyClose(benVisitInfo: PatientDisplayWithVisitInfo): Pair<Boolean, String?> {
+        val visitInfo = PatientVisitInfoSync(
+            patientID = benVisitInfo.patient.patientID,
+            benVisitNo = benVisitInfo.benVisitNo ?: 0,
+            pharmacist_flag = benVisitInfo.pharmacist_flag,
+            labtechFlag = benVisitInfo.labtechFlag,
+            doctorFlag = benVisitInfo.doctorFlag,
+            nurseFlag = benVisitInfo.nurseFlag
+        )
+        return canManuallyClose(visitInfo)
+    }
+
+    /**
+     * Helper for PatientDisplayWithVisitInfo overload.
+     */
+    suspend fun requiresManualClosureConfirmation(benVisitInfo: PatientDisplayWithVisitInfo): Boolean {
+        val visitInfo = PatientVisitInfoSync(
+            patientID = benVisitInfo.patient.patientID,
+            benVisitNo = benVisitInfo.benVisitNo ?: 0,
+            pharmacist_flag = benVisitInfo.pharmacist_flag,
+            labtechFlag = benVisitInfo.labtechFlag,
+            doctorFlag = benVisitInfo.doctorFlag,
+            nurseFlag = benVisitInfo.nurseFlag
+        )
+        return requiresManualClosureConfirmation(visitInfo)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/helpers/CommonUtils.kt b/app/src/main/java/org/piramalswasthya/cho/helpers/CommonUtils.kt
index 3d0156c05..c95224d6e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/helpers/CommonUtils.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/helpers/CommonUtils.kt
@@ -12,6 +12,34 @@ import java.util.concurrent.TimeUnit
 fun getWeeksOfPregnancy(regLong: Long, lmpLong: Long) =
     (TimeUnit.MILLISECONDS.toDays(regLong - lmpLong) / 7).toInt()
 
+/** Current gestational age in whole weeks — matches ANC visit list display. */
+fun getCurrentWeeksOfPregnancy(lmpLong: Long): Int {
+    if (lmpLong <= 0L) return 0
+    return getWeeksOfPregnancy(getTodayMillis(), lmpLong).coerceAtLeast(0)
+}
+
+/** Current gestational age formatted — matches ANC visit list, used on read-only form fields. */
+fun getCurrentGestationalAgeFormatted(lmpLong: Long): String {
+    if (lmpLong <= 0L) return "NA"
+    return getGestationalAgeFormatted(getTodayMillis(), lmpLong)
+}
+
+/**
+ * Formats gestational age as "X weeks Y days"
+ * @param regLong Current date in milliseconds
+ * @param lmpLong LMP date in milliseconds
+ * @return Formatted string like "12 weeks 3 days" or "0 weeks" if regLong < lmpLong
+ */
+fun getGestationalAgeFormatted(regLong: Long, lmpLong: Long): String {
+    val diff = regLong - lmpLong
+    if (diff <= 0) {
+        return "0 weeks"
+    }
+    val totalDays = TimeUnit.MILLISECONDS.toDays(diff).toInt().coerceAtLeast(0)
+    val weeks = totalDays / 7
+    return "$weeks weeks"
+}
+
 
 fun getTodayMillis() = Calendar.getInstance().setToStartOfTheDay().timeInMillis
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/helpers/Konstants.kt b/app/src/main/java/org/piramalswasthya/cho/helpers/Konstants.kt
index 790c10e31..73589e252 100644
--- a/app/src/main/java/org/piramalswasthya/cho/helpers/Konstants.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/helpers/Konstants.kt
@@ -52,12 +52,13 @@ object Konstants {
     const val maxAnc4Week = 40
 
     const val minWeekToShowDelivered = 23
+    const val maxWeekToShowAbortion = 24
 
 
     const val babyLowWeight: Double = 2.5
 
 
-        //PNC-EC cycle
+    //PNC-EC cycle
     const val pncEcGap : Long = 45
 
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/helpers/Languages.kt b/app/src/main/java/org/piramalswasthya/cho/helpers/Languages.kt
index 8bfb52a5c..e3db14078 100644
--- a/app/src/main/java/org/piramalswasthya/cho/helpers/Languages.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/helpers/Languages.kt
@@ -2,5 +2,7 @@ package org.piramalswasthya.cho.helpers
 
 enum class Languages(val symbol: String) {
     ENGLISH("en"),
-    KANNADA("kn")
+    KANNADA("kn"),
+    ASSAMESE("as"),
+    HINDI("hi"),
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/BenDetailsDownsync.kt b/app/src/main/java/org/piramalswasthya/cho/model/BenDetailsDownsync.kt
index 66d728030..a393dc937 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/BenDetailsDownsync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/BenDetailsDownsync.kt
@@ -27,6 +27,7 @@ data class BenAnthropometryDetail(
     val waistHipRatio: Double?,
     val deleted: Boolean?,
     val processed: String?,
+    val facilityID: Int?,
 )
 
 @JsonClass(generateAdapter = true)
@@ -57,6 +58,7 @@ data class GOPDNurseVisitDetail(
     val subVisitCategory: String?,
     val followUpForFpMethod: String?,
     val sideEffects: String?,
+    val facilityID: Int?,
 )
 
 @JsonClass(generateAdapter = true)
@@ -92,6 +94,7 @@ data class BenPhysicalVitalDetail(
     val hemoglobin: Double?,
     val deleted: Boolean?,
     val processed: String?,
+    val facilityID: Int?,
 )
 
 @JsonClass(generateAdapter = true)
@@ -108,7 +111,8 @@ data class BenChiefComplaints(
     val unitOfDuration: String?,
     val description: String?,
     val deleted: Boolean?,
-    val processed: String?
+    val processed: String?,
+    val facilityID: Int?,
 )
 
 //{
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/BenFlow.kt b/app/src/main/java/org/piramalswasthya/cho/model/BenFlow.kt
index b9a893079..680786e44 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/BenFlow.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/BenFlow.kt
@@ -2,8 +2,8 @@ package org.piramalswasthya.cho.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import androidx.room.ForeignKey
 import androidx.room.PrimaryKey
+import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.JsonClass
 
 @Entity(tableName = "BENFLOW")
@@ -108,6 +108,10 @@ data class BenFlow(
     @ColumnInfo(name = "vanID")
     val vanID: Int?,
 
+    @ColumnInfo(name = "facilityID")
+    @SerializedName(value = "facilityID", alternate = ["facilityId", "FacilityID"])
+    val facilityID: Int?,
+
 //    val masterVan: {
 //
 //            "vanID": 4,
@@ -129,6 +133,12 @@ data class BenFlow(
     @ColumnInfo(name = "beneficiaryID")
     val beneficiaryID: Long?,
 
+    @ColumnInfo(name = "reproductiveStatusId")
+    val reproductiveStatusId: Int?,
+
+    @ColumnInfo(name = "reproductiveStatus")
+    val reproductiveStatus: String?,
+
     @ColumnInfo(name = "parkingPlaceID")
     val parkingPlaceID: Int? = null,
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/BenNewFlow.kt b/app/src/main/java/org/piramalswasthya/cho/model/BenNewFlow.kt
index 2196d4b9c..aa99e8422 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/BenNewFlow.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/BenNewFlow.kt
@@ -38,7 +38,11 @@ data class BenNewFlow (
     val ageUnits: String?,
     val emergencyRegistration: Boolean?,
     val providerServiceMapId: String?,
-    val vanID: Int?
+    val facilityID: Int?,
+    val facilityName: String?,
+    val facilityType: String?,
+    val employeeId: String?,
+    val locationType: String?
 ){
     constructor(user: UserDomain?, patientDisplay: PatientDisplay?) : this(
         patientDisplay?.patient?.beneficiaryRegID,
@@ -72,7 +76,11 @@ data class BenNewFlow (
         ageUnits = patientDisplay?.ageUnit?.name?.lowercase(),
         false,
         user?.serviceMapId?.toString(),
-        user?.vanId
+        facilityID = user?.facilityID,
+        facilityName = user?.facilityName,
+        facilityType = user?.facilityType,
+        employeeId = user?.employeeId,
+        locationType = user?.locationType
     )
 
 //    val beneficiaryRegID: Long?,
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/CBAC.kt b/app/src/main/java/org/piramalswasthya/cho/model/CBAC.kt
index 4cc1d75a2..59ddccedc 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/CBAC.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/CBAC.kt
@@ -984,7 +984,7 @@ data class CbacRequest(
     val sessionID: Int?,
     val parkingPlaceID: Int?,
     val createdBy: String,
-    val vanID: Int?,
+    val facilityID: Int?,
     val beneficiaryRegID: Long,
     val benVisitID: Long?,
     val providerServiceMapID: Int?
@@ -1011,7 +1011,7 @@ data class CbacVisitDetails(
     val healthFacilityLocation: String?=null,
     val reportFilePath: String?=null,
     val createdBy: String,
-    val vanID: Int,
+    val facilityID: Int?,
     val parkingPlaceID: Int,
     val fileIDs:String?=null
 )
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/DeliveryOutcome.kt b/app/src/main/java/org/piramalswasthya/cho/model/DeliveryOutcome.kt
index 476fa9e8f..5245e55c9 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/DeliveryOutcome.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/DeliveryOutcome.kt
@@ -41,6 +41,27 @@ data class DeliveryOutcomeCache (
     var dateOfDischarge: Long? = null,
     var timeOfDischarge: String? = null,
     var isJSYBenificiary: Boolean? = null,
+    var gestationalAgeAtDelivery: String? = null,
+    var deliveryConductedBy: String? = null,
+    var modeOfDelivery: String? = null,
+    var indicationForLSCS: String? = null,
+    var indicationForLSCSOther: String? = null,
+    var privateHospitalName: String? = null,
+
+    /** Mother's condition immediately post-delivery: Healthy/Stable, Complication (specify), Critical/ICU admission, Maternal Death */
+    var motherCondition: String? = null,
+    /** Comma-separated maternal complications when condition is Complication or Critical */
+    var maternalComplications: String? = null,
+    /** Mother currently admitted? Yes (Still in hospital) / No (Discharged) */
+    var motherCurrentlyAdmitted: Boolean? = null,
+
+    var isDeath: Boolean? = null,
+    var isDeathValue: String? = null,
+    var dateOfDeath: String? = null,
+    var placeOfDeath: String? = null,
+    var placeOfDeathId: Int? = null,
+    var otherPlaceOfDeath: String? = null,
+
 //    var isActive: Boolean? = true,
     var processed: String? = "N",
     var createdBy: String,
@@ -79,6 +100,21 @@ data class DeliveryOutcomeCache (
             dateOfDischarge = dateOfDischarge?.let { getDateStringFromLong(it) },
             timeOfDischarge = timeOfDischarge,
             isJSYBenificiary = isJSYBenificiary,
+            gestationalAgeAtDelivery = gestationalAgeAtDelivery,
+            deliveryConductedBy = deliveryConductedBy,
+            modeOfDelivery = modeOfDelivery,
+            indicationForLSCS = indicationForLSCS,
+            indicationForLSCSOther = indicationForLSCSOther,
+            privateHospitalName = privateHospitalName,
+            motherCondition = motherCondition,
+            maternalComplications = maternalComplications,
+            motherCurrentlyAdmitted = motherCurrentlyAdmitted,
+            isDeath = isDeath,
+            isDeathValue = isDeathValue,
+            dateOfDeath = dateOfDeath,
+            placeOfDeath = placeOfDeath,
+            placeOfDeathId = placeOfDeathId?.takeIf { it > 0 },
+            otherPlaceOfDeath = otherPlaceOfDeath,
             createdDate = getDateStringFromLong(createdDate),
             createdBy = createdBy,
             updatedDate = getDateStringFromLong(updatedDate),
@@ -106,37 +142,67 @@ data class DeliveryOutcomePost (
     val dateOfDischarge: String? = null,
     val timeOfDischarge: String? = null,
     val isJSYBenificiary: Boolean? = null,
+    val gestationalAgeAtDelivery: String? = null,
+    val deliveryConductedBy: String? = null,
+    val modeOfDelivery: String? = null,
+    val indicationForLSCS: String? = null,
+    val indicationForLSCSOther: String? = null,
+    val privateHospitalName: String? = null,
+    val motherCondition: String? = null,
+    val maternalComplications: String? = null,
+    val motherCurrentlyAdmitted: Boolean? = null,
+    val isDeath: Boolean? = null,
+    val isDeathValue: String? = null,
+    val dateOfDeath: String? = null,
+    val placeOfDeath: String? = null,
+    val placeOfDeathId: Int? = null,
+    val otherPlaceOfDeath: String? = null,
     val createdDate: String? = null,
     val createdBy: String,
     val updatedDate: String? = null,
     val updatedBy: String
     ) {
-//    fun toDeliveryCache(): DeliveryOutcomeCache {
-//        return DeliveryOutcomeCache(
-//            id = id,
-//            benId = benId,
-//            isActive = isActive,
-//            dateOfDelivery = getLongFromDate(dateOfDelivery),
-//            timeOfDelivery = timeOfDelivery,
-//            placeOfDelivery = placeOfDelivery,
-//            typeOfDelivery = typeOfDelivery,
-//            hadComplications = hadComplications,
-//            complication = complication,
-//            causeOfDeath = causeOfDeath,
-//            otherCauseOfDeath  = otherCauseOfDeath,
-//            otherComplication = otherComplication,
-//            deliveryOutcome = deliveryOutcome,
-//            liveBirth = liveBirth,
-//            stillBirth = stillBirth,
-//            dateOfDischarge = getLongFromDate(dateOfDischarge),
-//            timeOfDischarge = timeOfDischarge,
-//            isJSYBenificiary = isJSYBenificiary,
-//            processed = "P",
-//            createdBy = createdBy,
-//            createdDate = getLongFromDate(createdDate),
-//            updatedBy = updatedBy,
-//            updatedDate = getLongFromDate(updatedDate),
-//            syncState = SyncState.SYNCED
-//        )
-//    }
-}
\ No newline at end of file
+    fun toDeliveryCache(patientID: String): DeliveryOutcomeCache {
+        return DeliveryOutcomeCache(
+            id = id,
+            patientID = patientID,
+            isActive = isActive,
+            dateOfDelivery = dateOfDelivery?.let { getLongFromDate(it) },
+            timeOfDelivery = timeOfDelivery,
+            placeOfDelivery = placeOfDelivery,
+            typeOfDelivery = typeOfDelivery,
+            hadComplications = hadComplications,
+            complication = complication,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            otherComplication = otherComplication,
+            deliveryOutcome = deliveryOutcome,
+            liveBirth = liveBirth,
+            stillBirth = stillBirth,
+            dateOfDischarge = dateOfDischarge?.let { getLongFromDate(it) },
+            timeOfDischarge = timeOfDischarge,
+            isJSYBenificiary = isJSYBenificiary,
+            gestationalAgeAtDelivery = gestationalAgeAtDelivery,
+            deliveryConductedBy = deliveryConductedBy,
+            modeOfDelivery = modeOfDelivery,
+            indicationForLSCS = indicationForLSCS,
+            indicationForLSCSOther = indicationForLSCSOther,
+            privateHospitalName = privateHospitalName,
+            motherCondition = motherCondition,
+            maternalComplications = maternalComplications,
+            motherCurrentlyAdmitted = motherCurrentlyAdmitted,
+            isDeath = isDeath,
+            isDeathValue = isDeathValue,
+            dateOfDeath = dateOfDeath,
+            placeOfDeath = placeOfDeath,
+            placeOfDeathId = placeOfDeathId,
+            otherPlaceOfDeath = otherPlaceOfDeath,
+            processed = "P",
+            createdBy = createdBy,
+            createdDate = createdDate?.let { getLongFromDate(it) } ?: System.currentTimeMillis(),
+            updatedBy = updatedBy,
+            updatedDate = updatedDate?.let { getLongFromDate(it) } ?: System.currentTimeMillis(),
+            syncState = SyncState.SYNCED
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisUpsync.kt b/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisUpsync.kt
index 3eb018157..6fbf9a325 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisUpsync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisUpsync.kt
@@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class DiagnosisUpsync(
     val prescriptionID: Int?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val parkingPlaceID: Int?,
     val provisionalDiagnosisList: List<ProvisionalDiagnosisUpsync>?,
     val beneficiaryRegID: String?,
@@ -18,7 +18,7 @@ data class DiagnosisUpsync(
 ) {
     constructor(user: UserDomain?, benFlow: BenFlow?, diagnosisList: List<DiagnosisCaseRecord>?,prescriptionID:Int?) : this(
         prescriptionID = prescriptionID,
-        user?.vanId,
+        user?.facilityID,
         user?.parkingPlaceId,
         provisionalDiagnosisList = diagnosisList?.map {
             ProvisionalDiagnosisUpsync(term = it.diagnosis)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisValue.kt b/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisValue.kt
index 544b340b7..22b222a38 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisValue.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/DiagnosisValue.kt
@@ -2,5 +2,7 @@ package org.piramalswasthya.cho.model
 
 data class DiagnosisValue(
     var id: Int = -1,
-    var diagnosis: String = ""
+    var diagnosis: String = "",
+    /** True when loaded from DB (already saved); row is shown but not editable. */
+    var isPreFilled: Boolean = false
 )
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/DoctorDataDownSync.kt b/app/src/main/java/org/piramalswasthya/cho/model/DoctorDataDownSync.kt
index d0613586e..ba38c1317 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/DoctorDataDownSync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/DoctorDataDownSync.kt
@@ -30,6 +30,7 @@ data class ReferData(
     val createdDate: String?,
     val lastModDate: String?,
     val vanID: Int?,
+    val facilityID: Int?,
     val parkingPlaceID: Int?,
     val refrredToAdditionalServiceList: List<String>,
     val referralReason: String?,
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/EarDiagnosisAssessment.kt b/app/src/main/java/org/piramalswasthya/cho/model/EarDiagnosisAssessment.kt
new file mode 100644
index 000000000..d511db3c9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/EarDiagnosisAssessment.kt
@@ -0,0 +1,52 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "EAR_DIAGNOSIS_ASSESSMENT")
+@JsonClass(generateAdapter = true)
+data class EarDiagnosisAssessment(
+
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+
+    @ColumnInfo(name = "difficulty_hearing")
+    var difficultyHearing: Boolean? = null,
+
+    @ColumnInfo(name = "whisper_test_response")
+    var whisperTestResponse: String? = null,
+
+    @ColumnInfo(name = "hearing_test_outcome")
+    var hearingTestOutcome: String? = null,
+
+    @ColumnInfo(name = "ear_pain")
+    var earPain: Boolean? = null,
+
+    @ColumnInfo(name = "ear_discharge_present")
+    var earDischargePresent: Boolean? = null,
+
+    @ColumnInfo(name = "foreign_body_in_ear")
+    var foreignBodyInEar: String? = null,
+
+    @ColumnInfo(name = "ear_condition_type")
+    var earConditionType: String? = null,
+
+    @ColumnInfo(name = "congenital_ear_malformation")
+    var congenitalEarMalformation: Boolean? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0
+
+) : FormDataModel
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ElderlyHealthAssessment.kt b/app/src/main/java/org/piramalswasthya/cho/model/ElderlyHealthAssessment.kt
new file mode 100644
index 000000000..31016bdaf
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ElderlyHealthAssessment.kt
@@ -0,0 +1,102 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "ELDERLY_HEALTH_ASSESSMENT",
+    indices = [
+        Index(name = "index_elderly_health_assessment_patient_visit", value = ["patient_id", "ben_visit_no"], unique = true)
+    ]
+)
+@JsonClass(generateAdapter = true)
+data class ElderlyHealthAssessment(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int = 0,
+
+    @ColumnInfo(name = "geriatric_complaints")
+    var geriatricComplaints: Boolean? = null,
+
+    @ColumnInfo(name = "multiple_chronic_conditions")
+    var multipleChronicConditions: Boolean? = null,
+
+    @ColumnInfo(name = "recent_falls")
+    var recentFalls: Boolean? = null,
+
+    @ColumnInfo(name = "difficulty_walking_balance")
+    var difficultyWalkingBalance: Boolean? = null,
+
+    @ColumnInfo(name = "visual_hearing_difficulty")
+    var visualHearingDifficulty: Boolean? = null,
+
+    @ColumnInfo(name = "functional_decline")
+    var functionalDecline: Boolean? = null,
+
+    @ColumnInfo(name = "bathing")
+    var bathing: Int? = null,
+
+    @ColumnInfo(name = "dressing")
+    var dressing: Int? = null,
+
+    @ColumnInfo(name = "toileting")
+    var toileting: Int? = null,
+
+    @ColumnInfo(name = "transferring")
+    var transferring: Int? = null,
+
+    @ColumnInfo(name = "continence")
+    var continence: Int? = null,
+
+    @ColumnInfo(name = "feeding")
+    var feeding: Int? = null,
+
+    @ColumnInfo(name = "total_score")
+    var totalScore: Int? = null,
+
+    @ColumnInfo(name = "functional_status")
+    var functionalStatus: String? = null,
+
+    @ColumnInfo(name = "functional_decline_flag")
+    var functionalDeclineFlag: Boolean? = null,
+
+    @ColumnInfo(name = "memory_loss")
+    var memoryLoss: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_memory_loss")
+    var dementiaMemoryLoss: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_disorientation")
+    var dementiaDisorientation: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_behavioural_changes")
+    var dementiaBehaviouralChanges: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_self_care_decline")
+    var dementiaSelfCareDecline: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_screening_outcome")
+    var dementiaScreeningOutcome: String? = null,
+
+    @ColumnInfo(name = "dementia_referral_required")
+    var dementiaReferralRequired: Boolean? = null,
+
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0,
+
+    @Embedded
+    val referralFollowUp: ReferralFollowUpFields = ReferralFollowUpFields()
+
+) : FormDataModel, ReferralFollowUpModel by referralFollowUp
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleRegCache.kt b/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleRegCache.kt
new file mode 100644
index 000000000..d90584e21
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleRegCache.kt
@@ -0,0 +1,186 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+import com.squareup.moshi.Json
+import org.piramalswasthya.cho.configuration.FormDataModel
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import org.piramalswasthya.cho.utils.HelperUtil
+import java.util.concurrent.TimeUnit
+
+/**
+ * Eligible Couple Registration Cache
+ * Stores registration data for eligible couples in the RMNCHA+ module
+ */
+@Entity(
+    tableName = "ELIGIBLE_COUPLE_REG",
+    foreignKeys = [ForeignKey(
+        entity = Patient::class,
+        parentColumns = arrayOf("patientID"),
+        childColumns = arrayOf("patientID"),
+        onUpdate = ForeignKey.CASCADE,
+        onDelete = ForeignKey.CASCADE
+    )],
+    indices = [Index(name = "ecrInd", value = ["patientID"])]
+)
+data class EligibleCoupleRegCache(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int = 0,
+    val patientID: String,
+    var dateOfReg: Long = System.currentTimeMillis(),
+    var lmpDate: Long? = null,
+    var noOfChildren: Int = 0,
+    var noOfLiveChildren: Int = 0,
+    var noOfMaleChildren: Int = 0,
+    var noOfFemaleChildren: Int = 0,
+    var isRegistered: Boolean = true,
+    var processed: String? = "N",
+    var createdBy: String,
+    var createdDate: Long = System.currentTimeMillis(),
+    var updatedBy: String,
+    val updatedDate: Long = System.currentTimeMillis(),
+    var syncState: SyncState
+) : FormDataModel
+
+/**
+ * Patient with Eligible Couple Registration data
+ */
+data class PatientWithECRCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val ecr: EligibleCoupleRegCache?
+) {
+    fun asDomainModel(): PatientWithEcrDomain {
+        return PatientWithEcrDomain(
+            patient = patient,
+            ecr = ecr
+        )
+    }
+}
+
+/**
+ * Domain model for displaying patient with EC registration
+ */
+data class PatientWithEcrDomain(
+    val patient: Patient,
+    val ecr: EligibleCoupleRegCache?,
+    var syncState: SyncState? = ecr?.syncState
+) {
+    /**
+     * Calculate EC status based on LMP date
+     * Returns "Missed Period" if LMP date is > 35 days ago, otherwise "Under Review"
+     */
+    fun getECStatus(): String {
+        val finalLmpDate = ecr?.lmpDate ?: lmpDateFromTracking
+        return if (finalLmpDate != null && finalLmpDate > 0L) {
+            val daysSinceLMP = TimeUnit.MILLISECONDS.toDays(
+                System.currentTimeMillis() - finalLmpDate
+            )
+            if (daysSinceLMP > 35) "Missed Period" else "Under Review"
+        } else {
+            "Under Review"
+        }
+    }
+
+    /**
+     * Check if the missed period indicator should be shown (red icon)
+     */
+    fun showMissedPeriodIndicator(): Boolean {
+        return ecr?.lmpDate?.let {
+            val daysSinceLMP = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - it)
+            daysSinceLMP > 35
+        } ?: false
+    }
+
+    /**
+     * Get formatted LMP date string
+     */
+    fun getFormattedLMPDate(): String {
+        val finalLmpDate = ecr?.lmpDate ?: lmpDateFromTracking
+        return if (finalLmpDate != null && finalLmpDate > 0L) {
+            HelperUtil.getDateStringFromLong(finalLmpDate) ?: "NA"
+        } else {
+            "NA"
+        }
+    }
+
+    /**
+     * Get patient's age string for display (e.g. "30 YEARS" or "NA").
+     */
+    fun getAgeString(): String {
+        return patient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+    }
+
+    /**
+     * Get last visit date string for display.
+     * This will be set by the adapter/fragment after loading ECT data.
+     */
+    var lastVisitDate: Long? = null
+    var methodOfContraception: String? = null
+    var antraNextDueDate: Long? = null
+    var antraInjectionDate: Long? = null
+    var lmpDateFromTracking: Long? = null
+
+    /**
+     * Get formatted last visit date string
+     */
+    fun getLastVisitDateString(): String {
+        return lastVisitDate?.let { visitDate ->
+            if (visitDate > 0L) HelperUtil.getDateStringFromLong(visitDate) ?: "NA"
+            else "NA"
+        } ?: "NA"
+    }
+
+    /**
+     * Get formatted ANTRA next due date string (range if possible)
+     */
+    fun getAntraDueDateString(): String {
+        // Create fresh each call so Locale.getDefault() reflects the current app language
+        val dueDateFormat = java.text.SimpleDateFormat("dd-MM-yyyy", java.util.Locale.getDefault())
+        return antraInjectionDate?.let { injectionDate ->
+            if (injectionDate > 0L) {
+                val cal = java.util.Calendar.getInstance()
+                cal.timeInMillis = injectionDate
+
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 76)
+                val startDate = dueDateFormat.format(cal.timeInMillis)
+
+                cal.timeInMillis = injectionDate
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 120)
+                val endDate = dueDateFormat.format(cal.timeInMillis)
+
+                "$startDate to $endDate"
+            } else "NA"
+        } ?: antraNextDueDate?.let { dueDate ->
+            if (dueDate > 0L) dueDateFormat.format(dueDate) else "NA"
+        } ?: "NA"
+    }
+}
+
+/**
+ * Network model for syncing EC registration data
+ */
+data class EcrPost(
+    val benId: Long,
+    @Json(name = "registrationDate")
+    val dateOfReg: String? = null,
+    val lmpDate: String? = null,
+    val numChildren: Int? = null,
+    val numLiveChildren: Int? = null,
+    val numMaleChildren: Int? = null,
+    val numFemaleChildren: Int? = null,
+    var isRegistered: Boolean = true,
+    var createdBy: String,
+    val createdDate: String,
+    var updatedBy: String,
+    val updatedDate: String
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleTrackingCache.kt b/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleTrackingCache.kt
index d858312f0..520c4917c 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleTrackingCache.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/EligibleCoupleTrackingCache.kt
@@ -1,17 +1,15 @@
 package org.piramalswasthya.cho.model
 
-import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import androidx.room.Relation
+import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.JsonClass
 import org.piramalswasthya.cho.configuration.FormDataModel
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.utils.DateTimeUtil.Companion.getDateTimeStringFromLong
 import java.text.SimpleDateFormat
-import java.util.Calendar
 import java.util.Locale
 
 @Entity(
@@ -31,11 +29,21 @@ data class EligibleCoupleTrackingCache(
     val id: Int = 0,
     val patientID: String,
     var visitDate: Long = System.currentTimeMillis(),
+    var financialYear: String? = null,
+    var visitMonth: String? = null,
+    var lmpDate: Long? = null,
     var isPregnancyTestDone: String? = null,
     var pregnancyTestResult: String? = null,
     var isPregnant: String? = null,
     var usingFamilyPlanning: Boolean? = null,
     var methodOfContraception: String? = null,
+    var anyOtherMethod: String? = null,
+    // ANTRA Injection fields
+    var antraDose: String? = null,
+    var antraInjectionDate: Long? = null,
+    var antraDueDate: Long? = null,
+    // Sterilization fields
+    var dateOfSterilization: Long? = null,
     val createdBy: String,
     val createdDate: Long = System.currentTimeMillis(),
     val updatedBy: String,
@@ -46,117 +54,124 @@ data class EligibleCoupleTrackingCache(
 ) : FormDataModel {
 
     companion object {
-        private val dateFormat = SimpleDateFormat("EEE, MMM dd yyyy", Locale.getDefault())
-
         fun getECTFilledDateFromLong(long: Long): String {
+            // Create fresh each call so Locale.getDefault() reflects the current app language
+            val dateFormat = SimpleDateFormat("EEE, MMM dd yyyy", Locale.getDefault())
             return "Visited on ${dateFormat.format(long)}"
         }
     }
 
+    fun getAntraDueDateString(): String {
+        // Create fresh each call so Locale.getDefault() reflects the current app language
+        val dueDateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.getDefault())
+        return antraInjectionDate?.let { injectionDate ->
+            if (injectionDate > 0L) {
+                val cal = java.util.Calendar.getInstance()
+                cal.timeInMillis = injectionDate
+
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 76)
+                val startDate = dueDateFormat.format(cal.timeInMillis)
+
+                cal.timeInMillis = injectionDate
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 120)
+                val endDate = dueDateFormat.format(cal.timeInMillis)
+
+                "$startDate to $endDate"
+            } else "NA"
+        } ?: antraDueDate?.let { dueDate ->
+            if (dueDate > 0L) dueDateFormat.format(dueDate) else "NA"
+        } ?: "NA"
+    }
+
     fun asNetworkModel(benId: Long): ECTNetwork {
         return ECTNetwork(
+            id = 0,
             benId = benId,
             visitDate = getDateTimeStringFromLong(visitDate)!!,
+            financialYear = financialYear,
+            visitMonth = visitMonth,
+            lmpDate = lmpDate?.let { getDateTimeStringFromLong(it) },
             isPregnancyTestDone = isPregnancyTestDone,
             pregnancyTestResult = pregnancyTestResult,
             isPregnant = isPregnant,
             usingFamilyPlanning = usingFamilyPlanning,
             methodOfContraception = methodOfContraception,
+            anyOtherMethod = anyOtherMethod,
+            antraDose = antraDose,
+            dateOfAntraInjection = antraInjectionDate?.let { getDateTimeStringFromLong(it) },
+            dueDateOfAntraInjection = antraDueDate?.let { getDateTimeStringFromLong(it) },
+            dateOfSterilization = dateOfSterilization?.let { getDateTimeStringFromLong(it) },
             isActive = isActive,
             createdBy = createdBy,
             createdDate = getDateTimeStringFromLong(createdDate)!!,
             updatedBy = updatedBy,
             updatedDate = getDateTimeStringFromLong(updatedDate)!!,
+            mpaFile = null,
+            dischargeSummary1 = null,
+            dischargeSummary2 = null,
         )
     }
 }
 
 @JsonClass(generateAdapter = true)
 data class ECTNetwork(
-    val benId: Long,
-    val visitDate: String,
-    val isPregnancyTestDone: String?,
-    val pregnancyTestResult: String?,
-    val isPregnant: String?,
-    val usingFamilyPlanning: Boolean?,
-    val methodOfContraception: String?,
-    var isActive: Boolean?,
-    val createdBy: String,
-    val createdDate: String,
-    val updatedBy: String,
-    val updatedDate: String,
-)
-
-//data class BenWithEcTrackingCache(
-////    @ColumnInfo(name = "benId")
-////    val ecBenId: Long,
-//
-//    @Embedded
-//    val ben: BenBasicCache,
-//    @Relation(
-//        parentColumn = "benId", entityColumn = "benId"
-//    )
-//    val ecr: EligibleCoupleRegCache,
-//
-//    @Relation(
-//        parentColumn = "benId", entityColumn = "benId", entity = EligibleCoupleTrackingCache::class
-//    )
-//    val savedECTRecords: List<EligibleCoupleTrackingCache>
-//) {
-//
-//    companion object {
-//        private val dateFormat = SimpleDateFormat("EEE, MMM dd yyyy", Locale.getDefault())
-//
-//        private fun getECTFilledDateFromLong(long: Long): String {
-//            return "Visited on ${dateFormat.format(long)}"
-//        }
-//    }
-//
-//    fun asDomainModel(): BenWithEctListDomain {
-//        val recentFill = savedECTRecords.maxByOrNull { it.visitDate }
-//        val allowFill = recentFill?.let {
-//            val cal = Calendar.getInstance()
-//            val currentMonth = cal.get(Calendar.MONTH)
-//            val currentYear = cal.get(Calendar.YEAR)
-//            cal.apply { timeInMillis = recentFill.visitDate }
-//            val lastVisitMonth = cal.get(Calendar.MONTH)
-//            val lastVisitYear = cal.get(Calendar.YEAR)
-//            !(currentYear==lastVisitYear && currentMonth == lastVisitMonth)
-//        } ?: true
-//        return BenWithEctListDomain(
-////            ecBenId,
-//            ben.asBasicDomainModel(),
-//            ecr.noOfLiveChildren.toString(),
-//            allowFill,
-//            savedECTRecords.map {
-//                ECTDomain(
-//                    it.benId,
-//                    it.createdDate,
-//                    it.visitDate,
-//                    getECTFilledDateFromLong(it.visitDate),
-//                    it.syncState
-//                )
-//            }
-//        )
-//    }
-//}
-//
-//data class ECTDomain(
-//    val benId: Long,
-//    val created: Long,
-//    val visited: Long,
-//    val filledOnString: String,
-//    val syncState: SyncState
-//)
-//
-//data class BenWithEctListDomain(
-////    val benId: Long,
-//    val ben: BenBasicDomain,
-//    val numChildren: String,
-//    val allowFill: Boolean,
-//    val savedECTRecords: List<ECTDomain>,
-//    val allSynced: SyncState? = if (savedECTRecords.isEmpty()) null else
-//        if (savedECTRecords.map { it.syncState }
-//                .all { it == SyncState.SYNCED }) SyncState.SYNCED else SyncState.UNSYNCED
-//
-//)
\ No newline at end of file
+    val id: Int? = null,
+    @SerializedName(value = "benId", alternate = ["beneficiaryID", "beneficiaryId", "beneficiaryRegID", "beneficiaryRegId", "benID"])
+    val benId: Long? = null,
+    @SerializedName(value = "visitDate", alternate = ["visitdate"])
+    val visitDate: String? = null,
+    val financialYear: String? = null,
+    val visitMonth: String? = null,
+    val lmpDate: String? = null,
+    val isPregnancyTestDone: String? = null,
+    val pregnancyTestResult: String? = null,
+    val isPregnant: String? = null,
+    val usingFamilyPlanning: Boolean? = null,
+    val methodOfContraception: String? = null,
+    val anyOtherMethod: String? = null,
+    val antraDose: String? = null,
+    @SerializedName(value = "dateOfAntraInjection", alternate = ["antraInjectionDate"])
+    val dateOfAntraInjection: String? = null,
+    @SerializedName(value = "dueDateOfAntraInjection", alternate = ["antraDueDate"])
+    val dueDateOfAntraInjection: String? = null,
+    val dateOfSterilization: String? = null,
+    var isActive: Boolean? = null,
+    val createdBy: String? = null,
+    val createdDate: String? = null,
+    val updatedBy: String? = null,
+    val updatedDate: String? = null,
+    val mpaFile: String? = null,
+    val dischargeSummary1: String? = null,
+    val dischargeSummary2: String? = null,
+) {
+    /**
+     * Convert server response into a local [EligibleCoupleTrackingCache] entity.
+     * @param patientID local patient ID mapped from [benId].
+     */
+    fun toCache(patientID: String): EligibleCoupleTrackingCache {
+        return EligibleCoupleTrackingCache(
+            patientID = patientID,
+            visitDate = org.piramalswasthya.cho.network.getLongFromDate(visitDate),
+            financialYear = financialYear,
+            visitMonth = visitMonth,
+            lmpDate = lmpDate?.let { org.piramalswasthya.cho.network.getLongFromDate(it) },
+            isPregnancyTestDone = isPregnancyTestDone,
+            pregnancyTestResult = pregnancyTestResult,
+            isPregnant = isPregnant,
+            usingFamilyPlanning = usingFamilyPlanning,
+            methodOfContraception = methodOfContraception,
+            anyOtherMethod = anyOtherMethod,
+            antraDose = antraDose,
+            antraInjectionDate = dateOfAntraInjection?.let { org.piramalswasthya.cho.network.getLongFromDate(it) },
+            antraDueDate = dueDateOfAntraInjection?.let { org.piramalswasthya.cho.network.getLongFromDate(it) },
+            dateOfSterilization = dateOfSterilization?.let { org.piramalswasthya.cho.network.getLongFromDate(it) },
+            createdBy = createdBy ?: "system",
+            createdDate = org.piramalswasthya.cho.network.getLongFromDate(createdDate),
+            updatedBy = updatedBy ?: (createdBy ?: "system"),
+            updatedDate = org.piramalswasthya.cho.network.getLongFromDate(updatedDate),
+            processed = "P",
+            isActive = isActive ?: true,
+            syncState = org.piramalswasthya.cho.database.room.SyncState.SYNCED
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ExaminationDetails.kt b/app/src/main/java/org/piramalswasthya/cho/model/ExaminationDetails.kt
index 2151ce99e..07702175f 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/ExaminationDetails.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ExaminationDetails.kt
@@ -48,7 +48,7 @@ data class CardioVascularExamination(
     val pericardialRub: String?,
     val providerServiceMapID: String?,
     val secondHeartSound_S2: String?,
-    val vanID: Int?
+    val facilityID: Int?
 ){
     constructor(user: UserDomain?, benFlow: BenFlow?) : this(
         null,
@@ -64,7 +64,7 @@ data class CardioVascularExamination(
         null,
         user?.serviceMapId.toString(),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -83,7 +83,7 @@ data class CentralNervousSystemExamination(
     val sensorySystem: String?,
     val signsOfMeningealIrritation: String?,
     val skull: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    autonomicSystem: null
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
@@ -113,7 +113,7 @@ data class CentralNervousSystemExamination(
         null,
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -133,7 +133,7 @@ data class GastroIntestinalExamination(
     val parkingPlaceID: Int?,
     val percussion: String?,
     val providerServiceMapID: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    analRegion: null
 //    auscultation: null
 //    benVisitID: null
@@ -165,7 +165,7 @@ data class GastroIntestinalExamination(
         user?.parkingPlaceId,
         null,
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -196,7 +196,7 @@ data class GeneralExamination(
     val quickening: String?,
     val typeOfDangerSigns: String?,
     val typeOfLymphadenopathy: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    builtAndAppearance:null
@@ -250,7 +250,7 @@ data class GeneralExamination(
         null,
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -264,7 +264,7 @@ data class GenitoUrinarySystemExamination(
     val providerServiceMapID: String?,
     val renalAngle: String?,
     val suprapubicRegion: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    createdBy:"Pranathi"
@@ -284,7 +284,7 @@ data class GenitoUrinarySystemExamination(
         user?.serviceMapId.toString(),
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -310,7 +310,7 @@ data class HeadToToeExamination(
     val throat: String?,
     val trunk: String?,
     val upperLimbs: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    breastAndNipples:null
@@ -354,7 +354,7 @@ data class HeadToToeExamination(
         null,
         null,
         null,
-        user?.vanId,
+        user?.facilityID,
     )
 }
 
@@ -374,7 +374,7 @@ data class MusculoskeletalSystemExamination(
     val spine: String?,
     val upperLimb_Abnormality: String?,
     val upperLimb_Laterality: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    chestWall:null
@@ -406,7 +406,7 @@ data class MusculoskeletalSystemExamination(
         null,
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -428,7 +428,7 @@ data class RespiratorySystemExamination(
     val providerServiceMapID: String?,
     val signsOfRespiratoryDistress: String?,
     val trachea: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    auscultation_BreathSounds: null
 //    auscultation_ConductedSounds: null
 //    auscultation_Crepitations: null
@@ -464,6 +464,6 @@ data class RespiratorySystemExamination(
         user?.serviceMapId.toString(),
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/FormElement.kt b/app/src/main/java/org/piramalswasthya/cho/model/FormElement.kt
index cd4fedecc..ae8c596d3 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/FormElement.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/FormElement.kt
@@ -11,8 +11,8 @@ data class FormElement(
     @ArrayRes var arrayId : Int = -1,
     var entries: Array<String>? = null,
     var doubleStar: Boolean = false,
-    val hasDependants: Boolean = false,
-    val hasAlertError: Boolean = false,
+    var hasDependants: Boolean = false,
+    var hasAlertError: Boolean = false,
     var value: String? = null,
     val regex: String? = null,
     val allCaps: Boolean = false,
@@ -32,4 +32,18 @@ data class FormElement(
     var isEnabled: Boolean = true,
     var headingLine: Boolean = true,
     val showYearFirstInDatePicker : Boolean = false,
+    /** Date format for DATE_PICKER (e.g. "dd/MM/yyyy"). Null = use default dd-MM-yyyy. */
+    var dateFormat: String? = null,
+    var booleanValue: Boolean? = null,
+    var trueIndex: Int? = null,
+    var falseIndex: Int? = null,
+    /**
+     * When true, editing this field rebinds the consecutive sibling rows that share a
+     * cross-field validation rule (e.g. Delivery Outcome = Live Birth + Still Birth) so
+     * their error states refresh together. Opt-in per field: do NOT key this off the
+     * element id, because ids are reused across datasets (id 15/16/17 are height/weight/bmi
+     * in the PW registration form) and rebinding the focused EditText on every keystroke
+     * steals focus mid-typing.
+     */
+    val refreshSiblingsOnChange: Boolean = false,
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/HistoryDetails.kt b/app/src/main/java/org/piramalswasthya/cho/model/HistoryDetails.kt
index 11f368bbe..b8990c3fb 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/HistoryDetails.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/HistoryDetails.kt
@@ -53,7 +53,7 @@ data class ChildVaccineDetails(
     val createdBy: String?,
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //benVisitID: null
 //beneficiaryRegID: "33195"
 //childOptionalVaccineList:[{vaccineName: null, sctCode: null, sctTerm: null, otherVaccineName: null, ageUnitID: null,…}]
@@ -69,7 +69,7 @@ data class ChildVaccineDetails(
         user?.userName,
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -100,7 +100,7 @@ data class ComorbidConditions(
     val createdBy: String?,
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //comorbidityConcurrentConditionsList:[{comorbidConditions: null, otherComorbidCondition: null}]
@@ -116,7 +116,7 @@ data class ComorbidConditions(
         user?.userName,
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -149,7 +149,7 @@ data class DevelopmentHistory(
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
     val socialMilestones: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    createdBy:"Pranathi"
@@ -181,7 +181,7 @@ data class DevelopmentHistory(
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -196,7 +196,7 @@ data class FamilyHistory(
     val isGeneticDisorder: String?,
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    createdBy:"Pranathi"
@@ -218,7 +218,7 @@ data class FamilyHistory(
         null,
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -257,7 +257,7 @@ data class FeedingHistory(
     val providerServiceMapID: String?,
     val typeOfFeed: String?,
     val typeOfFoodIntolerances: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    benVisitID: null
 //    beneficiaryRegID: "33195"
 //    compFeedStartAge:null
@@ -283,7 +283,7 @@ data class FeedingHistory(
         user?.serviceMapId.toString(),
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -297,7 +297,7 @@ data class FemaleObstetricHistory(
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
     val totalNoOfPreg: Int?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33211"
 //    complicationPregList:[]
@@ -317,7 +317,7 @@ data class FemaleObstetricHistory(
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -391,7 +391,7 @@ data class MedicationHistoryNetwork(
     val medicationHistoryList: List<MedicationHistoryList>?,
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33212"
 //    createdBy:"Pranathi"
@@ -407,7 +407,7 @@ data class MedicationHistoryNetwork(
         arrayListOf(MedicationHistoryList()),
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -435,7 +435,7 @@ data class MenstrualHistory(
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
     val regularity: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //        benVisitID:null
 //        beneficiaryRegID:"33212"
 //        bloodFlowDuration:null
@@ -465,7 +465,7 @@ data class MenstrualHistory(
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -478,7 +478,7 @@ data class PastHistory(
     val pastIllness: List<PastIllness>?,
     val pastSurgery: List<PastSurgery>?,
     val providerServiceMapID: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33212"
 //    createdBy:"Pranathi"
@@ -496,7 +496,7 @@ data class PastHistory(
         arrayListOf(PastIllness()),
         arrayListOf(PastSurgery()),
         user?.serviceMapId.toString(),
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -549,7 +549,7 @@ data class PerinatalHistroy(
     val placeOfDelivery: String?,
     val providerServiceMapID: String?,
     val typeOfDelivery: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33212"
 //    birthWeightG:null
@@ -583,7 +583,7 @@ data class PerinatalHistroy(
         null,
         user?.serviceMapId.toString(),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -603,7 +603,7 @@ data class PersonalHistory(
     val riskySexualPracticesStatus: String?,
     val tobaccoList: List<Tobacco>?,
     val tobaccoUseStatus: String?,
-    val vanID: Int?
+    val facilityID: Int?
 //    alcoholIntakeStatus: null
 //    alcoholList: [{alcoholTypeID: null, typeOfAlcohol: null, otherAlcoholType: null, alcoholIntakeFrequency: null,…}]
 //    allergicList:[{allergyType: null, allergyName: null, snomedTerm: null, snomedCode: null,…}]
@@ -635,7 +635,7 @@ data class PersonalHistory(
         null,
         arrayListOf(Tobacco()),
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/Icon.kt b/app/src/main/java/org/piramalswasthya/cho/model/Icon.kt
new file mode 100644
index 000000000..2a10e7d8e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/Icon.kt
@@ -0,0 +1,13 @@
+package org.piramalswasthya.cho.model
+
+import androidx.navigation.NavDirections
+import kotlinx.coroutines.flow.Flow
+
+data class Icon(
+    val icon: Int,
+    val title: String,
+    val count: Flow<Int>?,
+    val navAction: NavDirections,
+    val colorPrimary: Boolean = true,
+    val allowRedBorder: Boolean = false
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/InfantReg.kt b/app/src/main/java/org/piramalswasthya/cho/model/InfantReg.kt
new file mode 100644
index 000000000..296893e61
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/InfantReg.kt
@@ -0,0 +1,494 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+import org.piramalswasthya.cho.configuration.FormDataModel
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.network.getLongFromDate
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.TimeZone
+
+private fun formatMotherFullName(patient: Patient): String {
+    return "${patient.firstName} ${patient.lastName ?: ""}".trim()
+}
+
+private fun formatBabyOrdinalName(motherFirstName: String?, babyIndex: Int): String {
+    return when (babyIndex) {
+        0 -> "1st baby of $motherFirstName"
+        1 -> "2nd baby of $motherFirstName"
+        2 -> "3rd baby of $motherFirstName"
+        else -> "${babyIndex + 1}th baby of $motherFirstName"
+    }
+}
+
+@Entity(
+    tableName = "INFANT_REG",
+    foreignKeys = [ForeignKey(
+        entity = Patient::class,
+        parentColumns = arrayOf("patientID"),
+        childColumns = arrayOf("motherPatientID"),
+        onUpdate = ForeignKey.CASCADE,
+        onDelete = ForeignKey.CASCADE
+    )],
+    indices = [Index(name = "infRegInd", value = ["motherPatientID"])]
+)
+data class InfantRegCache(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+    var childPatientID: String? = null,
+    val motherPatientID: String,
+    var isActive: Boolean,
+    var babyName: String? = null,
+    var babyIndex: Int,
+    var infantTerm: String? = null,
+    var corticosteroidGiven: String? = null,
+    var genderID: Int? = null,
+    var babyCriedAtBirth: Boolean? = null,
+    var resuscitation: Boolean? = null,
+    var referred: String? = null,
+    var hadBirthDefect: String? = null,
+    var birthDefect: String? = null,
+    var otherDefect: String? = null,
+    var weight: Double? = null,
+    var breastFeedingStarted: Boolean? = null,
+    var opv0Dose: Long? = null,
+    var bcgDose: Long? = null,
+    var hepBDose: Long? = null,
+    var vitkDose: Long? = null,
+
+    // BRD Neonatal Outcome fields
+    /** Q2: Live Birth / Still Birth (Macerated) / Still Birth (Fresh) / Died during delivery */
+    var outcomeAtBirth: String? = null,
+    /** Q5: Comma-separated multi-select resuscitation types */
+    var typeOfResuscitation: String? = null,
+    /** Q10: Comma-separated multi-select newborn complications */
+    var newbornComplications: String? = null,
+    /** Q11: Healthy and with mother / Admitted (SNCU/NICU) / Admitted (General ward) / Died */
+    var currentStatusOfBaby: String? = null,
+    /** Q12: Comma-separated multi-select cause of death */
+    var causeOfDeath: String? = null,
+    /** Q13: Other cause of death free text */
+    var otherCauseOfDeath: String? = null,
+    /** Q14: Comma-separated multi-select vaccines (BCG, Hepatitis B, OPV-0, None) */
+    var birthDoseVaccinesGiven: String? = null,
+    /** Q15: Reason for not giving vaccines */
+    var reasonForNoVaccines: String? = null,
+    /** Q16: Vitamin K injection given */
+    var vitaminKInjectionGiven: Boolean? = null,
+    /** Q17: Reason for not giving Vitamin K */
+    var reasonForNoVitaminK: String? = null,
+    /** Q18: Yes / In process / No (Not applied) */
+    var birthCertificateIssued: String? = null,
+
+    var processed: String? = "N",
+    var createdBy: String,
+    val createdDate: Long = System.currentTimeMillis(),
+    var updatedBy: String,
+    var updatedDate: Long = System.currentTimeMillis(),
+    var syncState: SyncState
+) : FormDataModel {
+    fun hasRegistrationData(): Boolean {
+        return !infantTerm.isNullOrBlank() ||
+            !corticosteroidGiven.isNullOrBlank() ||
+            genderID != null ||
+            babyCriedAtBirth != null ||
+            resuscitation != null ||
+            !referred.isNullOrBlank() ||
+            !hadBirthDefect.isNullOrBlank() ||
+            !birthDefect.isNullOrBlank() ||
+            !otherDefect.isNullOrBlank() ||
+            weight != null ||
+            breastFeedingStarted != null ||
+            opv0Dose != null ||
+            bcgDose != null ||
+            hepBDose != null ||
+            vitkDose != null ||
+            !outcomeAtBirth.isNullOrBlank() ||
+            !typeOfResuscitation.isNullOrBlank() ||
+            !newbornComplications.isNullOrBlank() ||
+            !currentStatusOfBaby.isNullOrBlank() ||
+            !causeOfDeath.isNullOrBlank() ||
+            !otherCauseOfDeath.isNullOrBlank() ||
+            !birthDoseVaccinesGiven.isNullOrBlank() ||
+            !reasonForNoVaccines.isNullOrBlank() ||
+            vitaminKInjectionGiven != null ||
+            !reasonForNoVitaminK.isNullOrBlank() ||
+            !birthCertificateIssued.isNullOrBlank()
+    }
+
+    private fun getDateStringFromLong(dateLong: Long?): String? {
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
+        dateLong?.let {
+            return dateFormat.format(dateLong)
+        } ?: run {
+            return null
+        }
+    }
+
+    fun asPostModel(): InfantRegPost {
+        return InfantRegPost(
+            id = id,
+            patientID = motherPatientID,
+            childPatientID = childPatientID,
+            isActive = isActive,
+            babyName = babyName,
+            babyIndex = babyIndex,
+            infantTerm = infantTerm,
+            corticosteroidGiven = corticosteroidGiven,
+            genderID = genderID,
+            babyCriedAtBirth = babyCriedAtBirth,
+            resuscitation = resuscitation,
+            referred = referred,
+            hadBirthDefect = hadBirthDefect,
+            birthDefect = birthDefect,
+            otherDefect = otherDefect,
+            weight = weight,
+            breastFeedingStarted = breastFeedingStarted,
+            opv0Dose = opv0Dose?.let { getDateStringFromLong(it) },
+            bcgDose = bcgDose?.let { getDateStringFromLong(it) },
+            hepBDose = hepBDose?.let { getDateStringFromLong(it) },
+            vitkDose = vitkDose?.let { getDateStringFromLong(it) },
+            outcomeAtBirth = outcomeAtBirth,
+            typeOfResuscitation = typeOfResuscitation,
+            newbornComplications = newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued,
+            createdDate = getDateStringFromLong(createdDate),
+            createdBy = createdBy,
+            updatedDate = getDateStringFromLong(updatedDate),
+            updatedBy = updatedBy
+        )
+    }
+}
+
+/**
+ * Patient with Delivery Outcome and Infant Registration data
+ */
+data class PatientWithDeliveryOutcomeAndInfantRegCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val deliveryOutcome: List<DeliveryOutcomeCache>?,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "motherPatientID"
+    )
+    val savedInfantRegRecords: List<InfantRegCache>
+) {
+    fun asDomainModel(): List<InfantRegDomain> {
+        val activeDo = deliveryOutcome?.firstOrNull { it.isActive } ?: return emptyList()
+        val activeIr = savedInfantRegRecords.filter { it.isActive }
+        val list = mutableListOf<InfantRegDomain>()
+        val totalBirths = (activeDo.deliveryOutcome ?: ((activeDo.liveBirth ?: 0) + (activeDo.stillBirth ?: 0)))
+            .coerceAtLeast(0)
+        if (totalBirths == 0) return emptyList()
+        val numLiveBirth = (activeDo.liveBirth ?: 0).coerceAtLeast(0)
+
+        for (i in 0 until totalBirths) {
+            list.add(
+                InfantRegDomain(
+                    motherPatient = patient,
+                    babyIndex = i,
+                    deliveryOutcome = activeDo,
+                    savedIr = activeIr.firstOrNull { it.babyIndex == i },
+                    isLiveBirth = i < numLiveBirth
+                )
+            )
+        }
+        return list
+    }
+}
+
+/**
+ * Domain model for displaying infant registration list
+ */
+data class InfantRegDomain(
+    val motherPatient: Patient,
+    val babyIndex: Int,
+    var babyName: String = "Baby ${babyIndex + 1} of ${motherPatient.firstName}",
+    val deliveryOutcome: DeliveryOutcomeCache,
+    val savedIr: InfantRegCache?,
+    val isLiveBirth: Boolean = true,
+    val syncState: SyncState? = savedIr?.syncState
+) {
+    /**
+     * Get formatted baby name (1st baby, 2nd baby, etc.)
+     */
+    val customName: String
+        get() = savedIr?.babyName?.takeIf { it.isNotBlank() }
+            ?: formatBabyOrdinalName(motherPatient.firstName, babyIndex)
+
+    /**
+     * Get mother's full name
+     */
+    fun getMotherFullName(): String {
+        return formatMotherFullName(motherPatient)
+    }
+
+    /**
+     * Get mother's age string for display (e.g. "29 YEARS" or "NA").
+     */
+    fun getMotherAgeString(): String {
+        return motherPatient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+    }
+
+    /**
+     * Check if infant is registered
+     */
+    fun isRegistered(): Boolean = savedIr?.hasRegistrationData() == true
+
+    /**
+     * Only live-birth rows should show Register when not yet saved.
+     * Non-live-birth rows are always View state in list.
+     */
+    fun shouldShowRegisterAction(): Boolean = isLiveBirth && !isRegistered()
+
+    /**
+     * Guard clicks for non-live-birth rows with no saved record.
+     */
+    fun isActionEnabled(): Boolean = isLiveBirth || isRegistered()
+}
+
+data class InfantRegPost(
+    val id: Long = 0,
+    val patientID: String,
+    val childPatientID: String?,
+    val isActive: Boolean,
+    val babyName: String? = null,
+    val babyIndex: Int,
+    val infantTerm: String? = null,
+    val corticosteroidGiven: String? = null,
+    val genderID: Int? = null,
+    val babyCriedAtBirth: Boolean? = null,
+    val resuscitation: Boolean? = null,
+    val referred: String? = null,
+    val hadBirthDefect: String? = null,
+    val birthDefect: String? = null,
+    val otherDefect: String? = null,
+    val weight: Double? = null,
+    val breastFeedingStarted: Boolean? = null,
+    val opv0Dose: String? = null,
+    val bcgDose: String? = null,
+    val hepBDose: String? = null,
+    val vitkDose: String? = null,
+    val outcomeAtBirth: String? = null,
+    val typeOfResuscitation: String? = null,
+    val newbornComplications: String? = null,
+    val currentStatusOfBaby: String? = null,
+    val causeOfDeath: String? = null,
+    val otherCauseOfDeath: String? = null,
+    val birthDoseVaccinesGiven: String? = null,
+    val reasonForNoVaccines: String? = null,
+    val vitaminKInjectionGiven: Boolean? = null,
+    val reasonForNoVitaminK: String? = null,
+    val birthCertificateIssued: String? = null,
+    val createdDate: String? = null,
+    val createdBy: String,
+    val updatedDate: String? = null,
+    val updatedBy: String
+) {
+    fun toCacheModel(): InfantRegCache {
+        return InfantRegCache(
+            id = id,
+            motherPatientID = patientID,
+            childPatientID = childPatientID,
+            isActive = isActive,
+            babyName = babyName,
+            babyIndex = babyIndex,
+            infantTerm = infantTerm,
+            corticosteroidGiven = corticosteroidGiven,
+            genderID = genderID,
+            babyCriedAtBirth = babyCriedAtBirth,
+            resuscitation = resuscitation,
+            referred = referred,
+            hadBirthDefect = hadBirthDefect,
+            birthDefect = birthDefect,
+            otherDefect = otherDefect,
+            weight = weight,
+            breastFeedingStarted = breastFeedingStarted,
+            opv0Dose = getLongFromDate(opv0Dose),
+            bcgDose = getLongFromDate(bcgDose),
+            hepBDose = getLongFromDate(hepBDose),
+            vitkDose = getLongFromDate(vitkDose),
+            outcomeAtBirth = outcomeAtBirth,
+            typeOfResuscitation = typeOfResuscitation,
+            newbornComplications = newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued,
+            processed = "P",
+            createdBy = createdBy,
+            createdDate = getLongFromDate(createdDate),
+            updatedBy = updatedBy,
+            updatedDate = getLongFromDate(updatedDate),
+            syncState = SyncState.SYNCED
+        )
+    }
+}
+
+/**
+ * FLW API payload for infant registration sync.
+ * Uses beneficiary IDs (benId/childBenId) to align with server contract.
+ */
+data class InfantRegApiPost(
+    val id: Long = 0,
+    val benId: Long,
+    val childBenId: Long,
+    val isActive: Boolean,
+    val babyName: String? = null,
+    val babyIndex: Int,
+    val infantTerm: String? = null,
+    val corticosteroidGiven: String? = null,
+    val gender: String? = null,
+    val babyCriedAtBirth: Boolean? = null,
+    val resuscitation: Boolean? = null,
+    val referred: String? = null,
+    val hadBirthDefect: String? = null,
+    val birthDefect: String? = null,
+    val otherDefect: String? = null,
+    val weight: Double = 0.0,
+    val breastFeedingStarted: Boolean? = null,
+    val opv0Dose: String? = null,
+    val bcgDose: String? = null,
+    val hepBDose: String? = null,
+    val vitkDose: String? = null,
+    val deliveryDischargeSummary1: String? = null,
+    val deliveryDischargeSummary2: String? = null,
+    val deliveryDischargeSummary3: String? = null,
+    val deliveryDischargeSummary4: String? = null,
+    val isSNCU: String? = null,
+    val outcomeAtBirth: String? = null,
+    val typeOfResuscitation: String? = null,
+    val newbornComplications: String? = null,
+    val currentStatusOfBaby: String? = null,
+    val causeOfDeath: String? = null,
+    val otherCauseOfDeath: String? = null,
+    val birthDoseVaccinesGiven: String? = null,
+    val reasonForNoVaccines: String? = null,
+    val vitaminKInjectionGiven: Boolean? = null,
+    val reasonForNoVitaminK: String? = null,
+    val birthCertificateIssued: String? = null,
+    val createdDate: String? = null,
+    val createdBy: String? = null,
+    val updatedDate: String? = null,
+    val updatedBy: String? = null
+)
+
+/**
+ * HWC Child API payload (`/child/saveAll`, `/child/getAll`).
+ */
+data class ChildApiPost(
+    val id: Long = 0,
+    val benId: Long,
+    val babyName: String? = null,
+    val infantTerm: String? = null,
+    val corticosteroidGiven: String? = null,
+    val gender: String? = null,
+    val babyCriedAtBirth: Boolean? = null,
+    val resuscitation: Boolean? = null,
+    val referred: String? = null,
+    val hadBirthDefect: String? = null,
+    val birthDefect: String? = null,
+    val otherDefect: String? = null,
+    val weight: Double = 0.0,
+    val breastFeedingStarted: Boolean? = null,
+    val opv0Dose: String? = null,
+    val bcgDose: String? = null,
+    val hepBDose: String? = null,
+    val vitkDose: String? = null,
+    val createdDate: String? = null,
+    val createdBy: String? = null,
+    val updatedDate: String? = null,
+    val updatedBy: String? = null
+)
+
+fun getIsoDateTimeStringFromLong(dateLong: Long?): String? {
+    if (dateLong == null) return null
+    return SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.ENGLISH).apply {
+        timeZone = TimeZone.getTimeZone("UTC")
+    }.format(dateLong)
+}
+
+/**
+ * Infant Registration with Patient (mother and child) relation
+ * Used for Child Registration list
+ */
+data class InfantRegWithPatient(
+    @Embedded
+    val infant: InfantRegCache,
+    @Relation(
+        parentColumn = "motherPatientID",
+        entityColumn = "patientID"
+    )
+    val motherPatient: Patient,
+    @Relation(
+        parentColumn = "childPatientID",
+        entityColumn = "patientID"
+    )
+    val childPatient: Patient?
+) {
+    fun asDomainModel(): ChildRegDomain {
+        return ChildRegDomain(
+            motherPatient = motherPatient,
+            infant = infant,
+            childPatient = childPatient
+        )
+    }
+}
+
+/**
+ * Domain model for displaying child registration list
+ */
+data class ChildRegDomain(
+    val motherPatient: Patient,
+    val infant: InfantRegCache,
+    val childPatient: Patient?,
+    val syncState: SyncState? = infant.syncState,
+    val displaySyncState: SyncState? = if (infant.processed == "C" || childPatient != null) infant.syncState else null
+) {
+    /**
+     * Get formatted baby name (baby 0, baby 1, etc.)
+     */
+    val customName: String
+        get() {
+            val childFullName = childPatient?.let {
+                "${it.firstName.orEmpty()} ${it.lastName.orEmpty()}".trim()
+            }?.takeIf { it.isNotBlank() }
+
+            return childFullName
+                ?: infant.babyName?.takeIf { it.isNotBlank() }
+                ?: formatBabyOrdinalName(motherPatient.firstName, infant.babyIndex)
+        }
+
+    /**
+     * Get mother's full name
+     */
+    fun getMotherFullName(): String {
+        return formatMotherFullName(motherPatient)
+    }
+
+    /**
+     * Check if child patient is registered
+     */
+    fun isChildRegistered(): Boolean = infant.processed == "C" || childPatient != null
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/InputType.kt b/app/src/main/java/org/piramalswasthya/cho/model/InputType.kt
index 8dd9e0f13..2ae50cf7e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/InputType.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/InputType.kt
@@ -11,5 +11,8 @@ package org.piramalswasthya.cho.model
         CHECKBOXES,
         TIME_PICKER,
         HEADLINE,
-        AGE_PICKER
+        AGE_PICKER,
+        FILE_UPLOAD
+        
+
     }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/LoginSettingsData.kt b/app/src/main/java/org/piramalswasthya/cho/model/LoginSettingsData.kt
index 7ceca6248..636e49c31 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/LoginSettingsData.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/LoginSettingsData.kt
@@ -30,4 +30,4 @@ data class LoginSettingsData(
 )
 
 
-data class LocationRequest(val vanID: Int, val spPSMID: String, val userID: Int)
\ No newline at end of file
+data class LocationRequest(val facilityID: Int, val spPSMID: String, val userID: Int)
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/MaternalHealth.kt b/app/src/main/java/org/piramalswasthya/cho/model/MaternalHealth.kt
index 9267a8e72..280fbe48c 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/MaternalHealth.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/MaternalHealth.kt
@@ -10,10 +10,14 @@ import org.piramalswasthya.cho.configuration.FormDataModel
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.helpers.Konstants
 import org.piramalswasthya.cho.helpers.getDateString
+import org.piramalswasthya.cho.helpers.getCurrentWeeksOfPregnancy
 import org.piramalswasthya.cho.helpers.getTodayMillis
 import org.piramalswasthya.cho.helpers.getWeeksOfPregnancy
+import android.content.Context
 import org.piramalswasthya.cho.network.getLongFromDate
+import org.piramalswasthya.cho.utils.DateTimeUtil
 import org.piramalswasthya.cho.utils.HelperUtil.getDateStringFromLong
+import org.piramalswasthya.cho.utils.ImgUtils
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -93,6 +97,8 @@ data class PregnantWomanRegistrationCache(
     val id: Long = 0,
     val patientID: String,
     var dateOfRegistration: Long = System.currentTimeMillis(),
+    var pregnancyTestAtFacility: String? = null,
+    var uptResult: String? = null,
     var mcpCardNumber: Long? = 0,
     var rchId: Long? = 0,
     var lmpDate: Long = 0,
@@ -106,6 +112,8 @@ data class PregnantWomanRegistrationCache(
     var vdrlRprTestResult: String? = null,
     var vdrlRprTestResultId: Int = 0,
     var dateOfVdrlRprTest: Long? = null,
+    var historyOfAbortions: Boolean? = null,
+    var previousLSCS: Boolean? = null,
 
     var hivTestResult: String? = null,
     var hivTestResultId: Int = 0,
@@ -119,6 +127,7 @@ data class PregnantWomanRegistrationCache(
     var otherPastIllness: String? = null,
     var is1st: Boolean = true,
     var numPrevPregnancy: Int? = null,
+    var para: Int? = null,
     var complicationPrevPregnancy: String? = null,
     var complicationPrevPregnancyId: Int? = null,
     var otherComplication: String? = null,
@@ -134,6 +143,7 @@ data class PregnantWomanRegistrationCache(
     var createdDate: Long = System.currentTimeMillis(),
     var updatedBy: String,
     var updatedDate: Long = System.currentTimeMillis(),
+    var isFirstAncSubmitted: Boolean = false,
     var syncState: SyncState
 ) : FormDataModel {
 
@@ -183,55 +193,351 @@ data class PregnantWomanRegistrationCache(
     }
 }
 
-//data class BenWithPwrCache(
-//    @Embedded
-//    val ben: BenBasicCache,
-//    @Relation(
-//        parentColumn = "benId", entityColumn = "benId"
-//    )
-//    val pwr: List<PregnantWomanRegistrationCache>,
-//
-//    ) {
-//    fun asPwrDomainModel(): BenWithPwrDomain {
-//        return BenWithPwrDomain(
-//            ben = ben.asBasicDomainModel(),
-//            pwr = pwr.firstOrNull { it.active }
-//        )
-//    }
-//
-//    fun asBenBasicDomainModelForHRPPregAssessmentForm(): BenBasicDomainForForm {
-//
-//        return BenBasicDomainForForm(
-//            benId = ben.benId,
-//            hhId = ben.hhId,
-//            regDate = BenBasicCache.dateFormat.format(Date(ben.regDate)),
-//            benName = ben.benName,
-//            benSurname = ben.benSurname ?: "",
-//            gender = ben.gender.name,
-//            dob = ben.dob,
-//            mobileNo = ben.mobileNo.toString(),
-//            fatherName = ben.fatherName,
-//            familyHeadName = ben.familyHeadName ?: "",
-//            spouseName = ben.spouseName ?: "",
-//            lastMenstrualPeriod = getDateStringFromLong(ben.lastMenstrualPeriod),
-//            edd = getEddFromLmp(ben.lastMenstrualPeriod),
-////            typeOfList = typeOfList.name,
-//            rchId = ben.rchId ?: "Not Available",
-//            hrpStatus = ben.hrpStatus,
-//            form1Filled = ben.hrppaFilled,
-//            syncState = ben.hrppaSyncState,
-//            form2Enabled = true,
-//            form2Filled = ben.hrpmbpFilled
-//        )
-//    }
-//
-//}
+/**
+ * Patient with Pregnant Woman Registration data.
+ * Relation is a list; the active/most-recent record is selected when building the domain.
+ */
+data class PatientWithPwrCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val pwr: List<PregnantWomanRegistrationCache>,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val ancRecords: List<PregnantWomanAncCache>
+) {
+    /**
+     * Active PWR record, or if none active the most recent by createdDate.
+     */
+    fun getActiveOrLatestPwr(): PregnantWomanRegistrationCache? =
+        pwr.filter { it.active }.maxByOrNull { it.createdDate }
+            ?: pwr.maxByOrNull { it.createdDate }
 
-//data class BenWithPwrDomain(
-////    val benId: Long,
-//    val ben: BenBasicDomain,
-//    val pwr: PregnantWomanRegistrationCache?
-//)
+    fun asDomainModel(): PatientWithPwrDomain {
+        return PatientWithPwrDomain(
+            patient = patient,
+            pwr = getActiveOrLatestPwr(),
+            ancRecords = ancRecords
+        )
+    }
+}
+
+/**
+ * Domain model for displaying patient with pregnancy registration
+ */
+data class PatientWithPwrDomain(
+    val patient: Patient,
+    val pwr: PregnantWomanRegistrationCache?,
+    val ancRecords: List<PregnantWomanAncCache> = emptyList(),
+    val syncState: SyncState? = pwr?.syncState,
+    val lastAnc: PregnantWomanAncCache? = ancRecords.maxByOrNull { it.visitNumber },
+    var deliveryOutcomeSyncState: SyncState? = null
+) {
+    /**
+     * Get weeks of pregnancy
+     * Returns 0 if LMP date is missing or invalid (null or <= 0)
+     */
+    fun getWeeksOfPregnancy(): Int {
+        return if (pwr?.lmpDate != null && pwr.lmpDate > 0L) {
+            getCurrentWeeksOfPregnancy(pwr.lmpDate)
+        } else {
+            0
+        }
+    }
+
+    /**
+     * Get EDD (Expected Date of Delivery) - LMP + 280 days
+     * Returns 0L if LMP date is missing or invalid (null or <= 0)
+     */
+    fun getEDD(): Long {
+        return if (pwr?.lmpDate != null && pwr.lmpDate > 0L) {
+            pwr.lmpDate + TimeUnit.DAYS.toMillis(280)
+        } else {
+            0L
+        }
+    }
+
+    /**
+     * Get formatted LMP date string
+     * Returns "NA" if LMP date is missing or invalid (null or <= 0)
+     */
+    fun getFormattedLMPDate(): String {
+        return if (pwr?.lmpDate != null && pwr.lmpDate > 0L) {
+            getDateStringFromLong(pwr.lmpDate) ?: "NA"
+        } else {
+            "NA"
+        }
+    }
+
+    /**
+     * Get formatted EDD string
+     * Returns "NA" if LMP date is missing or invalid (null or <= 0)
+     */
+    fun getFormattedEDD(): String {
+        val edd = getEDD()
+        return if (edd > 0L) {
+            getDateStringFromLong(edd) ?: "NA"
+        } else {
+            "NA"
+        }
+    }
+
+    /**
+     * Get patient's age string for display (e.g. "29 YEARS" or "NA").
+     */
+    fun getAgeString(): String {
+        return patient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+    }
+
+    /**
+     * Indicates if the Delivery Outcome form has been filled and submitted for the patient.
+     * Default is false, but gets assigned when cross-referenced against the outcomes repo.
+     */
+    var isDeliveryOutcomeFilled: Boolean = false
+
+    /**
+     * Check if pregnancy is active
+     */
+    fun isActive(): Boolean {
+        return pwr?.active ?: false
+    }
+
+    /**
+     * Check if this is high-risk pregnancy
+     */
+    fun isHighRisk(): Boolean {
+        return pwr?.isHrp ?: false
+    }
+}
+
+private fun List<PregnantWomanRegistrationCache>.resolvePregnancyLmpDate(
+    fallbackLmp: Long? = null
+): Long =
+    filter { it.active && it.lmpDate > 0L }.maxByOrNull { it.createdDate }?.lmpDate
+        ?: filter { it.lmpDate > 0L }.maxByOrNull { it.createdDate }?.lmpDate
+        ?: fallbackLmp?.takeIf { it > 0 }
+        ?: 0L
+
+private fun resolveAbortionLmpDate(
+    pwrList: List<PregnantWomanRegistrationCache>,
+    abortionRecord: PregnantWomanAncCache?
+): Long = pwrList.resolvePregnancyLmpDate(abortionRecord?.lmpDate)
+
+/**
+ * Patient with PWR and ANC records (for abortion list).
+ * PWR is a list; active and latest-by-createdDate are selected when building the domain.
+ */
+data class PatientWithPwrAndAncCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val pwr: List<PregnantWomanRegistrationCache>,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val ancRecords: List<PregnantWomanAncCache>
+) {
+    fun asAbortionDomainModel(): AbortionDomain {
+        val abortionRecord = ancRecords.firstOrNull { it.isAborted && it.abortionDate != null }
+        val activePwr = pwr.filter { it.active }.maxByOrNull { it.createdDate }
+
+        val lmpDateToUse = resolveAbortionLmpDate(pwr, abortionRecord)
+
+        val eddDateToUse = if (lmpDateToUse != 0L) {
+            lmpDateToUse + TimeUnit.DAYS.toMillis(280)
+        } else 0L
+
+        // Same current GA as ANC visit list (today vs LMP), not GA at abortion/visit date.
+        val weekOfPregnancyToUse = if (lmpDateToUse != 0L) {
+            getCurrentWeeksOfPregnancy(lmpDateToUse).takeIf { it in 1..40 }
+        } else null
+
+        return AbortionDomain(
+            patient = patient,
+            pwr = activePwr,
+            abortionRecord = abortionRecord,
+            lmpDate = lmpDateToUse,
+            eddDate = eddDateToUse,
+            weekOfPregnancy = weekOfPregnancyToUse,
+            abortionDate = abortionRecord?.abortionDate
+        )
+    }
+}
+
+/**
+ * Domain model for displaying abortion list
+ */
+data class AbortionDomain(
+    val patient: Patient,
+    val pwr: PregnantWomanRegistrationCache?,
+    val abortionRecord: PregnantWomanAncCache?,
+    val lmpDate: Long,
+    val eddDate: Long,
+    val weekOfPregnancy: Int?,
+    val abortionDate: Long?,
+    val syncState: SyncState? = abortionRecord?.syncState
+) {
+    /**
+     * Get formatted LMP date string
+     */
+    fun getFormattedLMPDate(): String {
+        return if (lmpDate != 0L) {
+            getDateStringFromLong(lmpDate) ?: "NA"
+        } else "NA"
+    }
+
+    /**
+     * Get formatted EDD string
+     */
+    fun getFormattedEDD(): String {
+        return if (eddDate != 0L) {
+            getDateStringFromLong(eddDate) ?: "NA"
+        } else "NA"
+    }
+
+    /**
+     * Get formatted abortion date string
+     */
+    fun getFormattedAbortionDate(): String {
+        return abortionDate?.let { getDateStringFromLong(it) ?: "NA" } ?: "NA"
+    }
+
+    /**
+     * Get weeks of pregnancy string
+     */
+    fun getWeeksOfPregnancyString(): String {
+        return weekOfPregnancy?.takeIf { it <= 40 }?.toString() ?: "NA"
+    }
+
+    /**
+     * Get age string from patient DOB for display (e.g. "25 YEARS" or "NA").
+     */
+    fun getAgeString(): String {
+        return patient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+    }
+
+    /**
+     * Check if the dedicated abortion form has been submitted. abortionType and
+     * abortionFacility get set during the ANC visit when the pregnancy outcome
+     * is marked aborted, so they cannot indicate this form's submission state.
+     * methodOfTermination and terminationDoneBy are required fields on this
+     * form and are only written by PregnantWomanAncAbortionDataset.mapValues.
+     */
+    val isAbortionFormFilled: Boolean
+        get() = abortionRecord?.let {
+            it.methodOfTermination != null && it.terminationDoneBy != null
+        } ?: false
+}
+
+/**
+ * Patient with PWR for PMSMA list
+ * Shows women registered for pregnancy (eligible for PMSMA)
+ */
+data class PatientWithPwrForPmsmaCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val pwr: PregnantWomanRegistrationCache?
+) {
+    fun asPmsmaDomainModel(): PmsmaDomain {
+        val activePwr = pwr?.takeIf { it.active }
+        
+        val lmpDateToUse = activePwr?.lmpDate ?: 0L
+        val eddDateToUse = if (lmpDateToUse != 0L) {
+            lmpDateToUse + TimeUnit.DAYS.toMillis(280)
+        } else 0L
+
+        val weekOfPregnancyToUse = if (lmpDateToUse != 0L) {
+            (TimeUnit.MILLISECONDS.toDays(getTodayMillis() - lmpDateToUse) / 7).toInt()
+        } else null
+
+        return PmsmaDomain(
+            patient = patient,
+            pwr = activePwr,
+            lmpDate = lmpDateToUse,
+            eddDate = eddDateToUse,
+            weekOfPregnancy = weekOfPregnancyToUse
+        )
+    }
+}
+
+/**
+ * Domain model for displaying PMSMA list
+ */
+data class PmsmaDomain(
+    val patient: Patient,
+    val pwr: PregnantWomanRegistrationCache?,
+    val lmpDate: Long,
+    val eddDate: Long,
+    val weekOfPregnancy: Int?
+) {
+    /**
+     * Get formatted LMP date string
+     */
+    fun getFormattedLMPDate(): String {
+        return if (lmpDate != 0L) {
+            getDateStringFromLong(lmpDate) ?: "NA"
+        } else "NA"
+    }
+
+    /**
+     * Get formatted EDD string
+     */
+    fun getFormattedEDD(): String {
+        return if (eddDate != 0L) {
+            getDateStringFromLong(eddDate) ?: "NA"
+        } else "NA"
+    }
+
+    /**
+     * Get weeks of pregnancy string
+     */
+    fun getWeeksOfPregnancyString(): String {
+        return weekOfPregnancy?.takeIf { it <= 40 }?.toString() ?: "NA"
+    }
+
+    /**
+     * Get patient's age string for display (e.g. "30 YEARS" or "NA").
+     */
+    fun getAgeString(): String {
+        return patient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+    }
+}
+
+/**
+ * Build a PmsmaDomain from the ANC-list source shape (PatientWithPwrCache).
+ * Mirrors PatientWithPwrForPmsmaCache.asPmsmaDomainModel so the e-PMSMA list can
+ * derive from the same Flow used by ANCVisitsFragment / getANCCount.
+ */
+fun PatientWithPwrCache.asPmsmaDomainModel(): PmsmaDomain {
+    val activePwr = getActiveOrLatestPwr()?.takeIf { it.active }
+    val lmpDateToUse = activePwr?.lmpDate ?: 0L
+    val eddDateToUse =
+        if (lmpDateToUse != 0L) lmpDateToUse + TimeUnit.DAYS.toMillis(280) else 0L
+    val weekOfPregnancyToUse =
+        if (lmpDateToUse != 0L)
+            (TimeUnit.MILLISECONDS.toDays(getTodayMillis() - lmpDateToUse) / 7).toInt()
+        else null
+    return PmsmaDomain(
+        patient = patient,
+        pwr = activePwr,
+        lmpDate = lmpDateToUse,
+        eddDate = eddDateToUse,
+        weekOfPregnancy = weekOfPregnancyToUse
+    )
+}
 
 data class PwrPost(
     val id: Long = 0,
@@ -333,6 +639,30 @@ data class PregnantWomanAncCache(
     var visitNumber: Int,
     var isActive: Boolean = true,
     var ancDate: Long = System.currentTimeMillis(),
+    var lmpDate: Long? = null,
+    var pregnancyTestAtFacility: Boolean? = null,
+    var uptResult: String? = null,
+    var uptResultId: Int = -1,
+
+    var visitDate: Long? = null,
+    var weekOfPregnancy: Int? = null,
+
+    var serialNo: String? = null,
+    var methodOfTermination: String? = null,
+    var methodOfTerminationId: Int? = 0,
+    var terminationDoneBy: String? = null,
+    var terminationDoneById: Int? = 0,
+    var isPaiucdId: Int? = 0,
+    var isYesOrNo: Boolean? = false,
+    var isPaiucd: String? = null,
+    var dateSterilisation: Long? = null,
+    var remarks: String? = null,
+    var abortionImg1: String? = null,
+    var abortionImg2: String? = null,
+    var placeOfDeath: String? = null,
+    var placeOfDeathId: Int? = 0,
+    var otherPlaceOfDeath: String? = null,
+
     var isAborted: Boolean = false,
     var abortionType: String? = null,
     var abortionTypeId: Int = 0,
@@ -340,18 +670,36 @@ data class PregnantWomanAncCache(
     var abortionFacilityId: Int = 0,
     var abortionDate: Long? = null,
     var weight: Int? = null,
+    var height: Int? = null,
+    val gravida: Int? = null,
+    val para: Int? = null,
+    val historyOfAbortions: Boolean? = null,
+    val previousLSCS: Boolean? = null,
+    val complicationsPrevPregnancy: String? = null,
+    val pastIllness: String? = null,
+    val vdrlRprTestResult: String? = null,
+    val vdrlRprTestResultId: Int? = null,
+    val dateOfVdrlRprTest: Long? = null,
+    val hivTestResult: String? = null,
+    val hivTestResultId: Int? = null,
+    val dateOfHivTest: Long? = null,
+    val hbsAgTestResult: String? = null,
+    val hbsAgTestResultId: Int? = null,
+    val dateOfHbsAgTest: Long? = null,
+    var numPrevPregnancy: Int? = null,
+    var otherComplication: String? = null,
     var bpSystolic: Int? = null,
     var bpDiastolic: Int? = null,
     var pulseRate: String? = null,
     var hb: Double? = null,
     var fundalHeight: Int? = null,
+    var anyHighRisk: Boolean? = null,
     var urineAlbumin: String? = null,
     var urineAlbuminId: Int = 0,
     var randomBloodSugarTest: String? = null,
     var randomBloodSugarTestId: Int = 0,
     var numFolicAcidTabGiven: Int = 0,
     var numIfaAcidTabGiven: Int = 0,
-    var anyHighRisk: Boolean? = null,
     var highRisk: String? = null,
     var highRiskId: Int = 0,
     var otherHighRisk: String? = null,
@@ -371,12 +719,39 @@ data class PregnantWomanAncCache(
     val createdDate: Long = System.currentTimeMillis(),
     var updatedBy: String,
     var updatedDate: Long = System.currentTimeMillis(),
-    var syncState: SyncState
+    var isFirstAncSubmitted: Boolean = false,
+    var syncState: SyncState,
+    var frontFilePath : String? = null,
+    var backFilePath : String? = null,
+
+    var bloodSugarFasting: Int? = null,  // Blood Sugar (Fasting) mg/dL
+    var urineSugar: String? = null,  // Urine Sugar dropdown value
+    var urineSugarId: Int = 0,  // Urine Sugar dropdown ID
+    var fetalHeartRate: Double? = null,  // FHR in bpm
+    var calciumGiven: Int = 0,  // Calcium tablets given
+    var dangerSigns: String? = null,  // Danger Signs dropdown value
+    var dangerSignsId: Int = 0,  // Danger Signs dropdown ID
+    var counsellingProvided: Boolean? = null,  // Counselling Yes/No
+    var counsellingTopics: String? = null,  // Counselling Topics value
+    var counsellingTopicsId: Int = 0,  // Counselling Topics ID
+    var nextAncVisitDate: Long? = null  // Next ANC Visit Date
 ) : FormDataModel {
-    fun asPostModel(benId: Long): ANCPost {
+    fun asPostModel(
+        benId: Long,
+        benRegId: Long? = null,
+        providerServiceMapID: Int? = null,
+        context: Context? = null,
+    ): ANCPost {
+        // abortionImg1/2 hold an internal-storage file path. The server expects
+        // base64 — encode here, lazily, so the DB row stays small. When no
+        // context is supplied (callers that aren't uploading), pass through as-is.
+        val img1ForUpload = context?.let { ImgUtils.encodeLocalImageValueForUpload(it, abortionImg1) } ?: abortionImg1
+        val img2ForUpload = context?.let { ImgUtils.encodeLocalImageValueForUpload(it, abortionImg2) } ?: abortionImg2
         return ANCPost(
             benId = benId,
+            benRedId = benRegId,
             ancDate = getDateStringFromLong(ancDate),
+            visitDate = getDateStringFromLong(visitDate ?: ancDate),
             isActive = true,
             ancVisit = visitNumber,
             isAborted = isAborted,
@@ -384,12 +759,18 @@ data class PregnantWomanAncCache(
             abortionFacility = abortionFacility,
             abortionDate = abortionDate?.let { getDateStringFromLong(it) },
             weightOfPW = weight,
+            pregnancyTestAtFacility = pregnancyTestAtFacility,
+            uptResult = uptResult,
             bpSystolic = bpSystolic,
             bpDiastolic = bpDiastolic,
             pulseRate = pulseRate?.toInt(),
             hb = hb,
             fundalHeight = fundalHeight,
-            urineAlbuminPresent = urineAlbumin == "Present",
+            urineAlbuminPresent = when (urineAlbumin) {
+                null, "Negative", "Trace", "Absent" -> false
+                "Present", "+", "++", "+++" -> true
+                else -> null
+            },
             bloodSugarTestDone = randomBloodSugarTest == "Done",
             folicAcidTabs = numFolicAcidTabGiven,
             ifaTabs = numIfaAcidTabGiven,
@@ -407,7 +788,29 @@ data class PregnantWomanAncCache(
             createdDate = getDateStringFromLong(createdDate),
             createdBy = createdBy,
             updatedDate = getDateStringFromLong(updatedDate),
-            updatedBy = updatedBy
+            updatedBy = updatedBy,
+            providerServiceMapID = providerServiceMapID,
+            filePath = frontFilePath,
+            serialNo = serialNo,
+            methodOfTermination = methodOfTermination,
+            methodOfTerminationId = methodOfTerminationId,
+            terminationDoneBy = terminationDoneBy,
+            terminationDoneById = terminationDoneById,
+            isPaiucdId = isPaiucdId,
+            isPaiucd = isPaiucd,
+            remarks = remarks,
+            abortionImg1 = img1ForUpload,
+            abortionImg2 = img2ForUpload,
+            dateSterilisation = dateSterilisation?.let { getDateStringFromLong(it) },
+            isYesOrNo = isYesOrNo
+//            bloodSugarFasting = bloodSugarFasting,
+//            urineSugar = urineSugar,
+//            fetalHeartRate = fetalHeartRate,
+//            calciumGiven = calciumGiven ?: 0,
+//            dangerSigns = dangerSigns,
+//            counsellingProvided = counsellingProvided,
+//            counsellingTopics = counsellingTopics,
+//            nextAncVisitDate = nextAncVisitDate?.let { getDateStringFromLong(it) }
         )
     }
 }
@@ -415,9 +818,13 @@ data class PregnantWomanAncCache(
 data class ANCPost(
     val id: Long = 0,
     val benId: Long = 0,
+    val benRedId: Long? = null,
     val ancDate: String? = null,
+    val visitDate: String? = null,
     val isActive: Boolean,
     val ancVisit: Int,
+    val pregnancyTestAtFacility: Boolean? = null,
+    val uptResult: String? = null,
     val isAborted: Boolean = false,
     val abortionType: String? = null,
     val abortionFacility: String? = null,
@@ -447,32 +854,97 @@ data class ANCPost(
     val createdDate: String? = null,
     val createdBy: String,
     val updatedDate: String? = null,
-    val updatedBy: String
+    val updatedBy: String,
+    val lmpDate: String? = null,
+    val providerServiceMapID: Int? = null,
+    val filePath: String? = null,
+    val serialNo: String? = null,
+    val methodOfTermination: String? = null,
+    val methodOfTerminationId: Int? = null,
+    val terminationDoneBy: String? = null,
+    val terminationDoneById: Int? = null,
+    val isPaiucdId: Int? = null,
+    val isPaiucd: String? = null,
+    val remarks: String? = null,
+    val abortionImg1: String? = null,
+    val abortionImg2: String? = null,
+    val placeOfDeath: String? = null,
+    val placeOfDeathId: Int? = null,
+    val otherPlaceOfDeath: String? = null,
+    val dateSterilisation: String? = null,
+    val isYesOrNo: Boolean? = null,
+    val placeOfAnc: String? = null,
+    val placeOfAncId: Int? = null,
+    // New ANC fields
+//    val bloodSugarFasting: Int? = null,
+//    val urineSugar: String? = null,
+//    val fetalHeartRate: Double? = null,
+//    val calciumGiven: Int? = null,
+//    val dangerSigns: String? = null,
+//    val counsellingProvided: Boolean? = null,
+//    val counsellingTopics: String? = null,
+//    val nextAncVisitDate: String? = null
 ) {
     fun toAncCache(): PregnantWomanAncCache {
+        val resolvedAbortionType = abortionType ?: methodOfTermination
+        val resolvedAbortionFacility = abortionFacility ?: terminationDoneBy
+
         return PregnantWomanAncCache(
             id = id,
             patientID = "",
             visitNumber = ancVisit,
-            ancDate = getLongFromDate(ancDate),
+            ancDate = getLongFromDate(ancDate ?: visitDate),
+            pregnancyTestAtFacility = pregnancyTestAtFacility,
+            uptResult = uptResult,
+            uptResultId = when(uptResult) {
+                "Positive" -> 0
+                "Negative" -> 1
+                else -> -1
+            },
             isAborted = isAborted,
-            abortionType = abortionType,
-//            abortionTypeId =
-            abortionFacility = abortionFacility,
-//            abortionFacilityId
+            abortionType = resolvedAbortionType,
+            abortionTypeId = when(resolvedAbortionType) {
+                "Induced" -> 0
+                "Spontaneous" -> 1
+                else -> methodOfTerminationId ?: -1
+            }.let { if (it < 0) 0 else it },
+            abortionFacility = resolvedAbortionFacility,
+            abortionFacilityId = when(resolvedAbortionFacility) {
+                "Govt. Hospital" -> 0
+                "Pvt. Hospital" -> 1
+                else -> terminationDoneById ?: -1
+            }.let { if (it < 0) 0 else it },
             abortionDate = getLongFromDate(abortionDate),
             weight = weightOfPW,
             bpSystolic = bpSystolic,
             bpDiastolic = bpDiastolic,
-            pulseRate = pulseRate.toString(),
+            pulseRate = pulseRate?.toString(),
             hb = hb,
             fundalHeight = fundalHeight,
-            urineAlbumin = if (urineAlbuminPresent == true) "Present" else "Absent",
+            urineAlbumin = when (urineAlbuminPresent) {
+                true -> "+"
+                false -> "Negative"
+                null -> null
+            },
 //            urineAlbuminId
             randomBloodSugarTest = if (bloodSugarTestDone == true) "Done" else "Not Done",
 //            randomBloodSugarTestId
             numFolicAcidTabGiven = folicAcidTabs,
             numIfaAcidTabGiven = ifaTabs,
+            serialNo = serialNo,
+            methodOfTermination = methodOfTermination,
+            methodOfTerminationId = methodOfTerminationId ?: 0,
+            terminationDoneBy = terminationDoneBy,
+            terminationDoneById = terminationDoneById ?: 0,
+            isPaiucdId = isPaiucdId ?: 0,
+            isPaiucd = isPaiucd,
+            remarks = remarks,
+            visitDate = getLongFromDate(visitDate).takeIf { it > 0L }
+                ?: getLongFromDate(ancDate ?: visitDate),
+            isYesOrNo = isYesOrNo,
+            abortionImg1 = abortionImg1,
+            abortionImg2 = abortionImg2,
+            dateSterilisation = getLongFromDate(dateSterilisation),
             anyHighRisk = isHighRisk,
             highRisk = highRiskCondition,
 //            highRiskId
@@ -493,7 +965,18 @@ data class ANCPost(
             createdDate = getLongFromDate(createdDate),
             updatedBy = updatedBy,
             updatedDate = getLongFromDate(updatedDate),
-            syncState = SyncState.SYNCED
+            syncState = SyncState.SYNCED,
+            frontFilePath = filePath,
+            backFilePath = null,
+            // Map new ANC fields
+//            bloodSugarFasting = bloodSugarFasting,
+//            urineSugar = urineSugar,
+//            fetalHeartRate = fetalHeartRate,
+//            calciumGiven = calciumGiven ?: 0,
+//            dangerSigns = dangerSigns,
+//            counsellingProvided = counsellingProvided,
+//            counsellingTopics = counsellingTopics,
+//            nextAncVisitDate = getLongFromDate(nextAncVisitDate)
         )
     }
 }
@@ -579,4 +1062,40 @@ data class ANCPost(
 //    val hasPmsma: Boolean,
 //    val showViewAnc: Boolean = anc.isEmpty(),
 //    val syncState: SyncState?
-//)
\ No newline at end of file
+//)
+
+data class AncDueListItem(
+    val patientID: String,
+    val gestationalAgeWeeks: Int,
+    val ancStage: Int
+)
+
+data class AncCompletedListItem(
+    val patientID: String,
+    val ancStage: Int,
+    val visitNumber: Int
+)
+
+
+@Entity(
+    tableName = "ASHA_DUE_LIST",
+    foreignKeys = [ForeignKey(
+        entity = Patient::class,
+        parentColumns = arrayOf("patientID"),
+        childColumns = arrayOf("patientID"),
+        onUpdate = ForeignKey.CASCADE,
+        onDelete = ForeignKey.CASCADE
+    )],
+    indices = [Index(name = "ind_asha_due", value = ["patientID", "listType"], unique = true)]
+)
+data class AshaDueListCache(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+    val patientID: String,
+    val beneficiaryID: Long? = null,
+    val listType: String = "ANC",
+    val addedDate: Long = System.currentTimeMillis(),
+    val ashaId: Int = 0,
+    val createdBy: String,
+    var syncState: SyncState = SyncState.UNSYNCED
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/MentalHealthScreeningCache.kt b/app/src/main/java/org/piramalswasthya/cho/model/MentalHealthScreeningCache.kt
new file mode 100644
index 000000000..798df822f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/MentalHealthScreeningCache.kt
@@ -0,0 +1,269 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import androidx.room.Index
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(
+    tableName = "MENTAL_HEALTH_SCREENING",
+    indices = [
+        Index(value = ["patient_id"], name = "index_mhs_patient_id"),
+        Index(value = ["patient_id", "ben_visit_no"], name = "index_mhs_patient_visit")
+    ]
+)
+@JsonClass(generateAdapter = true)
+data class MentalHealthScreeningCache(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "screening_id")
+    val screeningId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+
+    @ColumnInfo(name = "emotional_behavioural_concerns")
+    var emotionalBehaviouralConcerns: Boolean? = null,
+
+
+    @ColumnInfo(name = "substance_use_concerns")
+    var substanceUseConcerns: Boolean? = null,
+
+
+    @ColumnInfo(name = "self_harm_suicide_thoughts")
+    var selfHarmSuicideThoughts: Boolean? = null,
+
+
+    @ColumnInfo(name = "memory_loss_confusion")
+    var memoryLossConfusion: Boolean? = null,
+
+
+    @ColumnInfo(name = "seizures_fits_loc")
+    var seizuresFitsLoc: Boolean? = null,
+
+
+    @ColumnInfo(name = "is_postpartum")
+    var isPostpartum: Boolean? = null,
+
+    @ColumnInfo(name = "phq9_little_interest")
+    var phq9LittleInterest: Int? = null,
+
+    @ColumnInfo(name = "phq9_feeling_down")
+    var phq9FeelingDown: Int? = null,
+
+    @ColumnInfo(name = "phq9_sleep_trouble")
+    var phq9SleepTrouble: Int? = null,
+
+    @ColumnInfo(name = "phq9_feeling_tired")
+    var phq9FeelingTired: Int? = null,
+
+    @ColumnInfo(name = "phq9_appetite")
+    var phq9Appetite: Int? = null,
+
+    @ColumnInfo(name = "phq9_feeling_bad")
+    var phq9FeelingBad: Int? = null,
+
+    @ColumnInfo(name = "phq9_concentration")
+    var phq9Concentration: Int? = null,
+
+    @ColumnInfo(name = "phq9_moving_slowly")
+    var phq9MovingSlowly: Int? = null,
+
+    @ColumnInfo(name = "phq9_self_harm_thoughts")
+    var phq9SelfHarmThoughts: Int? = null,
+
+    @ColumnInfo(name = "phq9_total_score")
+    var phq9TotalScore: Int? = null,
+
+    @ColumnInfo(name = "phq9_depression_severity")
+    var phq9DepressionSeverity: String? = null,
+
+    @ColumnInfo(name = "phq9_system_action")
+    var phq9SystemAction: String? = null,
+
+    @ColumnInfo(name = "substance_current_tobacco_use")
+    var substanceCurrentTobaccoUse: Boolean? = null,
+
+    @ColumnInfo(name = "substance_tobacco_type")
+    var substanceTobaccoType: String? = null,
+
+    @ColumnInfo(name = "substance_tobacco_frequency")
+    var substanceTobaccoFrequency: String? = null,
+
+    @ColumnInfo(name = "substance_tobacco_outcome")
+    var substanceTobaccoOutcome: String? = null,
+
+    @ColumnInfo(name = "substance_system_action")
+    var substanceSystemAction: String? = null,
+
+    @ColumnInfo(name = "substance_alcohol_use")
+    var substanceAlcoholUse: Boolean? = null,
+
+    @ColumnInfo(name = "substance_tobacco_use")
+    var substanceTobaccoUse: Boolean? = null,
+
+    @ColumnInfo(name = "substance_other_use")
+    var substanceOtherUse: Boolean? = null,
+
+    @ColumnInfo(name = "substance_other_specify")
+    var substanceOtherSpecify: String? = null,
+
+    @ColumnInfo(name = "substance_frequency")
+    var substanceFrequency: String? = null,
+
+    @ColumnInfo(name = "brief_intervention_given")
+    var briefInterventionGiven: Boolean? = null,
+
+
+    @ColumnInfo(name = "suicide_current_thoughts")
+    var suicideCurrentThoughts: Boolean? = null,
+
+    @ColumnInfo(name = "suicide_plan")
+    var suicidePlan: Boolean? = null,
+
+    @ColumnInfo(name = "suicide_previous_attempt")
+    var suicidePreviousAttempt: Boolean? = null,
+
+    @ColumnInfo(name = "suicide_hopelessness")
+    var suicideHopelessness: Boolean? = null,
+
+    @ColumnInfo(name = "suicide_immediate_assess")
+    var suicideImmediateAssess: Boolean? = null,
+
+    @ColumnInfo(name = "suicide_risk_level")
+    var suicideRiskLevel: String? = null,
+
+
+    @ColumnInfo(name = "dementia_progressive_memory_loss")
+    var dementiaProgressiveMemoryLoss: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_forgetting_recent")
+    var dementiaForgettingRecent: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_disorientation")
+    var dementiaDisorientation: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_daily_activities")
+    var dementiaDailyActivities: Boolean? = null,
+
+    @ColumnInfo(name = "dementia_behavioural_changes")
+    var dementiaBehaviouralChanges: Boolean? = null,
+
+    @ColumnInfo(name = "epilepsy_recurrent_seizures")
+    var epilepsyRecurrentSeizures: Boolean? = null,
+
+    @ColumnInfo(name = "epilepsy_jerky_movements")
+    var epilepsyJerkyMovements: Boolean? = null,
+
+    @ColumnInfo(name = "epilepsy_tongue_bite")
+    var epilepsyTongueBite: Boolean? = null,
+
+    @ColumnInfo(name = "epilepsy_confusion_after")
+    var epilepsyConfusionAfter: Boolean? = null,
+
+    @ColumnInfo(name = "epilepsy_loc_duration")
+    var epilepsyLocDuration: String? = null,
+
+    @ColumnInfo(name = "substance_alcohol_loss")
+    var substance_alcohol_loss: Boolean? = null,
+
+    @ColumnInfo(name = "substance_alcohol_impact")
+    var substanceAlcoholImpact: Boolean? = null,
+
+    @ColumnInfo(name = "substance_alcohol_withdrawal")
+    var substanceAlcoholWithdrawal: Boolean? = null,
+
+    @ColumnInfo(name = "substance_alcohol_problematic")
+    var substanceAlcoholProblematic: Boolean? = null,
+
+    @ColumnInfo(name = "substance_alcohol_classification")
+    var substanceAlcoholClassification: String? = null,
+
+    @ColumnInfo(name = "substance_alcohol_system_action")
+    var substanceAlcoholSystemAction: String? = null,
+
+    @ColumnInfo(name = "substance_alcohol_frequency")
+    var substance_alcohol_frequency: String? = null,
+
+    @ColumnInfo(name = "edRecurrentEpisodeloss")
+    var edRecurrentEpisodeloss: Boolean? = null,
+    @ColumnInfo(name = "ed_recurrent_jerky_movements")
+    var edRecurrentJerkyMovements: Boolean? = null,
+    @ColumnInfo(name = "ed_confusion_ordrowsiness")
+    var edConfusionordrowsiness: Boolean? = null,
+
+    @ColumnInfo(name = "ed_progressive_memory_loss")
+    var edProgressiveMemoryLoss: Boolean? = null,
+
+    @ColumnInfo(name = "ed_confusion_disorientation")
+    var edConfusionDisorientation: Boolean? = null,
+
+    @ColumnInfo(name = "ed_functional_decline")
+    var edFunctionalDecline: Boolean? = null,
+
+    @ColumnInfo(name = "ed_screening_outcome")
+    var edScreeningOutcome: String? = null,
+
+    @ColumnInfo(name = "ed_psychosocial_intervention_provided")
+    var edPsychosocialInterventionProvided: Boolean? = null,
+
+    @ColumnInfo(name = "ed_intervention_type")
+    var edInterventionType: String? = null,
+
+    @ColumnInfo(name = "ed_session_date")
+    var edSessionDate: String? = null,
+
+    @ColumnInfo(name = "ed_duration_minutes")
+    var edDurationMinutes: Int? = null,
+
+    @ColumnInfo(name = "ed_remarks")
+    var edRemarks: String? = null,
+
+    @ColumnInfo(name = "ed_referral_required")
+    var edReferralRequired: String? = null,
+
+    @ColumnInfo(name = "ed_reason")
+    var edReason: String? = null,
+
+    @ColumnInfo(name = "referral_required")
+    var referralRequired: Boolean? = null,
+
+    @ColumnInfo(name = "referral_level")
+    var referralLevel: String? = null,
+
+    @ColumnInfo(name = "reason_for_referral")
+    var reasonForReferral: String? = null,
+
+    @ColumnInfo(name = "referral_date")
+    var referralDate: String? = null,
+
+    @ColumnInfo(name = "follow_up_required")
+    var followUpRequired: Boolean? = null,
+
+    @ColumnInfo(name = "follow_up_date")
+    var followUpDate: String? = null,
+
+    @ColumnInfo(name = "improvement_noted")
+    var improvementNoted: String? = null,
+
+    @ColumnInfo(name = "adherence_to_advice")
+    var adherenceToAdvice: String? = null,
+
+    @ColumnInfo(name = "referral_escalation_required")
+    var referralEscalationRequired: Boolean? = null,
+
+    @ColumnInfo(name = "case_closure_reason")
+    var caseClosureReason: String? = null,
+
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0,
+
+) : FormDataModel
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/NeonatalOutcome.kt b/app/src/main/java/org/piramalswasthya/cho/model/NeonatalOutcome.kt
new file mode 100644
index 000000000..5be3776f1
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/NeonatalOutcome.kt
@@ -0,0 +1,212 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import org.piramalswasthya.cho.configuration.FormDataModel
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.network.getLongFromDate
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+/**
+ * Neonatal Outcome entity to track detailed newborn health information
+ * Linked to DeliveryOutcomeCache via deliveryOutcomeId
+ * Supports multiple neonates per delivery via neonateIndex
+ */
+@Entity(
+    tableName = "NEONATAL_OUTCOME",
+    foreignKeys = [ForeignKey(
+        entity = DeliveryOutcomeCache::class,
+        parentColumns = arrayOf("id"),
+        childColumns = arrayOf("deliveryOutcomeId"),
+        onUpdate = ForeignKey.CASCADE,
+        onDelete = ForeignKey.CASCADE
+    )],
+    indices = [Index(name = "neonatalOutcomeInd", value = ["deliveryOutcomeId"])]
+)
+data class NeonatalOutcomeCache(
+    @PrimaryKey(autoGenerate = true)
+    val id: Long = 0,
+    
+    /** Foreign key to DELIVERY_OUTCOME table */
+    val deliveryOutcomeId: Long,
+    
+    /** Index of this neonate (1 for 1st baby, 2 for 2nd baby in twins, etc.) */
+    val neonateIndex: Int,
+    
+    /** Unique Neonate ID generated for tracking (optional, for frontend display) */
+    var neonateUniqueId: String? = null,
+    
+    // Q1: Number of neonates is stored in delivery outcome (liveBirth + stillBirth)
+    
+    // Q2: Outcome at Birth
+    /** Live Birth, Still Birth (Macerated), Still Birth (Fresh), Died during delivery */
+    var outcomeAtBirth: String? = null,
+    var outcomeAtBirthId: Int? = null,
+    
+    // Q3: Sex
+    /** Male, Female, Ambiguous */
+    var sex: String? = null,
+    var sexId: Int? = null,
+    
+    // Q4: Cried immediately after birth?
+    /** Immediate cry, Cried after resuscitation, Not applicable (Stillbirth) */
+    var criedImmediately: String? = null,
+    var criedImmediatelyId: Int? = null,
+    
+    // Q5: Type of resuscitation (multi-select, comma-separated)
+    /** Stimulation, Suctioning, Bag and mask ventilation, Oxygen, Intubation, Chest compressions, Medications */
+    var typeOfResuscitation: String? = null,
+    
+    // Q6: Birth Weight (in grams)
+    var birthWeight: Int? = null,
+    
+    // Q7: Any congenital anomaly detected?
+    /** Yes, No, Suspected (under evaluation) */
+    var congenitalAnomalyDetected: String? = null,
+    var congenitalAnomalyDetectedId: Int? = null,
+    
+    // Q8: Type of congenital anomaly (multi-select, comma-separated)
+    /** Neural tube defect, Cleft lip/palate, Club foot, Down syndrome, Congenital heart defect, etc. */
+    var typeOfCongenitalAnomaly: String? = null,
+    
+    // Q9: Other congenital anomaly (if "Other" selected in Q8)
+    var otherCongenitalAnomaly: String? = null,
+    
+    // Q10: Newborn Complications (multi-select, comma-separated)
+    /** Birth asphyxia, Respiratory distress, Neonatal jaundice, Sepsis, Hypothermia, etc. */
+    var newbornComplications: String? = null,
+    
+    // Q11: Current Status of Baby
+    /** Healthy and with mother, Admitted (SNCU/NICU), Admitted (General ward), Died */
+    var currentStatusOfBaby: String? = null,
+    var currentStatusOfBabyId: Int? = null,
+    
+    // Q12: If baby died, cause of death (multi-select, comma-separated)
+    /** Birth asphyxia, Prematurity, Low birth weight complications, Sepsis, etc. */
+    var causeOfDeath: String? = null,
+    
+    // Q13: Other cause of death (if "Other" selected in Q12)
+    var otherCauseOfDeath: String? = null,
+    
+    // Q14: Birth dose vaccines given (multi-select, comma-separated)
+    /** BCG, Hepatitis B (Birth dose), OPV-0, None */
+    var birthDoseVaccinesGiven: String? = null,
+    
+    // Q15: Reason for not giving birth dose vaccines (if Q14 = None)
+    var reasonForNoVaccines: String? = null,
+    
+    // Q16: Vitamin K injection given?
+    /** Yes, No */
+    var vitaminKInjectionGiven: Boolean? = null,
+    
+    // Q17: Reason for not giving Vitamin K injection (if Q16 = No)
+    var reasonForNoVitaminK: String? = null,
+    
+    // Q18: Birth Certificate issued?
+    /** Yes, In process, No (Not applied) */
+    var birthCertificateIssued: String? = null,
+    var birthCertificateIssuedId: Int? = null,
+    
+    // Audit flags
+    /** True if stillbirth or died during delivery (triggers stillbirth audit) */
+    var isStillbirth: Boolean? = null,
+    
+    /** True if baby died after birth (triggers neonatal death audit) */
+    var isNeonatalDeath: Boolean? = null,
+    
+    // Sync and metadata fields
+    var processed: String? = "N",
+    var createdBy: String,
+    val createdDate: Long = System.currentTimeMillis(),
+    var updatedBy: String,
+    var updatedDate: Long = System.currentTimeMillis(),
+    var syncState: SyncState
+) : FormDataModel {
+    
+    fun getDateStringFromLong(dateLong: Long?): String? {
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH)
+        return dateLong?.let { dateFormat.format(it) }
+    }
+    
+    fun asPostModel(benId: Long): NeonatalOutcomePost {
+        return NeonatalOutcomePost(
+            id = id,
+            benId = benId,
+            deliveryOutcomeId = deliveryOutcomeId,
+            neonateIndex = neonateIndex,
+            neonateUniqueId = neonateUniqueId,
+            outcomeAtBirth = outcomeAtBirth,
+            outcomeAtBirthId = outcomeAtBirthId,
+            sex = sex,
+            sexId = sexId,
+            criedImmediately = criedImmediately,
+            criedImmediatelyId = criedImmediatelyId,
+            typeOfResuscitation = typeOfResuscitation,
+            birthWeight = birthWeight,
+            congenitalAnomalyDetected = congenitalAnomalyDetected,
+            congenitalAnomalyDetectedId = congenitalAnomalyDetectedId,
+            typeOfCongenitalAnomaly = typeOfCongenitalAnomaly,
+            otherCongenitalAnomaly = otherCongenitalAnomaly,
+            newbornComplications = newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby,
+            currentStatusOfBabyId = currentStatusOfBabyId,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued,
+            birthCertificateIssuedId = birthCertificateIssuedId,
+            isStillbirth = isStillbirth,
+            isNeonatalDeath = isNeonatalDeath,
+            createdDate = getDateStringFromLong(createdDate),
+            createdBy = createdBy,
+            updatedDate = getDateStringFromLong(updatedDate),
+            updatedBy = updatedBy
+        )
+    }
+}
+
+/**
+ * Post model for syncing to server
+ */
+data class NeonatalOutcomePost(
+    val id: Long = 0,
+    val benId: Long,
+    val deliveryOutcomeId: Long,
+    val neonateIndex: Int,
+    val neonateUniqueId: String? = null,
+    val outcomeAtBirth: String? = null,
+    val outcomeAtBirthId: Int? = null,
+    val sex: String? = null,
+    val sexId: Int? = null,
+    val criedImmediately: String? = null,
+    val criedImmediatelyId: Int? = null,
+    val typeOfResuscitation: String? = null,
+    val birthWeight: Int? = null,
+    val congenitalAnomalyDetected: String? = null,
+    val congenitalAnomalyDetectedId: Int? = null,
+    val typeOfCongenitalAnomaly: String? = null,
+    val otherCongenitalAnomaly: String? = null,
+    val newbornComplications: String? = null,
+    val currentStatusOfBaby: String? = null,
+    val currentStatusOfBabyId: Int? = null,
+    val causeOfDeath: String? = null,
+    val otherCauseOfDeath: String? = null,
+    val birthDoseVaccinesGiven: String? = null,
+    val reasonForNoVaccines: String? = null,
+    val vitaminKInjectionGiven: Boolean? = null,
+    val reasonForNoVitaminK: String? = null,
+    val birthCertificateIssued: String? = null,
+    val birthCertificateIssuedId: Int? = null,
+    val isStillbirth: Boolean? = null,
+    val isNeonatalDeath: Boolean? = null,
+    val createdDate: String? = null,
+    val createdBy: String,
+    val updatedDate: String? = null,
+    val updatedBy: String
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/NoseDiagnosisAssessment.kt b/app/src/main/java/org/piramalswasthya/cho/model/NoseDiagnosisAssessment.kt
new file mode 100644
index 000000000..28f66cf17
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/NoseDiagnosisAssessment.kt
@@ -0,0 +1,49 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "NOSE_DIAGNOSIS_ASSESSMENT")
+@JsonClass(generateAdapter = true)
+data class NoseDiagnosisAssessment(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+    @ColumnInfo(name = "difficulty_breathing")
+    var difficultyBreathing: Boolean? = null,
+
+    @ColumnInfo(name = "open_mouth_breathing")
+    var openMouthBreathing: Boolean? = null,
+
+    @ColumnInfo(name = "nose_bleed")
+    var noseBleed: Boolean? = null,
+
+    @ColumnInfo(name = "systolic_bp")
+    var systolicBp: Int? = null,
+
+    @ColumnInfo(name = "diastolic_bp")
+    var diastolicBp: Int? = null,
+
+    @ColumnInfo(name = "foreign_body_nose")
+    var foreignBodyNose: String? = null,
+
+    @ColumnInfo(name = "sinusitis")
+    var sinusitis: Boolean? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0
+
+
+
+) : FormDataModel
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/OccupationMaster.kt b/app/src/main/java/org/piramalswasthya/cho/model/OccupationMaster.kt
index 045109079..e577d3c0c 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/OccupationMaster.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/OccupationMaster.kt
@@ -1,4 +1,4 @@
-package org.piramalswasthya.cho.moddel
+package org.piramalswasthya.cho.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/OphthalmicVisit.kt b/app/src/main/java/org/piramalswasthya/cho/model/OphthalmicVisit.kt
new file mode 100644
index 000000000..b7d4320c6
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/OphthalmicVisit.kt
@@ -0,0 +1,103 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.utils.generateUuid
+import java.io.Serializable
+
+@Entity(
+    tableName = "OPHTHALMIC_VISIT",
+    foreignKeys = [
+        ForeignKey(
+            entity = Patient::class,
+            parentColumns = ["patientID"],
+            childColumns = ["patientID"],
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
+)
+@JsonClass(generateAdapter = true)
+data class OphthalmicVisit(
+    @PrimaryKey
+    val visitId: String = generateUuid(),
+    
+    @ColumnInfo(name = "patientID")
+    val patientID: String,
+    
+    @ColumnInfo(name = "benVisitNo")
+    val benVisitNo: Int,
+    
+    // Ticket 1: Diabetic Screening
+    @ColumnInfo(name = "isDiabetic")
+    var isDiabetic: Boolean? = null,
+    
+    @ColumnInfo(name = "screeningPerformed")
+    var screeningPerformed: Boolean? = null,
+    
+    @ColumnInfo(name = "visualAcuityChartUsed")
+    var visualAcuityChartUsed: String? = null,
+    
+    @ColumnInfo(name = "distVARight")
+    var distVARight: String? = null,
+    
+    @ColumnInfo(name = "distVALeft")
+    var distVALeft: String? = null,
+    
+    @ColumnInfo(name = "nearVA")
+    var nearVA: String? = null,
+    
+    // Ticket 4 & 5: Case Identification
+    @ColumnInfo(name = "caseIdConditions")
+    var caseIdConditions: String? = null, // JSON list of conditions
+    
+    // Ticket 6: Symptoms
+    @ColumnInfo(name = "cataractSymptoms")
+    var cataractSymptoms: Boolean? = null,
+    
+    @ColumnInfo(name = "glaucomaSymptoms")
+    var glaucomaSymptoms: Boolean? = null,
+    
+    @ColumnInfo(name = "diabeticRetinopathySymptoms")
+    var diabeticRetinopathySymptoms: Boolean? = null,
+    
+    @ColumnInfo(name = "presbyopiaSymptoms")
+    var presbyopiaSymptoms: Boolean? = null,
+    
+    @ColumnInfo(name = "trachomaStatus")
+    var trachomaStatus: String? = null,
+    
+    @ColumnInfo(name = "cornealDiseaseType")
+    var cornealDiseaseType: String? = null,
+    
+    @ColumnInfo(name = "vitaminADeficiency")
+    var vitaminADeficiency: Boolean? = null,
+    
+    // Ticket 8 & 9: Injury and Trauma
+    @ColumnInfo(name = "injuryType")
+    var injuryType: String? = null, // JSON list of injury types
+    
+    @ColumnInfo(name = "foreignBodyRemoval")
+    var foreignBodyRemoval: String? = null,
+    
+    @ColumnInfo(name = "chemicalExposure")
+    var chemicalExposure: Boolean? = null,
+    
+    // Audit Fields
+    @ColumnInfo(name = "createdBy")
+    var createdBy: String,
+    
+    @ColumnInfo(name = "createdDate")
+    var createdDate: Long,
+    
+    @ColumnInfo(name = "updatedBy")
+    var updatedBy: String,
+    
+    @ColumnInfo(name = "updatedDate")
+    var updatedDate: Long,
+    
+    @ColumnInfo(name = "syncState")
+    var syncState: Int
+) : Serializable
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/OralHealth.kt b/app/src/main/java/org/piramalswasthya/cho/model/OralHealth.kt
new file mode 100644
index 000000000..788713dbe
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/OralHealth.kt
@@ -0,0 +1,71 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(
+    tableName = "ORAL_HEALTH",
+    indices = [
+        Index(value = ["patient_id"], name = "index_oral_health_patient_id"),
+        Index(value = ["patient_id", "ben_visit_no"], name = "index_oral_health_patient_visit", unique = true)
+    ]
+)
+@JsonClass(generateAdapter = true)
+data class OralHealth(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "oral_health_id")
+    val oralHealthId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientID: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+    // Ticket 1
+    @ColumnInfo(name = "tooth_decay_present")
+    var toothDecayPresent: Boolean? = null,
+
+    @ColumnInfo(name = "tooth_decay_symptoms")
+    var toothDecaySymptoms: String? = null,
+
+    // Ticket 2
+    @ColumnInfo(name = "gum_disease_present")
+    var gumDiseasePresent: Boolean? = null,
+
+    @ColumnInfo(name = "gum_disease_symptoms")
+    var gumDiseaseSymptoms: String? = null,
+
+    // Ticket 3
+    @ColumnInfo(name = "irregular_teeth_jaws")
+    var irregularTeethJaws: Boolean? = null,
+
+    @ColumnInfo(name = "abnormal_growth_ulcer")
+    var abnormalGrowthUlcer: Boolean? = null,
+
+    @ColumnInfo(name = "cleft_lip_palate")
+    var cleftLipPalate: Boolean? = null,
+
+    @ColumnInfo(name = "dental_fluorosis")
+    var dentalFluorosis: Boolean? = null,
+
+    // Ticket 4
+    @ColumnInfo(name = "dental_emergency")
+    var dentalEmergency: String? = null,
+
+    @ColumnInfo(name = "created_date")
+    var createdDate: Long? = null,
+
+    @ColumnInfo(name = "created_by")
+    var createdBy: String? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0,
+
+) : FormDataModel
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcMentalHealthNetworkMapper.kt b/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcMentalHealthNetworkMapper.kt
new file mode 100644
index 000000000..bd16f42a3
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcMentalHealthNetworkMapper.kt
@@ -0,0 +1,180 @@
+package org.piramalswasthya.cho.model
+
+import org.piramalswasthya.cho.database.room.SyncState
+
+internal fun MentalHealthScreeningCache.toMentalHealthNetworkModelInternal(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): MentalHealthNetwork {
+    return MentalHealthNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        screeningId = screeningId,
+        patientID = patientId,
+        benVisitNo = benVisitNo,
+        emotionalBehaviouralConcerns = emotionalBehaviouralConcerns,
+        substanceUseConcerns = substanceUseConcerns,
+        selfHarmSuicideThoughts = selfHarmSuicideThoughts,
+        memoryLossConfusion = memoryLossConfusion,
+        seizuresFitsLoc = seizuresFitsLoc,
+        isPostpartum = isPostpartum,
+        phq9LittleInterest = phq9LittleInterest,
+        phq9FeelingDown = phq9FeelingDown,
+        phq9SleepTrouble = phq9SleepTrouble,
+        phq9FeelingTired = phq9FeelingTired,
+        phq9Appetite = phq9Appetite,
+        phq9FeelingBad = phq9FeelingBad,
+        phq9Concentration = phq9Concentration,
+        phq9MovingSlowly = phq9MovingSlowly,
+        phq9SelfHarmThoughts = phq9SelfHarmThoughts,
+        phq9TotalScore = phq9TotalScore,
+        phq9DepressionSeverity = phq9DepressionSeverity,
+        phq9SystemAction = phq9SystemAction,
+        substanceCurrentTobaccoUse = substanceCurrentTobaccoUse,
+        substanceTobaccoType = substanceTobaccoType,
+        substanceTobaccoFrequency = substanceTobaccoFrequency,
+        substanceTobaccoOutcome = substanceTobaccoOutcome,
+        substanceSystemAction = substanceSystemAction,
+        substanceAlcoholUse = substanceAlcoholUse,
+        substanceTobaccoUse = substanceTobaccoUse,
+        substanceOtherUse = substanceOtherUse,
+        substanceOtherSpecify = substanceOtherSpecify,
+        substanceFrequency = substanceFrequency,
+        briefInterventionGiven = briefInterventionGiven,
+        suicideCurrentThoughts = suicideCurrentThoughts,
+        suicidePlan = suicidePlan,
+        suicidePreviousAttempt = suicidePreviousAttempt,
+        suicideHopelessness = suicideHopelessness,
+        suicideImmediateAssess = suicideImmediateAssess,
+        suicideRiskLevel = suicideRiskLevel,
+        dementiaProgressiveMemoryLoss = dementiaProgressiveMemoryLoss,
+        dementiaForgettingRecent = dementiaForgettingRecent,
+        dementiaDisorientation = dementiaDisorientation,
+        dementiaDailyActivities = dementiaDailyActivities,
+        dementiaBehaviouralChanges = dementiaBehaviouralChanges,
+        epilepsyRecurrentSeizures = epilepsyRecurrentSeizures,
+        epilepsyJerkyMovements = epilepsyJerkyMovements,
+        epilepsyTongueBite = epilepsyTongueBite,
+        epilepsyConfusionAfter = epilepsyConfusionAfter,
+        epilepsyLocDuration = epilepsyLocDuration,
+        substanceAlcoholLoss = substance_alcohol_loss,
+        substanceAlcoholImpact = substanceAlcoholImpact,
+        substanceAlcoholWithdrawal = substanceAlcoholWithdrawal,
+        substanceAlcoholProblematic = substanceAlcoholProblematic,
+        substanceAlcoholClassification = substanceAlcoholClassification,
+        substanceAlcoholSystemAction = substanceAlcoholSystemAction,
+        substanceAlcoholFrequency = substance_alcohol_frequency,
+        edRecurrentEpisodeloss = edRecurrentEpisodeloss,
+        edRecurrentJerkyMovements = edRecurrentJerkyMovements,
+        edConfusionordrowsiness = edConfusionordrowsiness,
+        edProgressiveMemoryLoss = edProgressiveMemoryLoss,
+        edConfusionDisorientation = edConfusionDisorientation,
+        edFunctionalDecline = edFunctionalDecline,
+        edScreeningOutcome = edScreeningOutcome,
+        edPsychosocialInterventionProvided = edPsychosocialInterventionProvided,
+        edInterventionType = edInterventionType,
+        edSessionDate = edSessionDate,
+        edDurationMinutes = edDurationMinutes,
+        edRemarks = edRemarks,
+        edReferralRequired = edReferralRequired,
+        edReason = edReason,
+        referralRequired = referralRequired,
+        referralLevel = referralLevel,
+        reasonForReferral = reasonForReferral,
+        referralDate = referralDate,
+        followUpRequired = followUpRequired,
+        followUpDate = followUpDate,
+        improvementNoted = improvementNoted,
+        adherenceToAdvice = adherenceToAdvice,
+        referralEscalationRequired = referralEscalationRequired,
+        caseClosureReason = caseClosureReason,
+        syncState = syncState
+    )
+}
+
+internal fun MentalHealthNetwork.toMentalHealthCacheModelInternal(
+    patientID: String
+): MentalHealthScreeningCache {
+    return MentalHealthScreeningCache(
+        screeningId = 0L,
+        patientId = patientID,
+        syncState = syncState ?: SyncState.SYNCED.ordinal,
+        caseClosureReason = caseClosureReason,
+        referralEscalationRequired = referralEscalationRequired,
+        adherenceToAdvice = adherenceToAdvice,
+        improvementNoted = improvementNoted,
+        followUpDate = followUpDate,
+        followUpRequired = followUpRequired,
+        referralDate = referralDate,
+        reasonForReferral = reasonForReferral,
+        referralLevel = referralLevel,
+        referralRequired = referralRequired,
+        edReason = edReason,
+        edReferralRequired = edReferralRequired,
+        edRemarks = edRemarks,
+        edDurationMinutes = edDurationMinutes,
+        edSessionDate = edSessionDate,
+        edInterventionType = edInterventionType,
+        edPsychosocialInterventionProvided = edPsychosocialInterventionProvided,
+        edScreeningOutcome = edScreeningOutcome,
+        edFunctionalDecline = edFunctionalDecline,
+        edConfusionDisorientation = edConfusionDisorientation,
+        edProgressiveMemoryLoss = edProgressiveMemoryLoss,
+        edConfusionordrowsiness = edConfusionordrowsiness,
+        edRecurrentJerkyMovements = edRecurrentJerkyMovements,
+        edRecurrentEpisodeloss = edRecurrentEpisodeloss,
+        substance_alcohol_frequency = substanceAlcoholFrequency,
+        substanceAlcoholSystemAction = substanceAlcoholSystemAction,
+        substanceAlcoholClassification = substanceAlcoholClassification,
+        substanceAlcoholProblematic = substanceAlcoholProblematic,
+        substanceAlcoholWithdrawal = substanceAlcoholWithdrawal,
+        substanceAlcoholImpact = substanceAlcoholImpact,
+        substance_alcohol_loss = substanceAlcoholLoss,
+        epilepsyLocDuration = epilepsyLocDuration,
+        epilepsyConfusionAfter = epilepsyConfusionAfter,
+        epilepsyTongueBite = epilepsyTongueBite,
+        epilepsyJerkyMovements = epilepsyJerkyMovements,
+        epilepsyRecurrentSeizures = epilepsyRecurrentSeizures,
+        dementiaBehaviouralChanges = dementiaBehaviouralChanges,
+        dementiaDailyActivities = dementiaDailyActivities,
+        dementiaDisorientation = dementiaDisorientation,
+        dementiaForgettingRecent = dementiaForgettingRecent,
+        dementiaProgressiveMemoryLoss = dementiaProgressiveMemoryLoss,
+        suicideRiskLevel = suicideRiskLevel,
+        suicideImmediateAssess = suicideImmediateAssess,
+        suicideHopelessness = suicideHopelessness,
+        suicidePreviousAttempt = suicidePreviousAttempt,
+        suicidePlan = suicidePlan,
+        suicideCurrentThoughts = suicideCurrentThoughts,
+        briefInterventionGiven = briefInterventionGiven,
+        substanceFrequency = substanceFrequency,
+        substanceOtherSpecify = substanceOtherSpecify,
+        substanceOtherUse = substanceOtherUse,
+        substanceTobaccoUse = substanceTobaccoUse,
+        substanceAlcoholUse = substanceAlcoholUse,
+        substanceSystemAction = substanceSystemAction,
+        substanceTobaccoOutcome = substanceTobaccoOutcome,
+        substanceTobaccoFrequency = substanceTobaccoFrequency,
+        substanceTobaccoType = substanceTobaccoType,
+        substanceCurrentTobaccoUse = substanceCurrentTobaccoUse,
+        phq9SystemAction = phq9SystemAction,
+        phq9DepressionSeverity = phq9DepressionSeverity,
+        phq9TotalScore = phq9TotalScore,
+        phq9SelfHarmThoughts = phq9SelfHarmThoughts,
+        phq9MovingSlowly = phq9MovingSlowly,
+        phq9Concentration = phq9Concentration,
+        phq9FeelingBad = phq9FeelingBad,
+        phq9Appetite = phq9Appetite,
+        phq9FeelingTired = phq9FeelingTired,
+        phq9SleepTrouble = phq9SleepTrouble,
+        phq9FeelingDown = phq9FeelingDown,
+        phq9LittleInterest = phq9LittleInterest,
+        isPostpartum = isPostpartum,
+        seizuresFitsLoc = seizuresFitsLoc,
+        memoryLossConfusion = memoryLossConfusion,
+        selfHarmSuicideThoughts = selfHarmSuicideThoughts,
+        substanceUseConcerns = substanceUseConcerns,
+        emotionalBehaviouralConcerns = emotionalBehaviouralConcerns,
+        benVisitNo = benVisitNo,
+    )
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcNetworkModels.kt b/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcNetworkModels.kt
new file mode 100644
index 000000000..09db25562
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/OtherCphcNetworkModels.kt
@@ -0,0 +1,670 @@
+package org.piramalswasthya.cho.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class EarDiagnosisNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientId: String? = null,
+    val benVisitNo: Int? = null,
+    val difficultyHearing: Boolean? = null,
+    val whisperTestResponse: String? = null,
+    val hearingTestOutcome: String? = null,
+    val earPain: Boolean? = null,
+    val earDischargePresent: Boolean? = null,
+    val foreignBodyInEar: String? = null,
+    val earConditionType: String? = null,
+    val congenitalEarMalformation: Boolean? = null,
+    val syncState: Int? = null
+)
+
+fun EarDiagnosisAssessment.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): EarDiagnosisNetwork {
+    return EarDiagnosisNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientId = patientId,
+        benVisitNo = benVisitNo,
+        difficultyHearing = difficultyHearing,
+        whisperTestResponse = whisperTestResponse,
+        hearingTestOutcome = hearingTestOutcome,
+        earPain = earPain,
+        earDischargePresent = earDischargePresent,
+        foreignBodyInEar = foreignBodyInEar,
+        earConditionType = earConditionType,
+        congenitalEarMalformation = congenitalEarMalformation,
+        syncState = syncState
+    )
+}
+
+fun EarDiagnosisNetwork.toCacheModel(patientID: String): EarDiagnosisAssessment {
+    return EarDiagnosisAssessment(
+        assessmentId = 0L,
+        patientId = patientID,
+        benVisitNo = benVisitNo,
+        difficultyHearing = difficultyHearing,
+        whisperTestResponse = whisperTestResponse,
+        hearingTestOutcome = hearingTestOutcome,
+        earPain = earPain,
+        earDischargePresent = earDischargePresent,
+        foreignBodyInEar = foreignBodyInEar,
+        earConditionType = earConditionType,
+        congenitalEarMalformation = congenitalEarMalformation,
+        syncState = syncState ?: 0
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class OphthalmicNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val visitId: String? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val isDiabetic: Boolean? = null,
+    val screeningPerformed: Boolean? = null,
+    val visualAcuityChartUsed: String? = null,
+    val distVARight: String? = null,
+    val distVALeft: String? = null,
+    val nearVA: String? = null,
+    val caseIdConditions: String? = null,
+    val cataractSymptoms: Boolean? = null,
+    val glaucomaSymptoms: Boolean? = null,
+    val diabeticRetinopathySymptoms: Boolean? = null,
+    val presbyopiaSymptoms: Boolean? = null,
+    val trachomaStatus: String? = null,
+    val cornealDiseaseType: String? = null,
+    val vitaminADeficiency: Boolean? = null,
+    val injuryType: String? = null,
+    val foreignBodyRemoval: String? = null,
+    val chemicalExposure: Boolean? = null,
+    val createdBy: String? = null,
+    val createdDate: Long? = null,
+    val updatedBy: String? = null,
+    val updatedDate: Long? = null,
+    val syncState: Int? = null
+)
+
+fun OphthalmicVisit.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): OphthalmicNetwork {
+    return OphthalmicNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        visitId = visitId,
+        patientID = patientID,
+        benVisitNo = benVisitNo,
+        isDiabetic = isDiabetic,
+        screeningPerformed = screeningPerformed,
+        visualAcuityChartUsed = visualAcuityChartUsed,
+        distVARight = distVARight,
+        distVALeft = distVALeft,
+        nearVA = nearVA,
+        caseIdConditions = caseIdConditions,
+        cataractSymptoms = cataractSymptoms,
+        glaucomaSymptoms = glaucomaSymptoms,
+        diabeticRetinopathySymptoms = diabeticRetinopathySymptoms,
+        presbyopiaSymptoms = presbyopiaSymptoms,
+        trachomaStatus = trachomaStatus,
+        cornealDiseaseType = cornealDiseaseType,
+        vitaminADeficiency = vitaminADeficiency,
+        injuryType = injuryType,
+        foreignBodyRemoval = foreignBodyRemoval,
+        chemicalExposure = chemicalExposure,
+        createdBy = createdBy,
+        createdDate = createdDate,
+        updatedBy = updatedBy,
+        updatedDate = updatedDate,
+        syncState = syncState
+    )
+}
+
+fun OphthalmicNetwork.toCacheModel(patientID: String): OphthalmicVisit {
+    return OphthalmicVisit(
+        visitId = visitId ?: "",
+        patientID = patientID,
+        benVisitNo = benVisitNo ?: 0,
+        isDiabetic = isDiabetic,
+        screeningPerformed = screeningPerformed,
+        visualAcuityChartUsed = visualAcuityChartUsed,
+        distVARight = distVARight,
+        distVALeft = distVALeft,
+        nearVA = nearVA,
+        caseIdConditions = caseIdConditions,
+        cataractSymptoms = cataractSymptoms,
+        glaucomaSymptoms = glaucomaSymptoms,
+        diabeticRetinopathySymptoms = diabeticRetinopathySymptoms,
+        presbyopiaSymptoms = presbyopiaSymptoms,
+        trachomaStatus = trachomaStatus,
+        cornealDiseaseType = cornealDiseaseType,
+        vitaminADeficiency = vitaminADeficiency,
+        injuryType = injuryType,
+        foreignBodyRemoval = foreignBodyRemoval,
+        chemicalExposure = chemicalExposure,
+        createdBy = createdBy ?: "",
+        createdDate = createdDate ?: 0L,
+        updatedBy = updatedBy ?: "",
+        updatedDate = updatedDate ?: 0L,
+        syncState = syncState ?: 0
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class OralHealthNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val oralHealthId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val toothDecayPresent: Boolean? = null,
+    val toothDecaySymptoms: String? = null,
+    val gumDiseasePresent: Boolean? = null,
+    val gumDiseaseSymptoms: String? = null,
+    val irregularTeethJaws: Boolean? = null,
+    val abnormalGrowthUlcer: Boolean? = null,
+    val cleftLipPalate: Boolean? = null,
+    val dentalFluorosis: Boolean? = null,
+    val dentalEmergency: String? = null,
+    val createdDate: Long? = null,
+    val createdBy: String? = null,
+    val syncState: Int? = null
+)
+
+fun OralHealth.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): OralHealthNetwork {
+    return OralHealthNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        oralHealthId = oralHealthId,
+        patientID = patientID,
+        benVisitNo = benVisitNo,
+        toothDecayPresent = toothDecayPresent,
+        toothDecaySymptoms = toothDecaySymptoms,
+        gumDiseasePresent = gumDiseasePresent,
+        gumDiseaseSymptoms = gumDiseaseSymptoms,
+        irregularTeethJaws = irregularTeethJaws,
+        abnormalGrowthUlcer = abnormalGrowthUlcer,
+        cleftLipPalate = cleftLipPalate,
+        dentalFluorosis = dentalFluorosis,
+        dentalEmergency = dentalEmergency,
+        createdDate = createdDate,
+        createdBy = createdBy,
+        syncState = syncState
+    )
+}
+
+fun OralHealthNetwork.toCacheModel(patientID: String): OralHealth {
+    return OralHealth(
+        oralHealthId = 0L,
+        patientID = patientID,
+        benVisitNo = benVisitNo,
+        toothDecayPresent = toothDecayPresent,
+        toothDecaySymptoms = toothDecaySymptoms,
+        gumDiseasePresent = gumDiseasePresent,
+        gumDiseaseSymptoms = gumDiseaseSymptoms,
+        irregularTeethJaws = irregularTeethJaws,
+        abnormalGrowthUlcer = abnormalGrowthUlcer,
+        cleftLipPalate = cleftLipPalate,
+        dentalFluorosis = dentalFluorosis,
+        dentalEmergency = dentalEmergency,
+        createdDate = createdDate,
+        createdBy = createdBy,
+        syncState = syncState ?: 0
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class PainAssessmentNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val painSeverity: String? = null,
+    val painDuration: String? = null,
+    val symptomsPresent: Boolean? = null,
+    val otherSymptomsSeverity: String? = null,
+    val immediateReliefProvided: Boolean? = null,
+    val persistentPainPresent: Boolean? = null,
+    val painAssessmentEnabled: Boolean? = null,
+    val distressingSymptoms: String? = null,
+    val bedriddenOrSeverelyDependent: Boolean? = null,
+    val lifeLimitingIllnessKnown: Boolean? = null,
+    val caregiverSupportRequired: Boolean? = null,
+    val palliativeCareEligible: Boolean? = null,
+    val basicSymptomsSelected: String? = null,
+    val basicSymptomReliefProvided: Boolean? = null,
+    val basicPsychosocialSupportProvided: Boolean? = null,
+    val basicCaregiverCounsellingProvided: Boolean? = null,
+    val basicManagementRemarks: String? = null,
+    val syncState: Int? = null,
+    val referralFollowUp: ReferralFollowUpFields? = null
+)
+
+fun PainAndSymptomAssessment.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): PainAssessmentNetwork {
+    return PainAssessmentNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientID = patientID,
+        benVisitNo = benVisitNo,
+        painSeverity = painSeverity,
+        painDuration = painDuration,
+        symptomsPresent = symptomsPresent,
+        otherSymptomsSeverity = otherSymptomsSeverity,
+        immediateReliefProvided = immediateReliefProvided,
+        persistentPainPresent = persistentPainPresent,
+        painAssessmentEnabled = painAssessmentEnabled,
+        distressingSymptoms = distressingSymptoms,
+        bedriddenOrSeverelyDependent = bedriddenOrSeverelyDependent,
+        lifeLimitingIllnessKnown = lifeLimitingIllnessKnown,
+        caregiverSupportRequired = caregiverSupportRequired,
+        palliativeCareEligible = palliativeCareEligible,
+        basicSymptomsSelected = basicSymptomsSelected,
+        basicSymptomReliefProvided = basicSymptomReliefProvided,
+        basicPsychosocialSupportProvided = basicPsychosocialSupportProvided,
+        basicCaregiverCounsellingProvided = basicCaregiverCounsellingProvided,
+        basicManagementRemarks = basicManagementRemarks,
+        syncState = syncState,
+        referralFollowUp = referralFollowUp
+    )
+}
+
+fun PainAssessmentNetwork.toCacheModel(patientID: String): PainAndSymptomAssessment {
+    return PainAndSymptomAssessment(
+        assessmentId = 0L,
+        patientID = patientID,
+        benVisitNo = benVisitNo,
+        painSeverity = painSeverity,
+        painDuration = painDuration,
+        symptomsPresent = symptomsPresent,
+        otherSymptomsSeverity = otherSymptomsSeverity,
+        immediateReliefProvided = immediateReliefProvided,
+        persistentPainPresent = persistentPainPresent,
+        painAssessmentEnabled = painAssessmentEnabled,
+        distressingSymptoms = distressingSymptoms,
+        bedriddenOrSeverelyDependent = bedriddenOrSeverelyDependent,
+        lifeLimitingIllnessKnown = lifeLimitingIllnessKnown,
+        caregiverSupportRequired = caregiverSupportRequired,
+        palliativeCareEligible = palliativeCareEligible,
+        basicSymptomsSelected = basicSymptomsSelected,
+        basicSymptomReliefProvided = basicSymptomReliefProvided,
+        basicPsychosocialSupportProvided = basicPsychosocialSupportProvided,
+        basicCaregiverCounsellingProvided = basicCaregiverCounsellingProvided,
+        basicManagementRemarks = basicManagementRemarks,
+        syncState = syncState ?: 0,
+        referralFollowUp = referralFollowUp ?: ReferralFollowUpFields()
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class PsychosocialCaregiverSupportNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientId: String? = null,
+    val benVisitNo: Int? = null,
+    val psychosocialCounsellingProvided: Boolean? = null,
+    val caregiverCounsellingProvided: Boolean? = null,
+    val caregiverDistressIdentified: Boolean? = null,
+    val counsellingRemarks: String? = null,
+    val syncState: Int? = null,
+    val referralFollowUp: ReferralFollowUpFields? = null
+)
+
+fun PsychosocialCaregiverSupport.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): PsychosocialCaregiverSupportNetwork {
+    return PsychosocialCaregiverSupportNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientId = patientId,
+        benVisitNo = benVisitNo,
+        psychosocialCounsellingProvided = psychosocialCounsellingProvided,
+        caregiverCounsellingProvided = caregiverCounsellingProvided,
+        caregiverDistressIdentified = caregiverDistressIdentified,
+        counsellingRemarks = counsellingRemarks,
+        syncState = syncState,
+        referralFollowUp = referralFollowUp
+    )
+}
+
+fun PsychosocialCaregiverSupportNetwork.toCacheModel(patientID: String): PsychosocialCaregiverSupport {
+    return PsychosocialCaregiverSupport(
+        assessmentId = 0L,
+        patientId = patientID,
+        benVisitNo = benVisitNo,
+        psychosocialCounsellingProvided = psychosocialCounsellingProvided,
+        caregiverCounsellingProvided = caregiverCounsellingProvided,
+        caregiverDistressIdentified = caregiverDistressIdentified,
+        counsellingRemarks = counsellingRemarks,
+        syncState = syncState ?: 0,
+        referralFollowUp = referralFollowUp ?: ReferralFollowUpFields()
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class NoseDiagnosisNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val difficultyBreathing: Boolean? = null,
+    val openMouthBreathing: Boolean? = null,
+    val noseBleed: Boolean? = null,
+    val systolicBp: Int? = null,
+    val diastolicBp: Int? = null,
+    val foreignBodyNose: String? = null,
+    val sinusitis: Boolean? = null,
+    val syncState: Int? = null
+)
+
+fun NoseDiagnosisAssessment.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): NoseDiagnosisNetwork {
+    return NoseDiagnosisNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientID = patientId,
+        benVisitNo = benVisitNo,
+        difficultyBreathing = difficultyBreathing,
+        openMouthBreathing = openMouthBreathing,
+        noseBleed = noseBleed,
+        systolicBp = systolicBp,
+        diastolicBp = diastolicBp,
+        foreignBodyNose = foreignBodyNose,
+        sinusitis = sinusitis,
+        syncState = syncState
+    )
+}
+
+fun NoseDiagnosisNetwork.toCacheModel(patientID: String): NoseDiagnosisAssessment {
+    return NoseDiagnosisAssessment(
+        assessmentId = 0L,
+        patientId = patientID,
+        benVisitNo = benVisitNo,
+        difficultyBreathing = difficultyBreathing,
+        openMouthBreathing = openMouthBreathing,
+        noseBleed = noseBleed,
+        systolicBp = systolicBp,
+        diastolicBp = diastolicBp,
+        foreignBodyNose = foreignBodyNose,
+        sinusitis = sinusitis,
+        syncState = syncState ?: 0
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class ThroatDiagnosisNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val symptoms: List<String>? = null,
+    val neckSwelling: Boolean? = null,
+    val difficultySwallowing: Boolean? = null,
+    val tonsillitis: Boolean? = null,
+    val pharyngitis: Boolean? = null,
+    val laryngitis: Boolean? = null,
+    val sinusitis: Boolean? = null,
+    val cleftLip: Boolean? = null,
+    val cleftPalate: Boolean? = null,
+    val syncState: Int? = null
+)
+
+fun ThroatDiagnosisAssessment.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): ThroatDiagnosisNetwork {
+    return ThroatDiagnosisNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientID = patientId,
+        benVisitNo = benVisitNo,
+        symptoms = symptoms,
+        neckSwelling = neckSwelling,
+        difficultySwallowing = difficultySwallowing,
+        tonsillitis = tonsillitis,
+        pharyngitis = pharyngitis,
+        laryngitis = laryngitis,
+        sinusitis = sinusitis,
+        cleftLip = cleftLip,
+        cleftPalate = cleftPalate,
+        syncState = syncState
+    )
+}
+
+fun ThroatDiagnosisNetwork.toCacheModel(patientID: String): ThroatDiagnosisAssessment {
+    return ThroatDiagnosisAssessment(
+        assessmentId = 0L,
+        patientId = patientID,
+        benVisitNo = benVisitNo,
+        symptoms = symptoms,
+        neckSwelling = neckSwelling,
+        difficultySwallowing = difficultySwallowing,
+        tonsillitis = tonsillitis,
+        pharyngitis = pharyngitis,
+        laryngitis = laryngitis,
+        sinusitis = sinusitis,
+        cleftLip = cleftLip,
+        cleftPalate = cleftPalate,
+        syncState = syncState ?: 0
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class ElderlyHealthNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val assessmentId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val geriatricComplaints: Boolean? = null,
+    val multipleChronicConditions: Boolean? = null,
+    val recentFalls: Boolean? = null,
+    val difficultyWalkingBalance: Boolean? = null,
+    val visualHearingDifficulty: Boolean? = null,
+    val functionalDecline: Boolean? = null,
+    val bathing: Int? = null,
+    val dressing: Int? = null,
+    val toileting: Int? = null,
+    val transferring: Int? = null,
+    val continence: Int? = null,
+    val feeding: Int? = null,
+    val totalScore: Int? = null,
+    val functionalStatus: String? = null,
+    val functionalDeclineFlag: Boolean? = null,
+    val memoryLoss: Boolean? = null,
+    val dementiaMemoryLoss: Boolean? = null,
+    val dementiaDisorientation: Boolean? = null,
+    val dementiaBehaviouralChanges: Boolean? = null,
+    val dementiaSelfCareDecline: Boolean? = null,
+    val dementiaScreeningOutcome: String? = null,
+    val dementiaReferralRequired: Boolean? = null,
+    val syncState: Int? = null,
+    val referralFollowUp: ReferralFollowUpFields? = null
+)
+
+fun ElderlyHealthAssessment.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): ElderlyHealthNetwork {
+    return ElderlyHealthNetwork(
+        beneficiaryID = beneficiaryID,
+        beneficiaryRegID = beneficiaryRegID,
+        assessmentId = assessmentId,
+        patientID = patientId,
+        benVisitNo = benVisitNo,
+        geriatricComplaints = geriatricComplaints,
+        multipleChronicConditions = multipleChronicConditions,
+        recentFalls = recentFalls,
+        difficultyWalkingBalance = difficultyWalkingBalance,
+        visualHearingDifficulty = visualHearingDifficulty,
+        functionalDecline = functionalDecline,
+        bathing = bathing,
+        dressing = dressing,
+        toileting = toileting,
+        transferring = transferring,
+        continence = continence,
+        feeding = feeding,
+        totalScore = totalScore,
+        functionalStatus = functionalStatus,
+        functionalDeclineFlag = functionalDeclineFlag,
+        memoryLoss = memoryLoss,
+        dementiaMemoryLoss = dementiaMemoryLoss,
+        dementiaDisorientation = dementiaDisorientation,
+        dementiaBehaviouralChanges = dementiaBehaviouralChanges,
+        dementiaSelfCareDecline = dementiaSelfCareDecline,
+        dementiaScreeningOutcome = dementiaScreeningOutcome,
+        dementiaReferralRequired = dementiaReferralRequired,
+        syncState = syncState,
+        referralFollowUp = referralFollowUp
+    )
+}
+
+fun ElderlyHealthNetwork.toCacheModel(patientID: String): ElderlyHealthAssessment {
+    return ElderlyHealthAssessment(
+        assessmentId = 0L,
+        patientId = patientID,
+        benVisitNo = benVisitNo ?: 0,
+        geriatricComplaints = geriatricComplaints,
+        multipleChronicConditions = multipleChronicConditions,
+        recentFalls = recentFalls,
+        difficultyWalkingBalance = difficultyWalkingBalance,
+        visualHearingDifficulty = visualHearingDifficulty,
+        functionalDecline = functionalDecline,
+        bathing = bathing,
+        dressing = dressing,
+        toileting = toileting,
+        transferring = transferring,
+        continence = continence,
+        feeding = feeding,
+        totalScore = totalScore,
+        functionalStatus = functionalStatus,
+        functionalDeclineFlag = functionalDeclineFlag,
+        memoryLoss = memoryLoss,
+        dementiaMemoryLoss = dementiaMemoryLoss,
+        dementiaDisorientation = dementiaDisorientation,
+        dementiaBehaviouralChanges = dementiaBehaviouralChanges,
+        dementiaSelfCareDecline = dementiaSelfCareDecline,
+        dementiaScreeningOutcome = dementiaScreeningOutcome,
+        dementiaReferralRequired = dementiaReferralRequired,
+        syncState = syncState ?: 0,
+        referralFollowUp = referralFollowUp ?: ReferralFollowUpFields()
+    )
+}
+
+@JsonClass(generateAdapter = true)
+data class MentalHealthNetwork(
+    val beneficiaryID: String,
+    val beneficiaryRegID: String,
+    val screeningId: Long? = null,
+    val patientID: String? = null,
+    val benVisitNo: Int? = null,
+    val emotionalBehaviouralConcerns: Boolean? = null,
+    val substanceUseConcerns: Boolean? = null,
+    val selfHarmSuicideThoughts: Boolean? = null,
+    val memoryLossConfusion: Boolean? = null,
+    val seizuresFitsLoc: Boolean? = null,
+    val isPostpartum: Boolean? = null,
+    val phq9LittleInterest: Int? = null,
+    val phq9FeelingDown: Int? = null,
+    val phq9SleepTrouble: Int? = null,
+    val phq9FeelingTired: Int? = null,
+    val phq9Appetite: Int? = null,
+    val phq9FeelingBad: Int? = null,
+    val phq9Concentration: Int? = null,
+    val phq9MovingSlowly: Int? = null,
+    val phq9SelfHarmThoughts: Int? = null,
+    val phq9TotalScore: Int? = null,
+    val phq9DepressionSeverity: String? = null,
+    val phq9SystemAction: String? = null,
+    val substanceCurrentTobaccoUse: Boolean? = null,
+    val substanceTobaccoType: String? = null,
+    val substanceTobaccoFrequency: String? = null,
+    val substanceTobaccoOutcome: String? = null,
+    val substanceSystemAction: String? = null,
+    val substanceAlcoholUse: Boolean? = null,
+    val substanceTobaccoUse: Boolean? = null,
+    val substanceOtherUse: Boolean? = null,
+    val substanceOtherSpecify: String? = null,
+    val substanceFrequency: String? = null,
+    val briefInterventionGiven: Boolean? = null,
+    val suicideCurrentThoughts: Boolean? = null,
+    val suicidePlan: Boolean? = null,
+    val suicidePreviousAttempt: Boolean? = null,
+    val suicideHopelessness: Boolean? = null,
+    val suicideImmediateAssess: Boolean? = null,
+    val suicideRiskLevel: String? = null,
+    val dementiaProgressiveMemoryLoss: Boolean? = null,
+    val dementiaForgettingRecent: Boolean? = null,
+    val dementiaDisorientation: Boolean? = null,
+    val dementiaDailyActivities: Boolean? = null,
+    val dementiaBehaviouralChanges: Boolean? = null,
+    val epilepsyRecurrentSeizures: Boolean? = null,
+    val epilepsyJerkyMovements: Boolean? = null,
+    val epilepsyTongueBite: Boolean? = null,
+    val epilepsyConfusionAfter: Boolean? = null,
+    val epilepsyLocDuration: String? = null,
+    val substanceAlcoholLoss: Boolean? = null,
+    val substanceAlcoholImpact: Boolean? = null,
+    val substanceAlcoholWithdrawal: Boolean? = null,
+    val substanceAlcoholProblematic: Boolean? = null,
+    val substanceAlcoholClassification: String? = null,
+    val substanceAlcoholSystemAction: String? = null,
+    val substanceAlcoholFrequency: String? = null,
+    val edRecurrentEpisodeloss: Boolean? = null,
+    val edRecurrentJerkyMovements: Boolean? = null,
+    val edConfusionordrowsiness: Boolean? = null,
+    val edProgressiveMemoryLoss: Boolean? = null,
+    val edConfusionDisorientation: Boolean? = null,
+    val edFunctionalDecline: Boolean? = null,
+    val edScreeningOutcome: String? = null,
+    val edPsychosocialInterventionProvided: Boolean? = null,
+    val edInterventionType: String? = null,
+    val edSessionDate: String? = null,
+    val edDurationMinutes: Int? = null,
+    val edRemarks: String? = null,
+    val edReferralRequired: String? = null,
+    val edReason: String? = null,
+    val referralRequired: Boolean? = null,
+    val referralLevel: String? = null,
+    val reasonForReferral: String? = null,
+    val referralDate: String? = null,
+    val followUpRequired: Boolean? = null,
+    val followUpDate: String? = null,
+    val improvementNoted: String? = null,
+    val adherenceToAdvice: String? = null,
+    val referralEscalationRequired: Boolean? = null,
+    val caseClosureReason: String? = null,
+    val syncState: Int? = null
+)
+
+fun MentalHealthScreeningCache.toNetworkModel(
+    beneficiaryID: String,
+    beneficiaryRegID: String
+): MentalHealthNetwork {
+    return toMentalHealthNetworkModelInternal(beneficiaryID, beneficiaryRegID)
+}
+
+fun MentalHealthNetwork.toCacheModel(patientID: String): MentalHealthScreeningCache {
+    return toMentalHealthCacheModelInternal(patientID)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PNC.kt b/app/src/main/java/org/piramalswasthya/cho/model/PNC.kt
index 5b80ba0fd..0e8ab5f25 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/PNC.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PNC.kt
@@ -33,17 +33,25 @@ data class PNCVisitCache(
     var isActive: Boolean,
     var pncDate: Long = System.currentTimeMillis(),
     var ifaTabsGiven: Int? = 0,
+    var calciumSupplementation: Int? = 0,
     var anyContraceptionMethod: Boolean? = null,
     var contraceptionMethod: String? = null,
+    var sterilisationDate: Long? = System.currentTimeMillis(),
     var otherPpcMethod: String? = null,
+    var anyDangerSign: String? = null,
     var motherDangerSign: String? = null,
     var otherDangerSign: String? = null,
+    var maternalSymptoms: String? = null,
+    var otherMaternalSymptoms: String? = null,
+    var pallor: String? = null,
+    var vaginalBleeding: String? = null,
     var referralFacility: String? = null,
     var motherDeath: Boolean = false,
     var deathDate: Long? = System.currentTimeMillis(),
     var causeOfDeath: String? = null,
     var otherDeathCause: String? = null,
     var placeOfDeath: String? = null,
+    var otherPlaceOfDeath: String? = null,
     var remarks: String? = null,
     var processed: String? = "N",
     var createdBy: String,
@@ -68,17 +76,25 @@ data class PNCVisitCache(
             isActive = isActive,
             pncDate = getDateTimeStringFromLong(pncDate)!!,
             ifaTabsGiven = ifaTabsGiven,
+            calciumSupplementation = calciumSupplementation,
             anyContraceptionMethod = anyContraceptionMethod,
             contraceptionMethod = contraceptionMethod,
+            sterilisationDate = sterilisationDate?.let { getDateTimeStringFromLong(it) },
             otherPpcMethod = otherPpcMethod,
+            anyDangerSign = anyDangerSign,
             motherDangerSign = motherDangerSign,
             otherDangerSign = otherDangerSign,
+            maternalSymptoms = maternalSymptoms,
+            otherMaternalSymptoms = otherMaternalSymptoms,
+            pallor = pallor,
+            vaginalBleeding = vaginalBleeding,
             referralFacility = referralFacility,
             motherDeath = motherDeath,
             deathDate = deathDate?.let { getDateTimeStringFromLong(it) },
             causeOfDeath = causeOfDeath,
             otherDeathCause = otherDeathCause,
             placeOfDeath = placeOfDeath,
+            otherPlaceOfDeath = otherPlaceOfDeath,
             remarks = remarks,
             createdBy = createdBy,
             createdDate = getDateTimeStringFromLong(createdDate)!!,
@@ -96,18 +112,30 @@ data class PNCNetwork(
     var isActive: Boolean,
     var pncDate: String,
     var ifaTabsGiven: Int?,
+    var calciumSupplementation: Int?,
     var anyContraceptionMethod: Boolean?,
     var contraceptionMethod: String?,
+    var sterilisationDate: String?,
     var otherPpcMethod: String?,
+    var anyDangerSign: String?,
     var motherDangerSign: String?,
     var otherDangerSign: String?,
+    var maternalSymptoms: String?,
+    var otherMaternalSymptoms: String?,
+    var pallor: String?,
+    var vaginalBleeding: String?,
     var referralFacility: String?,
     var motherDeath: Boolean,
     var deathDate: String?,
     var causeOfDeath: String?,
     var otherDeathCause: String?,
     var placeOfDeath: String?,
+    var otherPlaceOfDeath: String?,
     var remarks: String?,
+    var deliveryDischargeSummary1: String? = null,
+    var deliveryDischargeSummary2: String? = null,
+    var deliveryDischargeSummary3: String? = null,
+    var deliveryDischargeSummary4: String? = null,
     var createdBy: String,
     val createdDate: String,
     var updatedBy: String,
@@ -213,4 +241,88 @@ data class PncDomain(
     val benId: Long,
     val visitNumber: Int,
     val syncState: SyncState? = null
-)
\ No newline at end of file
+)
+
+/**
+ * Patient with Delivery Outcome and PNC data
+ */
+data class PatientWithDeliveryOutcomeAndPncCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val deliveryOutcome: List<DeliveryOutcomeCache>?,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val pncRecords: List<PNCVisitCache>
+) {
+    fun asDomainModel(): PatientWithPncDomain {
+        val activeDo = deliveryOutcome?.firstOrNull { it.isActive }
+        val latestPnc = pncRecords.maxByOrNull { it.pncPeriod }
+        
+        return PatientWithPncDomain(
+            patient = patient,
+            deliveryOutcome = activeDo,
+            latestPnc = latestPnc,
+            allPncRecords = pncRecords
+        )
+    }
+}
+
+/**
+ * Domain model for displaying patient with PNC data
+ */
+data class PatientWithPncDomain(
+    val patient: Patient,
+    val deliveryOutcome: DeliveryOutcomeCache?,
+    val latestPnc: PNCVisitCache?,
+    val allPncRecords: List<PNCVisitCache>,
+    val syncState: SyncState? = resolvePncSyncState(allPncRecords)
+) {
+    /**
+     * Get formatted delivery date string
+     */
+    fun getFormattedDeliveryDate(): String {
+        return deliveryOutcome?.dateOfDelivery?.let {
+            org.piramalswasthya.cho.utils.HelperUtil.getDateStringFromLong(it) ?: "NA"
+        } ?: "NA"
+    }
+
+    /**
+     * Get days since delivery
+     * Returns null if deliveryOutcome or dateOfDelivery is missing
+     */
+    fun getDaysSinceDelivery(): Long? {
+        return deliveryOutcome?.dateOfDelivery?.let {
+            TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - it)
+        }
+    }
+
+    /**
+     * Check if eligible for PNC (within 42 days or not completed all visits)
+     */
+    fun isEligibleForPNC(): Boolean {
+        // Return false if there is no delivery date
+        val dateOfDelivery = deliveryOutcome?.dateOfDelivery ?: return false
+        
+        val daysSinceDelivery = getDaysSinceDelivery() ?: return false
+        val lastPncPeriod = latestPnc?.pncPeriod ?: 0
+        
+        // Eligible if within 42 days OR haven't completed all PNC visits
+        return daysSinceDelivery <= 42 || lastPncPeriod < 42
+    }
+}
+
+private fun resolvePncSyncState(records: List<PNCVisitCache>): SyncState? {
+    if (records.isEmpty()) return null
+    return when {
+        records.any { it.syncState == SyncState.SYNCING } -> SyncState.SYNCING
+        records.any { it.syncState == SyncState.UNSYNCED } -> SyncState.UNSYNCED
+        records.all { it.syncState == SyncState.SYNCED } -> SyncState.SYNCED
+        else -> SyncState.UNSYNCED
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PainAndSymptomAssessment.kt b/app/src/main/java/org/piramalswasthya/cho/model/PainAndSymptomAssessment.kt
new file mode 100644
index 000000000..6e24b084f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PainAndSymptomAssessment.kt
@@ -0,0 +1,92 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "PAIN_SYMPTOM_ASSESSMENT")
+@JsonClass(generateAdapter = true)
+data class PainAndSymptomAssessment(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientID: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+
+    @ColumnInfo(name = "pain_severity")
+    var painSeverity: String? = null,
+
+    @ColumnInfo(name = "pain_duration")
+    var painDuration: String? = null,
+
+
+    @ColumnInfo(name = "symptoms_present")
+    var symptomsPresent: Boolean? = null,
+
+    @ColumnInfo(name = "other_symptoms_severity")
+    var otherSymptomsSeverity: String? = null,
+
+    // ---------------- Relief ----------------
+
+    @ColumnInfo(name = "immediate_relief_provided")
+    var immediateReliefProvided: Boolean? = null,
+
+    // ---- Section C: Palliative Care Identification ----
+
+    @ColumnInfo(name = "persistent_pain_present")
+    var persistentPainPresent: Boolean? = null,
+
+    @ColumnInfo(name = "pain_assessment_enabled")
+    var painAssessmentEnabled: Boolean? = null,
+
+    @ColumnInfo(name = "distressing_symptoms_present")
+    var distressingSymptoms: String? = null,
+
+    @ColumnInfo(name = "bedridden_or_severely_dependent")
+    var bedriddenOrSeverelyDependent: Boolean? = null,
+
+    @ColumnInfo(name = "life_limiting_illness_known")
+    var lifeLimitingIllnessKnown: Boolean? = null,
+
+    @ColumnInfo(name = "caregiver_support_required")
+    var caregiverSupportRequired: Boolean? = null,
+
+    @ColumnInfo(name = "palliative_care_eligible")
+    var palliativeCareEligible: Boolean? = null,
+
+    // ---- Symptom Assessment (Basic) ----
+    @ColumnInfo(name = "basic_symptoms_selected")
+    var basicSymptomsSelected: String? = null,
+
+    // ---- Basic Management (CHO Level) ----
+    @ColumnInfo(name = "basic_symptom_relief_provided")
+    var basicSymptomReliefProvided: Boolean? = null,
+
+    @ColumnInfo(name = "basic_psychosocial_support_provided")
+    var basicPsychosocialSupportProvided: Boolean? = null,
+
+    @ColumnInfo(name = "basic_caregiver_counselling_provided")
+    var basicCaregiverCounsellingProvided: Boolean? = null,
+
+    @ColumnInfo(name = "basic_management_remarks")
+    var basicManagementRemarks: String? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0,
+
+
+    // ---------------- Referral & Follow-up (Section F) ----------------
+
+    @Embedded
+    val referralFollowUp: ReferralFollowUpFields = ReferralFollowUpFields()
+
+) : FormDataModel, ReferralFollowUpModel by referralFollowUp
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/Patient.kt b/app/src/main/java/org/piramalswasthya/cho/model/Patient.kt
index caef03a5f..61b504a4a 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/Patient.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/Patient.kt
@@ -149,6 +149,9 @@ data class Patient (
     @ColumnInfo(name="benImageString")
     var benImage: String? = null,
 
+    @ColumnInfo(name = "statusOfWomanID")
+    var statusOfWomanID: Int? = null,
+
     @ColumnInfo(name="isNewAbha")
     var isNewAbha: Boolean? = false,
 
@@ -161,6 +164,7 @@ data class Patient (
     @ColumnInfo(name = "faceEmbedding")
     var faceEmbedding: List<Float>? = null,
 
+
 //    @ColumnInfo(name = "referDate")
 //    var referDate: String? = null,
 //
@@ -229,6 +233,11 @@ data class PatientDisplay(
         entityColumn = "religionID"
     )
     val religion: ReligionMaster?,
+    @Relation(
+        parentColumn = "statusOfWomanID",
+        entityColumn = "statusID"
+    )
+    val statusOfWoman: StatusOfWomanMaster?,
 )
 
 data class PatientDisplayWithVisitInfo(
@@ -313,6 +322,8 @@ data class PatientNetwork(
     val ageAtMarriage: Int?,
     val bankName: String?,
     val benImage: String?,
+    val beneficiaryID: String?,
+    val beneficiaryRegID: Long?,
     val benPhoneMaps: List<BenPhone>?,
     val beneficiaryConsent: Boolean?,
     val beneficiaryIdentities: List<String>?,
@@ -338,9 +349,11 @@ data class PatientNetwork(
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
     val providerServiceMapId: String?,
+    val reproductiveStatusId: Int?,
+    val reproductiveStatus: String?,
     val spouseName: String?,
     val titleId: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val faceEmbedding: List<Float>?
 ){
 
@@ -385,6 +398,8 @@ data class PatientNetwork(
         patientDisplay.patient.ageAtMarriage,
         null,
         patientDisplay.patient.benImage,
+        patientDisplay.patient.beneficiaryID?.toString(),
+        patientDisplay.patient.beneficiaryRegID,
         arrayListOf(BenPhone(patientDisplay.patient, user)),
         true,
         emptyList(),
@@ -410,14 +425,29 @@ data class PatientNetwork(
         user?.parkingPlaceId,
         user?.serviceMapId.toString(),
         user?.serviceMapId.toString(),
+        patientDisplay.patient.statusOfWomanID,
+        mapReproductiveStatusName(patientDisplay.patient.statusOfWomanID) ?: patientDisplay.statusOfWoman?.statusName,
         patientDisplay.patient.spouseName,
         null,
-        user?.vanId,
+        user?.facilityID,
         patientDisplay.patient.faceEmbedding
     )
 
 }
 
+private fun mapReproductiveStatusName(statusOfWomanID: Int?): String? {
+    return when (statusOfWomanID) {
+        1 -> "Eligible Couple"
+        2 -> "Pregnant Woman"
+        3 -> "Post Natal Mother"
+        4 -> "Elderly"
+        5 -> "Adolescent"
+        6 -> "Permanent Sterilization"
+        7 -> "Not Applicable"
+        else -> null
+    }
+}
+
 @JsonClass(generateAdapter = true)
 data class BenPhone(
     val alternateContactNumber: String?,
@@ -427,16 +457,16 @@ data class BenPhone(
     val parkingPlaceID: Int?,
     val phoneNo: String?,
     val phoneTypeID: Int?,
-    val vanID: Int?
+    val facilityID: Int?
 ){
-//    alternateContactNumber:null
+    //    alternateContactNumber:null
 //    benRelationshipID:11
 //    createdBy:"Pranathi"
 //    parentBenRegID:877
 //    parkingPlaceID:10
 //    phoneNo:"8989898989"
 //    phoneTypeID:1
-//    vanID:61
+//    facilityID:61
     constructor(patient: Patient, user: UserDomain?) : this(
         null,
         11,
@@ -445,7 +475,7 @@ data class BenPhone(
         user?.parkingPlaceId,
         patient.phoneNo,
         1,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -477,7 +507,8 @@ data class Bendemographics(
     val religionName: String?,
     val servicePointID: String?,
     val servicePointName: String?,
-    val stateID: Int?
+    val stateID: Int?,
+    val stateName: String?
 ){
     constructor(patientDisplay: PatientDisplay, user: UserDomain?) : this(
         null,
@@ -513,6 +544,7 @@ data class Bendemographics(
         user?.servicePointId.toString(),
         user?.servicePointName,
         stateID = patientDisplay.state?.stateID,
+        stateName = patientDisplay.state?.stateName,
 //        patientDisplay.patient.stateID
     )
 //    addressLine1:null
@@ -665,7 +697,10 @@ data class BeneficiariesDTO(
     val beneficiaryAge: Int?,
     val sourceOfInformation: String?,
     val isHIVPos: String?,
-    val faceEmbedding: List<Float>?
+    val faceEmbedding: List<Float>?,
+    val benImage: String?,
+    val reproductiveStatusId: Int?,
+    val reproductiveStatus: String?
 
 
 )
@@ -756,7 +791,8 @@ data class BenDetailDTO(
     val familyId: String?,
     val other: String?,
     val headOfFamily_Relation: String?,
-    val faceEmbedding: List<Float>?
+    val faceEmbedding: List<Float>?,
+    val benImage: String?
 
 )
 
@@ -848,4 +884,3 @@ data class PatientAadhaarDetails(
     val mobileNumber: String?,
     val dateOfBirth: String?,
 )
-
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInfoSync.kt b/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInfoSync.kt
index a19221405..7296e21c4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInfoSync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInfoSync.kt
@@ -102,7 +102,7 @@ data class PatientVisitInfoSync(
         doctorDataSynced = SyncState.SYNCED,
         labDataSynced = SyncState.SYNCED,
         pharmacistDataSynced = SyncState.SYNCED,
-        visitCategory = benFlow.VisitCategory ?: "",
+        visitCategory = benFlow.VisitCategory?.takeIf { it.isNotBlank() } ?: "General OPD",
         visitDate = benFlow.visitDate?.let {
             try {
                 val inputFormat = SimpleDateFormat("MMM d, yyyy, h:mm:ss a", Locale.ENGLISH)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInformation.kt b/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInformation.kt
index 4337b136e..4ae1d7fe8 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInformation.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PatientVisitInformation.kt
@@ -15,7 +15,7 @@ data class PatientVisitInformation(
     val serviceID: String?,
     val sessionID: String?,
     val tcRequest: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val visitDetails: VisitDetails?,
     val vitalDetails: VitalDetails?,
 //    benFlowID: "20307"
@@ -51,7 +51,7 @@ data class PatientVisitInformation(
         user?.serviceId?.toString(),
         "3",
         null,
-        user?.vanId,
+        user?.facilityID,
         VisitDetails(
             user = user,
             visit = visit,
@@ -84,7 +84,7 @@ data class PatientDoctorFormUpsync(
     val pharmacist_flag: String?,
     val sessionID: String?,
     val parkingPlaceID: Int?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val beneficiaryRegID: String?,
     val providerServiceMapID: String?,
     val visitCode: String?,
@@ -109,7 +109,7 @@ data class PatientDoctorFormUpsync(
         benFlow?.pharmacist_flag.toString(),
         "3",
         user?.parkingPlaceId,
-        user?.vanId,
+        user?.facilityID,
         benFlow?.beneficiaryRegID.toString(),
         user?.serviceMapId.toString(),
         benFlow?.visitCode.toString(),
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PncPatient.kt b/app/src/main/java/org/piramalswasthya/cho/model/PncPatient.kt
new file mode 100644
index 000000000..1f250226e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PncPatient.kt
@@ -0,0 +1,34 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+/**
+ * Simplified patient data class for PNC without delivery outcome
+ */
+data class PncPatientCache(
+    @Embedded
+    val patient: Patient,
+    @Relation(
+        parentColumn = "patientID",
+        entityColumn = "patientID"
+    )
+    val pncRecords: List<PNCVisitCache>
+) {
+    fun asDomainModel(): PncPatientDomain {
+        return PncPatientDomain(
+            patient = patient,
+            latestPnc = pncRecords.maxByOrNull { it.pncPeriod },
+            allPncRecords = pncRecords
+        )
+    }
+}
+
+/**
+ * Simplified domain model for displaying patient with PNC data
+ */
+data class PncPatientDomain(
+    val patient: Patient,
+    val latestPnc: PNCVisitCache?,
+    val allPncRecords: List<PNCVisitCache>
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/Prescription.kt b/app/src/main/java/org/piramalswasthya/cho/model/Prescription.kt
index 1c1f14b0e..0edea61c1 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/Prescription.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/Prescription.kt
@@ -170,7 +170,7 @@ data class PharmacistItemStockExitDataRequest(
 data class PharmacistPatientIssueDataRequest(
     val issuedBy: String,
     val visitCode: Long?,
-    val facilityID: Int,
+    val facilityID: Int?,
     val age: Int?,
     val beneficiaryID: Long?,
     val benRegID: Long,
@@ -185,7 +185,6 @@ data class PharmacistPatientIssueDataRequest(
     val visitID: Long?,
     val visitDate: String?,
     val parkingPlaceID: Int?,
-    val vanID: Int?,
     var itemStockExit: List<PharmacistItemStockExitDataRequest>
 )
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionUpsync.kt b/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionUpsync.kt
index 385734a1a..dab68c959 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionUpsync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionUpsync.kt
@@ -18,7 +18,7 @@ data class PrescriptionUpsync(
     val sctCode: String?,
     val sctTerm: String?,
     val createdBy: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val parkingPlaceID: Int?,
     val isEDL: Boolean?,
 ){
@@ -53,7 +53,7 @@ data class PrescriptionUpsync(
         null,
         null,
         user?.userName,
-        user?.vanId,
+        user?.facilityID,
         user?.parkingPlaceId,
         true
     )
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionValues.kt b/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionValues.kt
index 27d005b3e..8906ad803 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionValues.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PrescriptionValues.kt
@@ -10,7 +10,8 @@ data class PrescriptionValues(
     var dosage: String = "",
     var duration: String = "",
     var instructions: String = "",
-    var unit: String = "",
+    var unit: String = "Day(s)",
+    var isDispensed: Boolean = false,
     @Ignore
     var title: String = "Medicine-1"
 ) : Serializable
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/Procedure.kt b/app/src/main/java/org/piramalswasthya/cho/model/Procedure.kt
index aedd0b11e..cb8302072 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/Procedure.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/Procedure.kt
@@ -136,6 +136,6 @@ data class LabResultDTO(
     val visitCode: Long?,
     val providerServiceMapID: Int?,
     val specialist_flag: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val parkingPlaceID:Int?
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ProcedureMaster.kt b/app/src/main/java/org/piramalswasthya/cho/model/ProcedureMaster.kt
index 3f27156a5..ce1547cab 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/ProcedureMaster.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ProcedureMaster.kt
@@ -5,6 +5,7 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.ForeignKey.Companion.CASCADE
 import androidx.room.PrimaryKey
+import com.google.gson.annotations.SerializedName
 import com.squareup.moshi.JsonClass
 
 
@@ -24,7 +25,7 @@ data class ProcedureMaster (
 
 @Entity(tableName = "component_details_master",
     foreignKeys = [ForeignKey(
-        entity = Procedure::class,
+        entity = ProcedureMaster::class,
         childColumns = ["procedure_id"],
         parentColumns = ["id"],
         onDelete = CASCADE
@@ -92,3 +93,16 @@ data class ComponentDetailMasterDTO(
 data class ComponentOptionsMasterDTO(
     val name: String?,
 )
+
+/** Response item for [org.piramalswasthya.cho.network.AmritApiService.getProcedureFields]. */
+data class ProcedureFieldApiItem(
+    @SerializedName("id") val id: Long,
+    @SerializedName("inputType") val inputType: String,
+    @SerializedName("range_min") val rangeMin: Double?,
+    @SerializedName("range_max") val rangeMax: Double?,
+    @SerializedName("measurement_nit") val measurementNit: String?,
+    @SerializedName("isRequired") val isRequired: Boolean,
+    @SerializedName("test_component_name") val testComponentName: String,
+    @SerializedName("test_component_desc") val testComponentDesc: String,
+    @SerializedName("procedureID") val procedureID: Long,
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/PsychosocialCaregiverSupport.kt b/app/src/main/java/org/piramalswasthya/cho/model/PsychosocialCaregiverSupport.kt
new file mode 100644
index 000000000..f86473f7d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/PsychosocialCaregiverSupport.kt
@@ -0,0 +1,50 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "PSYCHOSOCIAL_CAREGIVER_SUPPORT")
+@JsonClass(generateAdapter = true)
+data class PsychosocialCaregiverSupport(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+    // ---------------- Counselling ----------------
+
+    @ColumnInfo(name = "psychosocial_counselling_provided")
+    var psychosocialCounsellingProvided: Boolean? = null,
+
+    @ColumnInfo(name = "caregiver_counselling_provided")
+    var caregiverCounsellingProvided: Boolean? = null,
+
+    // ---------------- Caregiver ----------------
+
+    @ColumnInfo(name = "caregiver_distress_identified")
+    var caregiverDistressIdentified: Boolean? = null,
+
+    // ---------------- Remarks ----------------
+
+    @ColumnInfo(name = "counselling_remarks")
+    var counsellingRemarks: String? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0,
+
+    // ---------------- Referral & Follow-up (Section F) ----------------
+
+    @Embedded
+    val referralFollowUp: ReferralFollowUpFields = ReferralFollowUpFields()
+
+) : FormDataModel, ReferralFollowUpModel by referralFollowUp
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ReferUpsync.kt b/app/src/main/java/org/piramalswasthya/cho/model/ReferUpsync.kt
index a5373a381..e738e0451 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/ReferUpsync.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ReferUpsync.kt
@@ -9,7 +9,7 @@ data class ReferUpsync(
     val referralReasonList: List<String>?,
     val otherReferralReason: String?,
     val revisitDate: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val parkingPlaceID: Int?,
     val beneficiaryRegID: String?,
     val benVisitID: String?,
@@ -45,7 +45,7 @@ data class ReferUpsync(
         null,
         null,
         null,
-        user?.vanId,
+        user?.facilityID,
         user?.parkingPlaceId,
         benFlow?.beneficiaryRegID.toString(),
         benFlow?.benVisitID.toString(),
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpFields.kt b/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpFields.kt
new file mode 100644
index 000000000..af0976136
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpFields.kt
@@ -0,0 +1,38 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import com.squareup.moshi.JsonClass
+
+/**
+ * Reusable set of referral & follow-up columns shared by every assessment entity.
+ * Embed with `@Embedded` in Room entities and delegate `ReferralFollowUpModel` to this instance.
+ */
+@JsonClass(generateAdapter = true)
+data class ReferralFollowUpFields(
+
+    @ColumnInfo(name = "referral_required")
+    override var referralRequired: Boolean? = null,
+
+    @ColumnInfo(name = "referral_level")
+    override var referralLevel: String? = null,
+
+    @ColumnInfo(name = "reason_for_referral")
+    override var reasonForReferral: String? = null,
+
+    @ColumnInfo(name = "follow_up_required")
+    override var followUpRequired: Boolean? = null,
+
+    @ColumnInfo(name = "follow_up_date")
+    override var followUpDate: String? = null,
+
+    @ColumnInfo(name = "case_status")
+    override var caseStatus: String? = null,
+
+    @ColumnInfo(name = "date_of_death")
+    override var dateOfDeath: String? = null,
+
+    @ColumnInfo(name = "remarks")
+    override var remarks: String? = null
+
+) : ReferralFollowUpModel
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpModel.kt b/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpModel.kt
new file mode 100644
index 000000000..06570e179
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ReferralFollowUpModel.kt
@@ -0,0 +1,15 @@
+package org.piramalswasthya.cho.model
+
+interface ReferralFollowUpModel {
+    var referralRequired: Boolean?
+    var referralLevel: String?
+    var reasonForReferral: String?
+    var followUpRequired: Boolean?
+    var followUpDate: String?
+
+    var caseStatus: String?
+
+    var dateOfDeath: String?
+
+    var remarks: String?
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/StatusOfWomanMaster.kt b/app/src/main/java/org/piramalswasthya/cho/model/StatusOfWomanMaster.kt
new file mode 100644
index 000000000..a6271c6c8
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/StatusOfWomanMaster.kt
@@ -0,0 +1,12 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "STATUS_OF_WOMAN_MASTER")
+data class StatusOfWomanMaster(
+    @PrimaryKey
+    val statusID: Int,
+    val statusName: String,
+    val statusCode: String
+)
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/ThroatDiagnosisAssessment.kt b/app/src/main/java/org/piramalswasthya/cho/model/ThroatDiagnosisAssessment.kt
new file mode 100644
index 000000000..39357bd04
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/model/ThroatDiagnosisAssessment.kt
@@ -0,0 +1,55 @@
+package org.piramalswasthya.cho.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.squareup.moshi.JsonClass
+import org.piramalswasthya.cho.configuration.FormDataModel
+
+@Entity(tableName = "THROAT_DIAGNOSIS_ASSESSMENT")
+@JsonClass(generateAdapter = true)
+data class ThroatDiagnosisAssessment(
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "assessment_id")
+    val assessmentId: Long = 0L,
+
+    @ColumnInfo(name = "patient_id")
+    val patientId: String,
+
+    @ColumnInfo(name = "ben_visit_no")
+    val benVisitNo: Int?,
+
+    /* -------------------- THROAT DIAGNOSIS FIELDS -------------------- */
+
+    @ColumnInfo(name = "symptoms")
+    var symptoms: List<String>? = null,
+
+    @ColumnInfo(name = "neck_swelling")
+    var neckSwelling: Boolean? = null,
+
+    @ColumnInfo(name = "difficulty_swallowing")
+    var difficultySwallowing: Boolean? = null,
+
+    @ColumnInfo(name = "tonsillitis")
+    var tonsillitis: Boolean? = null,
+
+    @ColumnInfo(name = "pharyngitis")
+    var pharyngitis: Boolean? = null,
+
+    @ColumnInfo(name = "laryngitis")
+    var laryngitis: Boolean? = null,
+
+    @ColumnInfo(name = "sinusitis")
+    var sinusitis: Boolean? = null,
+
+    @ColumnInfo(name = "cleft_lip")
+    var cleftLip: Boolean? = null,
+
+    @ColumnInfo(name = "cleft_palate")
+    var cleftPalate: Boolean? = null,
+
+    @ColumnInfo(name = "syncState")
+    var syncState: Int = 0
+
+) : FormDataModel
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/User.kt b/app/src/main/java/org/piramalswasthya/cho/model/User.kt
index 7813cf052..5ce9106f0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/User.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/User.kt
@@ -77,6 +77,14 @@ data class UserCache(
 
     @ColumnInfo(name = "facilityID")
     val facilityID: Int?,
+    @ColumnInfo(name = "facilityType")
+    val facilityType: String?,
+    @ColumnInfo(name = "facilityName")
+    val facilityName: String?,
+    @ColumnInfo(name = "employeeId")
+    val employeeId: String?,
+    @ColumnInfo(name = "locationType")
+    val locationType: String?,
 
     @ColumnInfo(name = "zone_name")
     val zoneName : String,
@@ -170,6 +178,10 @@ data class UserCache(
             servicePointName = servicePointName,
             vanId = vanId,
             facilityID = facilityID,
+            facilityName = facilityName,
+            facilityType = facilityType,
+            employeeId = employeeId,
+            locationType = locationType,
             zoneId = zoneId,
             zoneName = zoneName,
             parkingPlaceId = parkingPlaceId,
@@ -234,6 +246,10 @@ data class UserDomain(
     val zoneName: String,
     val vanId: Int,
     val facilityID : Int?,
+    val facilityName : String? = null,
+    val facilityType : String? = null,
+    val employeeId : String? = null,
+    val locationType : String? = null,
     val country: LocationEntity,
     val states : List<LocationEntity>,
     val districts : List<LocationEntity>,
@@ -289,6 +305,10 @@ data class UserNetwork(
     var zoneId: Int = -1,
     var vanId : Int = -1,
     var facilityID:Int=-1,
+    var facilityType: String?=null,
+    var facilityName: String?=null,
+    var employeeId: String?=null,
+    var locationType: String?=null,
     var parkingPlaceName: String?=null,
     var servicePointName: String?=null,
     var zoneName : String?=null,
@@ -356,6 +376,10 @@ data class UserNetwork(
             vanId = vanId,
             zoneId = zoneId,
             facilityID = facilityID,
+            facilityName = facilityName,
+            facilityType = facilityType,
+            employeeId = employeeId,
+            locationType = locationType,
             zoneName = zoneName?:"",
             parkingPlaceId = parkingPlaceId,
             parkingPlaceName = parkingPlaceName?:"",
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/VisitDetails.kt b/app/src/main/java/org/piramalswasthya/cho/model/VisitDetails.kt
index c2f9fac97..59f4fe278 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/VisitDetails.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/VisitDetails.kt
@@ -37,7 +37,7 @@ data class Adherence(
     val referralReason: String?,
     val toDrugs: String?,
     val toReferral: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33140"
 //    createdBy:"Pranathi"
@@ -61,7 +61,7 @@ data class Adherence(
         null,
         null,
         null,
-        user?.vanId
+        user?.facilityID
     )
 }
 
@@ -77,7 +77,7 @@ data class ChiefComplaintsNetwork(
     val parkingPlaceID: Int?,
     val providerServiceMapID: String?,
     val unitOfDuration: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
 //    benVisitID: null
 //    beneficiaryRegID: "33140"
 //    chiefComplaint:null
@@ -98,7 +98,7 @@ data class ChiefComplaintsNetwork(
         parkingPlaceID = user?.parkingPlaceId,
         providerServiceMapID = user?.serviceMapId?.toString(),
         unitOfDuration = chiefComplaint.durationUnit,
-        vanID = user?.vanId,
+        facilityID = user?.facilityID,
     )
 }
 
@@ -120,7 +120,7 @@ data class VisitDetailsNetwork(
     val reportFilePath: String?,
     val sideEffects: String?,
     val subVisitCategory: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val visitCategory: String?,
     val visitNo: String?,
     val visitReason: String?,
@@ -162,7 +162,7 @@ data class VisitDetailsNetwork(
         null,
         null,
         visit?.subCategory,
-        user?.vanId,
+        user?.facilityID,
         visit?.category,
         null,
         visit?.reasonForVisit,
diff --git a/app/src/main/java/org/piramalswasthya/cho/model/VitalDetails.kt b/app/src/main/java/org/piramalswasthya/cho/model/VitalDetails.kt
index 92734f04c..6e28bf237 100644
--- a/app/src/main/java/org/piramalswasthya/cho/model/VitalDetails.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/model/VitalDetails.kt
@@ -32,7 +32,7 @@ data class VitalDetails(
     val sputumChecked: String?,
     val systolicBP_1stReading: String?,
     val temperature: String?,
-    val vanID: Int?,
+    val facilityID: Int?,
     val waistCircumference_cm: String?,
     val waistHipRatio: String?,
     val weight_Kg: String?,
@@ -100,7 +100,7 @@ data class VitalDetails(
         null,
         systolicBP_1stReading = vitals?.bpSystolic,
         temperature = vitals?.temperature,
-        vanID = user?.vanId,
+        facilityID = user?.facilityID,
         waistCircumference_cm = vitals?.waistCircumference,
         null,
         weight_Kg = vitals?.weight,
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/AmritApiService.kt b/app/src/main/java/org/piramalswasthya/cho/network/AmritApiService.kt
index d1b4cb30c..746dbd08e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/network/AmritApiService.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/network/AmritApiService.kt
@@ -6,8 +6,10 @@ import org.piramalswasthya.cho.model.ANCPost
 import org.piramalswasthya.cho.model.AllocationItemDataRequest
 import org.piramalswasthya.cho.model.BenNewFlow
 import org.piramalswasthya.cho.model.CbacRequest
+import org.piramalswasthya.cho.model.DeliveryOutcomePost
 import org.piramalswasthya.cho.model.ECTNetwork
 import org.piramalswasthya.cho.model.ImmunizationPost
+import org.piramalswasthya.cho.model.InfantRegApiPost
 import org.piramalswasthya.cho.model.LabResultDTO
 import org.piramalswasthya.cho.model.LocationRequest
 import org.piramalswasthya.cho.model.MasterLabProceduresRequestModel
@@ -23,6 +25,7 @@ import org.piramalswasthya.cho.model.PharmacistPatientDataRequest
 import org.piramalswasthya.cho.model.PharmacistPatientIssueDataRequest
 import org.piramalswasthya.cho.model.PrescribedMedicineDataRequest
 import org.piramalswasthya.cho.model.PrescriptionTemplateDB
+import org.piramalswasthya.cho.model.PwrPost
 import org.piramalswasthya.cho.model.StockItemRequest
 import org.piramalswasthya.cho.model.UserMasterVillage
 import org.piramalswasthya.cho.model.fhir.SelectedOutreachProgram
@@ -34,6 +37,15 @@ import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
+import org.piramalswasthya.cho.model.EarDiagnosisNetwork
+import org.piramalswasthya.cho.model.OphthalmicNetwork
+import org.piramalswasthya.cho.model.OralHealthNetwork
+import org.piramalswasthya.cho.model.PainAssessmentNetwork
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupportNetwork
+import org.piramalswasthya.cho.model.NoseDiagnosisNetwork
+import org.piramalswasthya.cho.model.ThroatDiagnosisNetwork
+import org.piramalswasthya.cho.model.ElderlyHealthNetwork
+import org.piramalswasthya.cho.model.MentalHealthNetwork
 
 interface AmritApiService {
 
@@ -58,7 +70,7 @@ interface AmritApiService {
     @POST("common-api/user/getLoginResponse")
     suspend fun getLoginResponse() : Response<ResponseBody>
 
-    @POST("hwc-api/user/getUserVanSpDetails?apiKey=undefined")
+    @POST("hwc-api/user/getUserFacilityDetails")
     suspend fun getUserVanSpDetails(
         @Body vanServiceType: TmcUserVanSpDetailsRequest
     ): Response<ResponseBody>
@@ -101,6 +113,8 @@ interface AmritApiService {
 
     @POST("hwc-api/sync/beneficiariesToServer")
     suspend fun saveBenificiaryDetails(@Body benificiary: PatientNetwork) : Response<ResponseBody>
+    @POST("hwc-api/sync/update/beneficiariesToServer")
+    suspend fun updateBenificiaryDetails(@Body benificiary: PatientNetwork) : Response<ResponseBody>
 
     @POST("hwc-api/sync/beneficiariesToAppCount")
     suspend fun getBeneficiariesCount(@Body villageList: VillageIdList): Response<ResponseBody>
@@ -129,22 +143,55 @@ interface AmritApiService {
     @GET("hwc-api/sync/{userID}/prescriptionTemplatesDataToApp")
     suspend fun getTemplateFromServer(@Path("userID") userID: Int): Response<ResponseBody>
 
-    @POST("/flw-api/maternalCare/ancVisit/saveAll")
+    @POST("/hwc-api/maternal/ancVisit/saveAll")
     suspend fun postAncForm(@Body ancPostList: List<ANCPost>): Response<ResponseBody>
 
-    @POST("/flw-api/maternalCare/pnc/saveAll")
+    @POST("/hwc-api/pnc/saveAll")
     suspend fun postPncForm(@Body ancPostList: List<PNCNetwork>): Response<ResponseBody>
 
+    @POST("/hwc-api/pnc/getAll")
+    suspend fun getAllPncVisits(@Body request: Any): Response<ResponseBody>
+
+    @POST("/hwc-api/maternal/pregnantWoman/saveAll")
+    suspend fun postPregnantWomanForm(@Body pwrPostList: List<PwrPost>): Response<ResponseBody>
+
+    @POST("/hwc-api/maternal/pregnantWoman/getAll")
+    suspend fun getAllPregnantWomen(@Body request: Any): Response<ResponseBody>
+
+    @POST("/hwc-api/maternal/ancVisit/getAll")
+    suspend fun getAllAncVisits(@Body request: Any): Response<ResponseBody>
+
+    @POST("/hwc-api/deliveryOutcome/saveAll")
+    suspend fun postDeliveryOutcomeForm(@Body deliveryOutcomeList: List<DeliveryOutcomePost>): Response<ResponseBody>
+
+    @POST("/hwc-api/deliveryOutcome/getAll")
+    suspend fun getAllDeliveryOutcomes(@Body request: Any): Response<ResponseBody>
+
     @POST("/flw-api/child-care/vaccination/saveAll")
     suspend fun postChildImmunizationDetails(@Body immunizationList: List<ImmunizationPost>): Response<ResponseBody>
 
+    @POST("/hwc-api/child/saveAll")
+    suspend fun postChildDetails(@Body request: Any): Response<ResponseBody>
+
+    @POST("/hwc-api/child/getAll")
+    suspend fun getAllChildren(@Body request: Any): Response<ResponseBody>
+
+    @POST("/hwc-api/infant/saveAll")
+    suspend fun postInfantRegForm(@Body infantRegList: List<InfantRegApiPost>): Response<ResponseBody>
+
+    @POST("/hwc-api/infant/getAll")
+    suspend fun getAllInfants(@Body request: Any): Response<ResponseBody>
+
     @POST("/hwc-api/NCD/save/nurseData")
     suspend fun postCbacData(@Body cbacList: CbacRequest): Response<ResponseBody>
 
 
-    @POST("/flw-api/couple/tracking/saveAll")
+    @POST("/hwc-api/couple/tracking/saveAll")
     suspend fun postEctForm(@Body ectPostList: List<ECTNetwork>): Response<ResponseBody>
 
+    @POST("/hwc-api/couple/tracking/getAll")
+    suspend fun getEligibleCouples(@Body villageList: VillageIdList): Response<ResponseBody>
+
     @GET("/flw-api/child-care/vaccine/getAll")
     suspend fun getAllChildVaccines(@Query("category") category: String): Response<ResponseBody>
 
@@ -242,12 +289,11 @@ interface AmritApiService {
                                    @Path("gender") gender: String,
                                    @Query("apiKey") apiKey :String): Response<ResponseBody>
 
-    @GET("hwc-api/master/doctor/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}/{facilityID}/{vanID}")
+    @GET("hwc-api/master/doctor/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}/{facilityID}")
     suspend fun getDoctorMasterData(@Path("visitCategoryID") visitCategoryID: Int,
                                    @Path("providerServiceMapID") providerServiceMapID : Int,
                                    @Path("gender") gender: String,
                                    @Path("facilityID") facilityID: Int,
-                                   @Path("vanID") vanID: Int,
                                    @Query("apiKey") apiKey :String): Response<ResponseBody>
 
     @POST("hwc-api/generalOPD/getBenCaseRecordFromDoctorGeneralOPD")
@@ -256,6 +302,9 @@ interface AmritApiService {
     @POST("/hwc-api/registrar/get/benDetailsByRegIDForLeftPanelNew?apiKey=undefined")
     suspend fun getPharmacistPatientDetails(@Body pharmacistPatientDataRequest: PharmacistPatientDataRequest) : Response<ResponseBody>
 
+    @GET("/hwc-api/procedureFields/fields")
+    suspend fun getProcedureFields(): Response<ResponseBody>
+
     @POST("/inventory-api/allocateStockFromItemID/{facilityID}?apiKey=undefined")
     suspend fun getPharmacistAllocationItemList(@Body allocationItemDataRequest: List<AllocationItemDataRequest>, @Path("facilityID") facilityID: Int) : Response<ResponseBody>
 
@@ -270,5 +319,57 @@ interface AmritApiService {
         @Body request: StockItemRequest
     ):Response<ResponseBody>
 
+    @POST("/hwc-api/earDiagnosis/saveAll")
+    suspend fun postEarForm(@Body earList: List<EarDiagnosisNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/earDiagnosis/getAll")
+    suspend fun getEarVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/opthalmicVisit/saveAll")
+    suspend fun postOphthalmicForm(@Body ophthalmicList: List<OphthalmicNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/opthalmicVisit/getAll")
+    suspend fun getOphthalmicVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/oralHealth/saveAll")
+    suspend fun postOralForm(@Body oralList: List<OralHealthNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/oralHealth/getAll")
+    suspend fun getOralVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/painSymptom/saveAll")
+    suspend fun postPainForm(@Body painList: List<PainAssessmentNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/painSymptom/getAll")
+    suspend fun getPainVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/psychosocialCaregiver/saveAll")
+    suspend fun postPsychosocialCaregiverForm(@Body psychosocialCaregiverList: List<PsychosocialCaregiverSupportNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/psychosocialCaregiver/getAll")
+    suspend fun getPsychosocialCaregiverVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/noseDiagnosis/saveAll")
+    suspend fun postNoseForm(@Body noseList: List<NoseDiagnosisNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/noseDiagnosis/getAll")
+    suspend fun getNoseVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/throatDiagnosis/saveAll")
+    suspend fun postThroatForm(@Body throatList: List<ThroatDiagnosisNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/throatDiagnosis/getAll")
+    suspend fun getThroatVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
+    @POST("/hwc-api/elderlyHealth/saveAll")
+    suspend fun postElderlyForm(@Body elderlyList: List<ElderlyHealthNetwork>): Response<ResponseBody>
+
+    @POST("/hwc-api/elderlyHealth/getAll")
+    suspend fun getElderlyVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+    @POST("/hwc-api/mentalHealth/saveAll")
+    suspend fun postMentalForm(@Body mentalList: List<MentalHealthNetwork>): Response<ResponseBody>
+    @POST("/hwc-api/mentalHealth/getAll")
+    suspend fun getMentalVisits(@Body villageList: VillageIdList): Response<ResponseBody>
+
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/JsonAdapters.kt b/app/src/main/java/org/piramalswasthya/cho/network/JsonAdapters.kt
index ec96c0fa5..7cc21791a 100644
--- a/app/src/main/java/org/piramalswasthya/cho/network/JsonAdapters.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/network/JsonAdapters.kt
@@ -761,9 +761,45 @@ data class LabProceduresDataRequest(
     val visitCode: Long,
 )
 
+
 fun getLongFromDate(dateString: String?): Long {
-    val f = SimpleDateFormat("MMM d, yyyy h:mm:ss a", Locale.ENGLISH)
-    val date = dateString?.let { f.parse(it) }
-    return date?.time ?: 0L
+    if (dateString.isNullOrBlank()) return 0L
+
+    val normalized = dateString.trim()
+    val patterns = listOf(
+        "MMM d, yyyy h:mm:ss a",
+        "dd/MM/yyyy HH:mm:ss",
+        "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+        "yyyy-MM-dd'T'HH:mm:ss'Z'",
+        "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
+        "yyyy-MM-dd'T'HH:mm:ssXXX",
+        "yyyy-MM-dd HH:mm:ss",
+        "dd-MM-yyyy",
+        "yyyy-MM-dd"
+    )
+
+    for (pattern in patterns) {
+        try {
+            val format = SimpleDateFormat(pattern, Locale.ENGLISH).apply {
+                isLenient = false
+                if (pattern.contains("'Z'")) {
+                    timeZone = java.util.TimeZone.getTimeZone("UTC")
+                }
+            }
+            val date = format.parse(normalized)
+            if (date != null) return date.time
+        } catch (_: Exception) {
+            // Try next known format.
+        }
+    }
+
+    return 0L
 }
 
+fun getDateFromLong(dateLong: Long): String? {
+    if (dateLong == 0L) return null
+    val cal = java.util.Calendar.getInstance()
+    cal.timeInMillis = dateLong
+    val f = SimpleDateFormat("dd-MM-yyyy", Locale.ENGLISH)
+    return f.format(cal.time)
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProvider.kt b/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProvider.kt
new file mode 100644
index 000000000..bc3d0cf99
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProvider.kt
@@ -0,0 +1,23 @@
+package org.piramalswasthya.cho.network
+
+/**
+ * Synchronous token refresh provider used by [AuthRefreshInterceptor].
+ * Set via [TokenRefreshHolder] after DI is ready to avoid circular dependency
+ * (interceptor -> OkHttpClient -> AmritApiService -> UserRepo).
+ */
+interface TokenRefreshProvider {
+    /**
+     * Refreshes the JWT/token by calling the login API with stored credentials.
+     * @return true if refresh succeeded and token was updated, false otherwise.
+     */
+    fun refresh(): Boolean
+}
+
+/**
+ * Holder for the [TokenRefreshProvider] so that [AuthRefreshInterceptor] can
+ * obtain it without being injected (which would create a circular dependency).
+ */
+object TokenRefreshHolder {
+    @Volatile
+    var provider: TokenRefreshProvider? = null
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProviderImpl.kt b/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProviderImpl.kt
new file mode 100644
index 000000000..26d6f9d03
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/network/TokenRefreshProviderImpl.kt
@@ -0,0 +1,77 @@
+package org.piramalswasthya.cho.network
+
+import kotlinx.coroutines.runBlocking
+import org.json.JSONObject
+import org.piramalswasthya.cho.crypt.CryptoUtil
+import org.piramalswasthya.cho.database.room.dao.UserDao
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import retrofit2.HttpException
+import timber.log.Timber
+import java.net.SocketTimeoutException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Implementation of [TokenRefreshProvider] that calls the JWT/login API with stored
+ * credentials and updates the token. Used by [AuthRefreshInterceptor] when any API
+ * returns 401/403 or statusCode 5002 (token expired).
+ */
+@Singleton
+class TokenRefreshProviderImpl @Inject constructor(
+    private val userDao: UserDao,
+    private val amritApiService: AmritApiService,
+    private val preferenceDao: PreferenceDao
+) : TokenRefreshProvider {
+
+    private val cryptoUtil = CryptoUtil()
+
+    override fun refresh(): Boolean = runBlocking {
+        try {
+            val user = userDao.getLoggedInUser() ?: run {
+                Timber.w("TokenRefreshProvider: No logged-in user")
+                return@runBlocking false
+            }
+            refreshTokenTmc(user.userName, user.password)
+        } catch (e: Exception) {
+            Timber.e(e, "TokenRefreshProvider: refresh failed")
+            false
+        }
+    }
+
+    private suspend fun refreshTokenTmc(userName: String, password: String): Boolean {
+        return try {
+            val encryptedPassword = cryptoUtil.encrypt(password)
+            val response = amritApiService.getJwtToken(
+                TmcAuthUserRequest(userName, encryptedPassword)
+            )
+            if (!response.isSuccessful) {
+                return false
+            }
+            val bodyString = response.body()?.string()
+                ?: return false
+            val responseBody = JSONObject(bodyString)
+            val responseStatusCode = responseBody.getInt("statusCode")
+            if (responseStatusCode == 200) {
+                val data = responseBody.getJSONObject("data")
+                TokenInsertTmcInterceptor.setJwt(data.getString("jwtToken"))
+                preferenceDao.registerJWTAmritToken(data.getString("jwtToken"))
+                val token = data.getString("key")
+                TokenInsertTmcInterceptor.setToken(token)
+                preferenceDao.registerPrimaryApiToken(token)
+                Timber.d("TokenRefreshProvider: Token refreshed for user $userName")
+                true
+            } else {
+                val errorMessage = responseBody.optString("errorMessage", "Unknown error")
+                Timber.w("TokenRefreshProvider: API error $responseStatusCode - $errorMessage")
+                false
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.w("TokenRefreshProvider: Timeout, retrying once")
+            refreshTokenTmc(userName, password)
+        } catch (e: HttpException) {
+            Timber.w("TokenRefreshProvider: Auth failed - ${e.code()}")
+            false
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/interceptors/AuthRefreshInterceptor.kt b/app/src/main/java/org/piramalswasthya/cho/network/interceptors/AuthRefreshInterceptor.kt
new file mode 100644
index 000000000..42a5c1c8c
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/network/interceptors/AuthRefreshInterceptor.kt
@@ -0,0 +1,112 @@
+package org.piramalswasthya.cho.network.interceptors
+
+import okhttp3.Interceptor
+import okhttp3.Protocol
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.toResponseBody
+import org.json.JSONObject
+import org.piramalswasthya.cho.network.TokenRefreshHolder
+import timber.log.Timber
+
+/**
+ * OkHttp interceptor that detects expired JWT (HTTP 401/403 or API statusCode 5002),
+ * refreshes the token via login API, and retries the original request once.
+ * Prevents sync/API failures when the app is kept open overnight and the token expires.
+ */
+class AuthRefreshInterceptor : Interceptor {
+
+    companion object {
+        private const val HEADER_NO_AUTH = "No-Auth"
+        /** Header added on retry so we only retry once. */
+        private const val HEADER_RETRY = "X-Auth-Retry"
+        private const val API_STATUS_TOKEN_EXPIRED = 5002
+    }
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+
+        // Do not add token or try refresh for login/refresh requests
+        if (request.header(HEADER_NO_AUTH) != null) {
+            return chain.proceed(request)
+        }
+
+        // If this is already a retry after refresh, don't try again
+        if (request.header(HEADER_RETRY) != null) {
+            return chain.proceed(request)
+        }
+
+        val response = chain.proceed(request)
+
+        // HTTP-level auth failure: refresh and retry once
+        if (response.code == 401 || response.code == 403) {
+            if (performRefreshAndRetry(chain, request)) {
+                response.close()
+                return retryRequest(chain, request)
+            }
+            return response
+        }
+
+        // Success response might still have API-level token expiry (statusCode 5002)
+        if (response.code == 200 && response.body != null) {
+            val contentType = response.body!!.contentType()
+            val bodyString = response.body!!.string()
+            response.close()
+
+            val statusCode = try {
+                JSONObject(bodyString).optInt("statusCode", -1)
+            } catch (_: Exception) {
+                -1
+            }
+
+            if (statusCode == API_STATUS_TOKEN_EXPIRED) {
+                Timber.w("AuthRefreshInterceptor: API returned statusCode 5002 (token expired)")
+                if (performRefreshAndRetry(chain, request)) {
+                    return retryRequest(chain, request)
+                }
+                // Return the original error response so caller can handle
+                return Response.Builder()
+                    .request(request)
+                    .protocol(Protocol.HTTP_1_1)
+                    .code(401)
+                    .message("Token expired")
+                    .body(bodyString.toResponseBody(contentType))
+                    .build()
+            }
+
+            // Rebuild response with consumed body so caller can read it
+            return response.newBuilder()
+                .body(bodyString.toResponseBody(contentType))
+                .build()
+        }
+
+        return response
+    }
+
+    private fun performRefreshAndRetry(chain: Interceptor.Chain, request: Request): Boolean {
+        val provider = TokenRefreshHolder.provider
+        if (provider == null) {
+            Timber.w("AuthRefreshInterceptor: TokenRefreshProvider not set, cannot refresh")
+            return false
+        }
+        return try {
+            val refreshed = provider.refresh()
+            if (refreshed) {
+                Timber.d("AuthRefreshInterceptor: Token refreshed successfully, retrying request")
+            } else {
+                Timber.w("AuthRefreshInterceptor: Token refresh failed (no user or API error)")
+            }
+            refreshed
+        } catch (e: Exception) {
+            Timber.e(e, "AuthRefreshInterceptor: Error during token refresh")
+            false
+        }
+    }
+
+    private fun retryRequest(chain: Interceptor.Chain, originalRequest: Request): Response {
+        val retryRequest = originalRequest.newBuilder()
+            .header(HEADER_RETRY, "1")
+            .build()
+        return chain.proceed(retryRequest)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/network/interceptors/TokenInsertTmcInterceptor.kt b/app/src/main/java/org/piramalswasthya/cho/network/interceptors/TokenInsertTmcInterceptor.kt
index 7e0d60182..c91ab3d32 100644
--- a/app/src/main/java/org/piramalswasthya/cho/network/interceptors/TokenInsertTmcInterceptor.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/network/interceptors/TokenInsertTmcInterceptor.kt
@@ -26,6 +26,11 @@ class TokenInsertTmcInterceptor : Interceptor{
             return JWT
         }
 
+        fun clearTokens() {
+            TOKEN = ""
+            JWT = ""
+        }
+
     }
 
     override fun intercept(chain: Interceptor.Chain): Response {
@@ -33,7 +38,7 @@ class TokenInsertTmcInterceptor : Interceptor{
         if (request.header("No-Auth") == null) {
             request = request
                 .newBuilder()
-                .addHeader("Authorization", TOKEN)
+                //.addHeader("Authorization", TOKEN)
                 .addHeader("Jwttoken" , JWT)
                 .build()
         }
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/AmritSyncRepositoryHelper.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/AmritSyncRepositoryHelper.kt
new file mode 100644
index 000000000..c67fb667b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/AmritSyncRepositoryHelper.kt
@@ -0,0 +1,212 @@
+package org.piramalswasthya.cho.repositories
+
+import kotlinx.coroutines.delay
+import org.json.JSONArray
+import org.json.JSONObject
+import org.piramalswasthya.cho.network.VillageIdList
+import okhttp3.ResponseBody
+import retrofit2.Response
+import timber.log.Timber
+import java.net.SocketTimeoutException
+
+object AmritSyncRepositoryHelper {
+    private const val STATUS_OK = 200
+    private const val STATUS_TOKEN_EXPIRED = 5002
+    private const val STATUS_NO_RECORDS = 5000
+    private const val MAX_PULL_ATTEMPTS = 3
+    private const val INITIAL_BACKOFF_MS = 500L
+
+    fun convertStringToIntList(villageIds: String): List<Int> {
+        if (villageIds.trim().isEmpty()) return emptyList()
+        return villageIds.split(",").mapNotNull { it.trim().toIntOrNull() }
+    }
+
+    suspend fun <T, N> pushUnsynced(
+        unsyncedList: List<T>,
+        mapToPayload: suspend (T) -> N?,
+        post: suspend (List<N>) -> Response<ResponseBody>,
+        markSynced: suspend (T) -> Unit,
+        logLabel: String
+    ): Boolean {
+        if (unsyncedList.isEmpty()) return true
+
+        val payload = mutableListOf<N>()
+        val sentItems = mutableListOf<T>()
+        unsyncedList.forEach { item ->
+            val model = mapToPayload(item) ?: return@forEach
+            payload.add(model)
+            sentItems.add(item)
+        }
+
+        if (payload.isEmpty()) return false
+
+        return try {
+            val response = post(payload)
+            val rawResponseBody = response.body()?.string()
+            val statusCode = rawResponseBody?.let { body ->
+                runCatching { JSONObject(body).optInt("statusCode") }.getOrNull()
+            }
+            if (!response.isSuccessful) {
+                Timber.w(
+                    "Failed syncing %s: httpCode=%d, statusCode=%s, body=%s",
+                    logLabel,
+                    response.code(),
+                    statusCode,
+                    rawResponseBody
+                )
+                false
+            } else if (statusCode == STATUS_OK) {
+                sentItems.forEach { markSynced(it) }
+                true
+            } else {
+                Timber.w(
+                    "Failed syncing %s: httpCode=%d, statusCode=%s, body=%s",
+                    logLabel,
+                    response.code(),
+                    statusCode,
+                    rawResponseBody
+                )
+                false
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Error syncing $logLabel")
+            false
+        }
+    }
+
+    suspend fun pullWithRetry(
+        villageIds: String,
+        lastSyncDate: String,
+        fetch: suspend (VillageIdList) -> Response<ResponseBody>,
+        refreshToken: suspend () -> Boolean,
+        onDataArray: suspend (JSONArray) -> Unit,
+        logLabel: String
+    ): Boolean {
+        var backoffMs = INITIAL_BACKOFF_MS
+
+        repeat(MAX_PULL_ATTEMPTS) { attempt ->
+            try {
+                val villageList = VillageIdList(convertStringToIntList(villageIds), lastSyncDate)
+                var response = fetch(villageList)
+                var attemptedTokenRefreshRetry = false
+
+                while (true) {
+                    if (!response.isSuccessful) {
+                        val httpCode = response.code()
+                        val rawResponseBody = response.errorBody()?.string()
+                        Timber.w(
+                            "HTTP failure while pulling %s: code=%d, body=%s, attempt=%d/%d",
+                            logLabel,
+                            httpCode,
+                            rawResponseBody,
+                            attempt + 1,
+                            MAX_PULL_ATTEMPTS
+                        )
+
+                        if (httpCode in 400..499) return false
+
+                        if (attempt < MAX_PULL_ATTEMPTS - 1) {
+                            delay(backoffMs)
+                            backoffMs *= 2
+                            return@repeat
+                        }
+                        Timber.w("Max retry attempts reached for HTTP failure while pulling $logLabel")
+                        return false
+                    }
+
+                    val responseBody = response.body()?.string()
+                    if (responseBody.isNullOrBlank()) {
+                        Timber.e("Empty response body while pulling $logLabel, code=${response.code()}")
+                        return false
+                    }
+
+                    val jsonObj = try {
+                        JSONObject(responseBody)
+                    } catch (e: Exception) {
+                        Timber.e(e, "Invalid JSON while pulling $logLabel, body=$responseBody")
+                        return false
+                    }
+
+                    if (jsonObj.isNull("statusCode")) {
+                        Timber.e(
+                            "Missing statusCode while pulling %s, code=%d, body=%s",
+                            logLabel,
+                            response.code(),
+                            responseBody
+                        )
+                        return false
+                    }
+
+                    val statusCode = jsonObj.getInt("statusCode")
+                    when (statusCode) {
+                        STATUS_OK -> {
+                            val dataArray = jsonObj.optJSONArray("data")
+                            if (dataArray != null && dataArray.length() > 0) {
+                                onDataArray(dataArray)
+                            }
+                            return true
+                        }
+                        STATUS_TOKEN_EXPIRED -> {
+                            val tokenRefreshed = refreshToken()
+                            if (!tokenRefreshed) {
+                                Timber.w("Token refresh failed while pulling $logLabel")
+                                return false
+                            }
+
+                            if (attemptedTokenRefreshRetry) {
+                                Timber.w("Token expired again after refresh retry while pulling $logLabel")
+                                return false
+                            }
+
+                            attemptedTokenRefreshRetry = true
+                            response = fetch(villageList)
+                        }
+                        STATUS_NO_RECORDS -> return true
+                        else -> {
+                            Timber.w(
+                                "Unknown statusCode while pulling %s: statusCode=%d, code=%d, body=%s",
+                                logLabel,
+                                statusCode,
+                                response.code(),
+                                responseBody
+                            )
+                            return false
+                        }
+                    }
+                }
+            } catch (e: SocketTimeoutException) {
+                if (attempt < MAX_PULL_ATTEMPTS - 1) {
+                    delay(backoffMs)
+                    backoffMs *= 2
+                    return@repeat
+                }
+                Timber.e(e, "Socket timeout while pulling $logLabel after retries")
+                return false
+            } catch (e: Exception) {
+                Timber.e(e, "Error pulling $logLabel")
+                return false
+            }
+            return false
+        }
+
+        return false
+    }
+
+    suspend fun <N> upsertByBeneficiaryRegId(
+        dataArray: JSONArray,
+        parseNetwork: (JSONObject) -> N,
+        beneficiaryRegId: (N) -> Long?,
+        resolvePatientId: suspend (Long) -> String?,
+        isExisting: suspend (String, N) -> Boolean,
+        insertNew: suspend (String, N) -> Unit
+    ) {
+        for (i in 0 until dataArray.length()) {
+            val networkObj = parseNetwork(dataArray.getJSONObject(i))
+            val benRegId = beneficiaryRegId(networkObj) ?: continue
+            val patientId = resolvePatientId(benRegId) ?: continue
+            if (!isExisting(patientId, networkObj)) {
+                insertNew(patientId, networkObj)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/BenFlowRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/BenFlowRepo.kt
index 701623fed..06594f187 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/BenFlowRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/BenFlowRepo.kt
@@ -3,8 +3,10 @@ package org.piramalswasthya.cho.repositories
 import android.util.Log
 import androidx.room.Transaction
 import com.google.gson.Gson
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import org.json.JSONArray
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.room.dao.BatchDao
@@ -95,6 +97,18 @@ class BenFlowRepo @Inject constructor(
     private val caseRecordeDao: CaseRecordeDao,
 ) {
 
+    companion object {
+        // Max beneficiaries pulled concurrently in the per-record nurse/doctor case-data pass.
+        // Kept small so the server isn't hammered while still cutting wall-clock time dramatically.
+        private const val CLINICAL_PULL_CONCURRENCY = 3
+    }
+
+    private fun buildDrugStrength(strength: String?, unitOfMeasurement: String?): String? {
+        val cleanStrength = strength?.trim().orEmpty()
+        val cleanUnit = unitOfMeasurement?.trim().orEmpty()
+        return (cleanStrength + cleanUnit).trim().ifBlank { null }
+    }
+
 
     suspend fun getBenFlowByBenRegIdAndBenVisitNo(beneficiaryRegID: Long, benVisitNo: Int) : BenFlow?{
         return benFlowDao.getBenFlowByBenRegIdAndBenVisitNo(beneficiaryRegID, benVisitNo)
@@ -171,14 +185,58 @@ class BenFlowRepo @Inject constructor(
 
     }
 
-    suspend fun downloadAndSyncFlowRecords(): Boolean {
+    suspend fun downloadAndSyncFlowRecords(pullClinical: Boolean = true, ignoreWatermark: Boolean = false): Boolean {
 
         val user = userRepo.getLoggedInUser()
+        val loggedInFacilityID = user?.facilityID
+        val parsedVillageIds = convertStringToIntList(user?.assignVillageIds ?: "")
+        val prefVillageIds = preferenceDao.getUserLocationData()
+            ?.villageList
+            ?.mapNotNull { it.districtBranchID.toIntOrNull() }
+            ?.distinct()
+            ?: emptyList()
+        val effectiveVillageIds: List<Int> = when {
+            parsedVillageIds.isNotEmpty() -> parsedVillageIds
+            prefVillageIds.isNotEmpty() -> prefVillageIds
+            user?.masterVillageID != null -> listOf(user.masterVillageID!!)
+            else -> emptyList()
+        }
+        // Upsync/form-save re-pull passes ignoreWatermark=true so a JUST-created benflow (whose
+        // server timestamp the incremental hour-truncated watermark would exclude) is reliably
+        // returned by the server. Safe because this pass runs pullClinical=false and does NOT
+        // advance the watermark (only PullClinicalRecordsWorker does), so incremental downsync is
+        // unaffected.
+        val lastSyncDate = if (ignoreWatermark) {
+            preferenceDao.getEpochBenflowSyncTime()
+        } else {
+            preferenceDao.getLastBenflowSyncTime()
+        }
+
+//        if (effectiveVillageIds.isEmpty() || lastSyncDate.isBlank()) {
+//            Log.w(
+//                "BenFlowFacilityDebug",
+//                "downloadAndSyncFlowRecords: skipped due to incomplete payload villageIDs=$effectiveVillageIds lastSyncDate='$lastSyncDate' assignVillageIds='${user?.assignVillageIds}' masterVillageID=${user?.masterVillageID}"
+//            )
+//            return false
+//        }
 
         val villageList = VillageIdList(
-            convertStringToIntList(user?.assignVillageIds ?: ""),
-            preferenceDao.getLastBenflowSyncTime()
+            effectiveVillageIds,
+            lastSyncDate
+        )
+        Log.i(
+            "BenFlowFacilityDebug",
+            "downloadAndSyncFlowRecords: userFacility=${user?.facilityID}, userVan=${user?.vanId}, assignVillageIds='${user?.assignVillageIds}', prefVillageCount=${prefVillageIds.size}, finalVillageCount=${villageList.villageID.size}, lastSyncDate='${villageList.lastSyncDate}'"
         )
+        if (loggedInFacilityID != null) {
+            val updatedRows = benFlowDao.backfillNullFacilityID(loggedInFacilityID)
+            Log.i(
+                "BenFlowFacilityDebug",
+                "downloadAndSyncFlowRecords: backfillNullFacilityID applied facilityID=$loggedInFacilityID updatedRows=$updatedRows"
+            )
+        } else {
+            Log.w("BenFlowFacilityDebug", "downloadAndSyncFlowRecords: loggedIn user facilityID is null; backfill skipped")
+        }
 
         when(val response = getBenFlowCountToDownload(villageList)){
             is NetworkResult.Success -> {
@@ -192,10 +250,13 @@ class BenFlowRepo @Inject constructor(
             else -> {}
         }
 
-        when(val response = syncFlowIds(villageList)){
+        when(val response = syncFlowIds(villageList, pullClinical)){
             is NetworkResult.Success -> {
-                return true
-//                return (response.data as DownsyncSuccess).isSuccess
+                // Only report success (which lets PullBenFlowFromAmritWorker advance
+                // lastBenflowSyncTime) when EVERY benflow row matched a local patient. A partial run
+                // must not move the hour-truncated watermark, otherwise the server returns 0 rows on
+                // the next pull and the unmatched rows' module data is lost until data is cleared.
+                return (response.data as DownsyncSuccess).isSuccess
             }
             is NetworkResult.Error -> {
                 Log.d("error code is", response.code.toString())
@@ -208,22 +269,29 @@ class BenFlowRepo @Inject constructor(
             else -> {}
         }
         return true
+
     }
 
     @Transaction
     suspend fun refreshDoctorData(prescriptionCaseRecord: List<PrescriptionCaseRecord>?, investigationCaseRecord: InvestigationCaseRecord, diagnosisCaseRecords : List<DiagnosisCaseRecord>,patient: Patient, benFlow: BenFlow, patientVisitInfoSync: PatientVisitInfoSync,docData:DoctorDataDownSync){
+        // Do not overwrite local case record while case is pending in pharmacist queue.
+        // Doctor edits before dispense are local-authoritative and must not be replaced by downsync payload.
+        val preserveLocalDoctorData = patientVisitInfoSync.pharmacist_flag == 1
+        if (!preserveLocalDoctorData) {
+            prescriptionDao.deletePrescriptionByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
+            prescriptionCaseRecord?.let {
+                prescriptionDao.insertAll(it)
+            }
 
-        prescriptionDao.deletePrescriptionByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
-        prescriptionCaseRecord?.let {
-            prescriptionDao.insertAll(it)
-        }
-
-        investigationDao.deleteInvestigationCaseRecordByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
-        investigationDao.insertInvestigation(investigationCaseRecord)
+            investigationDao.deleteInvestigationCaseRecordByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
+            investigationDao.insertInvestigation(investigationCaseRecord)
 
-        caseRecordeDao.deleteDiagnosisByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
-        diagnosisCaseRecords.let {
-            caseRecordeDao.insertAll(it)
+            caseRecordeDao.deleteDiagnosisByPatientIdAndBenVisitNo(patient.patientID, patientVisitInfoSync.benVisitNo)
+            diagnosisCaseRecords.let {
+                caseRecordeDao.insertAll(it)
+            }
+        } else {
+            Timber.d("Preserving local doctor data for pending pharmacist case %s/%s", patient.patientID, patientVisitInfoSync.benVisitNo)
         }
 
         patientVisitInfoSyncDao.updateAfterDoctorDataDownSync(patientVisitInfoSync.doctorFlag!!, patientVisitInfoSync.patientID, patientVisitInfoSync.benVisitNo)
@@ -255,7 +323,7 @@ class BenFlowRepo @Inject constructor(
             }
 
         }
-        
+
     }
 
 
@@ -350,20 +418,31 @@ class BenFlowRepo @Inject constructor(
 
     }
 
-    suspend fun checkAndDownsyncNurseData(benFlow: BenFlow, patient: Patient){
+    // Returns true when there is nothing to pull or the sub-pull succeeded; false when an
+    // attempted nurse-data pull failed. The local sync-state gate protects locally edited rows
+    // from overwrite, while the local nurseFlag is intentionally not used as a server-side
+    // eligibility gate because fresh first-sync rows need to pass through here.
+    suspend fun checkAndDownsyncNurseData(benFlow: BenFlow, patient: Patient): Boolean {
         val patientVisitInfoSync = patientVisitInfoSyncDao.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID = patient.patientID, benVisitNo = benFlow.benVisitNo!!)
-        if(patientVisitInfoSync != null && benFlow.nurseFlag!! == 9 && patientVisitInfoSync.nurseFlag!! == 1){
+        if (patientVisitInfoSync != null && patientVisitInfoSync.nurseDataSynced != SyncState.UNSYNCED) {
             patientVisitInfoSync.nurseFlag = 9
             patientVisitInfoSync.doctorFlag = 1
-            getAndSaveNurseDataToDb(benFlow, patient, patientVisitInfoSync)
+            return getAndSaveNurseDataToDb(benFlow, patient, patientVisitInfoSync) is NetworkResult.Success
         }
+        return true
     }
 
-    suspend fun checkAndDownsyncDoctorData(benFlow: BenFlow, patient: Patient){
+    // See checkAndDownsyncNurseData: returns false only when an attempted doctor-data pull failed.
+    suspend fun checkAndDownsyncDoctorData(benFlow: BenFlow, patient: Patient): Boolean {
         val patientVisitInfoSync = patientVisitInfoSyncDao.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID = patient.patientID, benVisitNo = benFlow.benVisitNo!!)
-        if(patientVisitInfoSync != null && benFlow.doctorFlag!! > 1 && patientVisitInfoSync.doctorDataSynced != SyncState.UNSYNCED && patientVisitInfoSync.labDataSynced != SyncState.UNSYNCED){
+        if (
+            patientVisitInfoSync != null &&
+            patientVisitInfoSync.nurseFlag == 9 &&
+            patientVisitInfoSync.doctorDataSynced != SyncState.UNSYNCED &&
+            patientVisitInfoSync.labDataSynced != SyncState.UNSYNCED
+        ) {
             patientVisitInfoSync.doctorFlag = benFlow.doctorFlag
-            getAndSaveDoctorDataToDb(benFlow, patient, patientVisitInfoSync)
+            return getAndSaveDoctorDataToDb(benFlow, patient, patientVisitInfoSync) is NetworkResult.Success
         }
 //        if(patientVisitInfoSync != null && benFlow.doctorFlag!! > 1 &&
 //            ((benFlow.doctorFlag > patientVisitInfoSync.doctorFlag!!) ||
@@ -371,6 +450,7 @@ class BenFlowRepo @Inject constructor(
 //            patientVisitInfoSync.doctorFlag = benFlow.doctorFlag
 //            getAndSaveDoctorDataToDb(benFlow, patient, patientVisitInfoSync)
 //        }
+        return true
     }
 
     suspend fun checkAndAddNewVisitInfo(benFlow: BenFlow, patient: Patient){
@@ -387,93 +467,237 @@ class BenFlowRepo @Inject constructor(
             patientID = patient.patientID,
             benVisitNo = benFlow.benVisitNo!!,
             pharmacistFlag = benFlow.pharmacist_flag!!,
-            visitCategory = benFlow.VisitCategory ?: ""
+            visitCategory = benFlow.VisitCategory?.takeIf { it.isNotBlank() } ?: "General OPD"
         )
     }
 
     suspend fun insertBenFlow(benFlow: BenFlow) {
+        Log.d(
+            "BenFlowFacilityDebug",
+            "insertBenFlow(): benFlowID=${benFlow.benFlowID}, benRegID=${benFlow.beneficiaryRegID}, vanID=${benFlow.vanID}, facilityID=${benFlow.facilityID}"
+        )
         benFlowDao.insertBenFlow(benFlow = benFlow)
     }
 
-    suspend fun syncFlowIds(villageList: VillageIdList): NetworkResult<NetworkResponse> {
+    suspend fun syncFlowIds(villageList: VillageIdList, pullClinical: Boolean = true): NetworkResult<NetworkResponse> {
+        val loggedInUser = userRepo.getLoggedInUser()
 
         return networkResultInterceptor {
             val response = apiService.getBenFlowRecords(villageList)
             val responseBody = response.body()?.string()
+            // Always log here: refreshTokenInterceptor only runs onSuccess when JSON statusCode==200.
+            try {
+                val jo = responseBody?.let { JSONObject(it) }
+                val sc = jo?.optInt("statusCode", -1) ?: -1
+                val dataNode = jo?.opt("data")
+                val dataLen = when (dataNode) {
+                    is JSONArray -> dataNode.length()
+                    else -> -1
+                }
+                Log.i(
+                    "BenFlowFacilityDebug",
+                    "syncFlowIds: httpCode=${response.code()} jsonStatusCode=$sc dataArrayLength=$dataLen bodyLen=${responseBody?.length ?: 0}"
+                )
+                Timber.i(
+                    "BenFlowFacilityDebug syncFlowIds: httpCode=%s jsonStatusCode=%s dataArrayLength=%s",
+                    response.code(),
+                    sc,
+                    dataLen
+                )
+                if (sc != 200) {
+                    Log.w("BenFlowFacilityDebug", "syncFlowIds: skipping insert loop — JSON statusCode!=200 (see refreshTokenInterceptor). body snippet: ${responseBody?.take(400)}")
+                }
+            } catch (e: Exception) {
+                Log.e("BenFlowFacilityDebug", "syncFlowIds: failed to parse response for debug log", e)
+            }
             refreshTokenInterceptor(
                 responseBody = responseBody,
                 onSuccess = {
                     val benflowArray = responseBody.let { JSONObject(it).getJSONArray("data") }
+                    Log.i(
+                        "BenFlowFacilityDebug",
+                        "syncFlowIds onSuccess: processing ${benflowArray.length()} benflow row(s)"
+                    )
                     var isSuccess = true
 
                     var totalDownloaded = 0
+                    var lastReportedProgress = -1
+
+                    // Beneficiaries whose per-record nurse/doctor case data still needs pulling.
+                    // Collected during the (fast, DB-only) worklist pass below and pulled AFTER the
+                    // loop with bounded concurrency, so the ~2 sequential API calls per beneficiary
+                    // no longer run one beneficiary at a time.
+                    val clinicalTargets = mutableListOf<Pair<BenFlow, Patient>>()
 
                     for (i in 0 until benflowArray.length()) {
 
                         totalDownloaded++
                         if(WorkerUtils.totalRecordsToDownload > 0 && totalDownloaded <= WorkerUtils.totalRecordsToDownload){
-                            withContext(Dispatchers.Main) {
-                                WorkerUtils.totalPercentageCompleted.value = ((totalDownloaded.toDouble() / WorkerUtils.totalRecordsToDownload.toDouble())*100).toInt()
+                            val progressPercent = ((totalDownloaded.toDouble() / WorkerUtils.totalRecordsToDownload.toDouble()) * 100).toInt()
+                            if (progressPercent != lastReportedProgress) {
+                                lastReportedProgress = progressPercent
+                                WorkerUtils.totalPercentageCompleted.postValue(progressPercent)
                             }
                         }
 
                         try {
-                            val data = benflowArray.getString(i)
+                            val data = benflowArray.getJSONObject(i).toString()
+                            val benFlowJson = benflowArray.getJSONObject(i)
+                            Log.i(
+                                "BenFlowFacilityDebug",
+                                "syncFlowIds row: raw benflowID=${benFlowJson.optLong("benFlowID")}, hasFacilityID=${benFlowJson.has("facilityID")}, facilityID=${benFlowJson.opt("facilityID")}, vanID=${benFlowJson.opt("vanID")}"
+                            )
                             val benFlow = Gson().fromJson(data, BenFlow::class.java)
-                            val patient = patientRepo.getPatientByBenRegId(benFlow.beneficiaryRegID!!)
-                            benFlowDao.insertBenFlow(benFlow)
-                            if(patient != null){
-                                checkAndAddNewVisitInfo(benFlow, patient)
-                                updateBenFlowId(benFlow, patient)
-                                checkAndDownsyncNurseData(benFlow, patient)
-                                checkAndDownsyncDoctorData(benFlow, patient)
-                            }
-                            val pvis = patientVisitInfoSyncDao.getPatientVisitInfoByPatientIdAndSyncState(patient!!.patientID, SyncState.SHARED_OFFLINE)
-                            if(pvis!=null){
-                                val chiefComplaints = visitReasonsAndCategoriesDao.getChiefComplaintsByPatientId(patient.patientID, pvis.benVisitNo)
-                                // Iterate through each chief complaint and update the benFlowID
-                                if (chiefComplaints.isNotEmpty()) {
-                                    // Iterate through each chief complaint and update the benFlowID
-                                    chiefComplaints.forEach { complaint ->
-                                        // Update the benFlowID
-                                        val updatedComplaint = complaint.copy(benFlowID = pvis.benFlowID)
-                                        // Save the updated complaint back to the database
-                                        visitReasonsAndCategoriesDao.updateChiefComplaint(updatedComplaint)
+                            val benFlowToInsert =
+                                if (benFlow.facilityID == null || benFlow.facilityID == 0) {
+                                    val fallbackFacilityId = loggedInUser?.facilityID
+                                    if (fallbackFacilityId != null) {
+                                        Log.w(
+                                            "BenFlowFacilityDebug",
+                                            "syncFlowIds row: facilityID missing in benflow payload; applying fallback from logged-in user facilityID=$fallbackFacilityId for benFlowID=${benFlow.benFlowID}"
+                                        )
+                                        benFlow.copy(facilityID = fallbackFacilityId)
+                                    } else {
+                                        benFlow
                                     }
                                 } else {
-                                    // Handle the case when chiefComplaints is empty or null
-                                    println("No chief complaints found for patientID: ${patient.patientID} and benVisitNo: ${pvis.benVisitNo}")
+                                    benFlow
                                 }
-                                // Fetch visitDb and update if not null
-                                val visitDb = visitReasonsAndCategoriesDao.getVisitDbByPatientId(pvis.patientID)
-                                if (visitDb != null) {
-                                    val updatedVisitDb = visitDb.copy(benFlowID = pvis.benFlowID)
-                                    visitReasonsAndCategoriesDao.updateVisitDB(updatedVisitDb)
-                                } else {
-                                    // Handle the case when visitDb is null
-                                    println("No visitDb found for patientID: ${pvis.patientID}")
+                            Log.i(
+                                "BenFlowFacilityDebug",
+                                "syncFlowIds row: parsed benFlowID=${benFlow.benFlowID}, benRegID=${benFlow.beneficiaryRegID}, vanID=${benFlow.vanID}, facilityID=${benFlow.facilityID}, facilityIDToInsert=${benFlowToInsert.facilityID}"
+                            )
+                            val benRegId = benFlowToInsert.beneficiaryRegID
+                            if (benRegId == null) {
+                                Log.w(
+                                    "BenFlowFacilityDebug",
+                                    "syncFlowIds row: benflow has null beneficiaryRegID; skipping unmatchable row (benFlowID=${benFlowToInsert.benFlowID})"
+                                )
+                                insertBenFlow(benFlowToInsert)
+                                continue
+                            }
+                            val patient = patientRepo.getPatientByBenRegId(benRegId)
+                            insertBenFlow(benFlowToInsert)
+                            if(patient != null){
+                                if (benFlowToInsert.reproductiveStatusId != null &&
+                                    patient.statusOfWomanID != benFlowToInsert.reproductiveStatusId
+                                ) {
+                                    patient.statusOfWomanID = benFlowToInsert.reproductiveStatusId
+                                    patientRepo.updateRecord(patient)
                                 }
-                                // Fetch vitals and update if not null
-                                val vitals = vitalsDao.getPatientVitalsByPatientID(pvis.patientID)
-                                if (vitals != null) {
-                                    val updatedVitals = vitals.copy(benFlowID = pvis.benFlowID)
-                                    vitalsDao.updateVitals(updatedVitals)
-                                } else {
-                                    // Handle the case when vitals is null
-                                    println("No vitals found for patientID: ${pvis.patientID}")
+                                checkAndAddNewVisitInfo(benFlowToInsert, patient)
+                                updateBenFlowId(benFlowToInsert, patient)
+                                // The per-beneficiary nurse/doctor case-record pull (2 API calls each)
+                                // is the slow part of the benflow downsync. It runs ONLY in the clinical
+                                // pass (PullClinicalRecordsWorker) so the role worklists built above appear
+                                // early. Defer the actual pulls until after this loop and run them with
+                                // bounded concurrency instead of one beneficiary at a time.
+                                if (pullClinical) {
+                                    clinicalTargets.add(benFlowToInsert to patient)
+                                }
+                                val pvis = patientVisitInfoSyncDao.getPatientVisitInfoByPatientIdAndSyncState(
+                                    patient.patientID,
+                                    SyncState.SHARED_OFFLINE
+                                )
+                                if(pvis!=null){
+                                    val chiefComplaints = visitReasonsAndCategoriesDao.getChiefComplaintsByPatientId(patient.patientID, pvis.benVisitNo)
+                                    // Iterate through each chief complaint and update the benFlowID
+                                    if (chiefComplaints.isNotEmpty()) {
+                                        // Iterate through each chief complaint and update the benFlowID
+                                        chiefComplaints.forEach { complaint ->
+                                            // Update the benFlowID
+                                            val updatedComplaint = complaint.copy(benFlowID = pvis.benFlowID)
+                                            // Save the updated complaint back to the database
+                                            visitReasonsAndCategoriesDao.updateChiefComplaint(updatedComplaint)
+                                        }
+                                    } else {
+                                        // Handle the case when chiefComplaints is empty or null
+                                        println("No chief complaints found for patientID: ${patient.patientID} and benVisitNo: ${pvis.benVisitNo}")
+                                    }
+                                    // Fetch visitDb and update if not null
+                                    val visitDb = visitReasonsAndCategoriesDao.getVisitDbByPatientId(pvis.patientID)
+                                    if (visitDb != null) {
+                                        val updatedVisitDb = visitDb.copy(benFlowID = pvis.benFlowID)
+                                        visitReasonsAndCategoriesDao.updateVisitDB(updatedVisitDb)
+                                    } else {
+                                        // Handle the case when visitDb is null
+                                        println("No visitDb found for patientID: ${pvis.patientID}")
+                                    }
+                                    // Fetch vitals and update if not null
+                                    val vitals = vitalsDao.getPatientVitalsByPatientID(pvis.patientID)
+                                    if (vitals != null) {
+                                        val updatedVitals = vitals.copy(benFlowID = pvis.benFlowID)
+                                        vitalsDao.updateVitals(updatedVitals)
+                                    } else {
+                                        // Handle the case when vitals is null
+                                        println("No vitals found for patientID: ${pvis.patientID}")
+                                    }
+                                    patientVisitInfoSyncDao.updatePatientNurseDataSyncSuccess(patientID = pvis.patientID, benVisitNo =  pvis.benVisitNo)
                                 }
-                                patientVisitInfoSyncDao.updatePatientNurseDataSyncSuccess(patientID = pvis.patientID, benVisitNo =  pvis.benVisitNo)
+                            } else {
+                                // No local patient yet for this benRegID. The role worklists
+                                // (Nurse/Doctor/Lab/Pharmacist) are built from PatientVisitInfoSync rows
+                                // that are ONLY created inside the patient != null branch above, so skipping
+                                // here leaves those modules empty for this beneficiary. This happens when the
+                                // patient down-sync that inserts this benRegID hasn't finished yet (the two
+                                // pulls run on concurrent worker chains). Mark the run incomplete so the
+                                // caller does NOT advance the benflow watermark — the next pull re-downloads
+                                // the full payload and matches the patient once it has landed.
+                                isSuccess = false
+                                Log.w(
+                                    "BenFlowFacilityDebug",
+                                    "syncFlowIds row: no local patient for benRegID=${benFlowToInsert.beneficiaryRegID} (benFlowID=${benFlowToInsert.benFlowID}); marking run incomplete to retry next sync"
+                                )
                             }
                         } catch (e : Exception){
                             isSuccess = false
+                            Log.e("BenFlowFacilityDebug", "syncFlowIds(): failed to parse/insert benflow", e)
+                        }
+                    }
+
+                    // Bounded-concurrency per-beneficiary nurse/doctor pull. Nurse and doctor for the
+                    // SAME beneficiary stay sequential (the doctor check reads flags the nurse pull may
+                    // touch), but up to CLINICAL_PULL_CONCURRENCY beneficiaries are pulled in parallel,
+                    // turning ~2*N serial round-trips into ~2*N/CONCURRENCY. A failed sub-pull does NOT
+                    // throw (networkResultInterceptor swallows it into NetworkResult.Error), so mark the
+                    // run incomplete here; otherwise the watermark advances while visit data is missing
+                    // and the next pull never re-fetches it.
+                    if (pullClinical && clinicalTargets.isNotEmpty()) {
+                        Log.i(
+                            "BenFlowFacilityDebug",
+                            "syncFlowIds clinical pull: targetCount=${clinicalTargets.size}, concurrency=$CLINICAL_PULL_CONCURRENCY"
+                        )
+                        val clinicalPullStartedAt = System.currentTimeMillis()
+                        clinicalTargets.chunked(CLINICAL_PULL_CONCURRENCY).forEach { batch ->
+                            coroutineScope {
+                                batch.map { (bf, p) ->
+                                    async {
+                                        val nurseOk = checkAndDownsyncNurseData(bf, p)
+                                        val doctorOk = checkAndDownsyncDoctorData(bf, p)
+                                        Triple(bf, nurseOk, doctorOk)
+                                    }
+                                }.awaitAll()
+                            }.forEach { (bf, nurseOk, doctorOk) ->
+                                if (!nurseOk || !doctorOk) {
+                                    isSuccess = false
+                                    Log.w(
+                                        "BenFlowFacilityDebug",
+                                        "syncFlowIds row: sub-pull failed (nurseOk=$nurseOk, doctorOk=$doctorOk) for benRegID=${bf.beneficiaryRegID} (benFlowID=${bf.benFlowID}); marking run incomplete to retry next sync"
+                                    )
+                                }
+                            }
                         }
+                        Log.i(
+                            "BenFlowFacilityDebug",
+                            "syncFlowIds clinical pull completed in ${System.currentTimeMillis() - clinicalPullStartedAt}ms"
+                        )
                     }
                     NetworkResult.Success(DownsyncSuccess(isSuccess))
                 },
                 onTokenExpired = {
                     val user = userRepo.getLoggedInUser()!!
                     userRepo.refreshTokenTmc(user.userName, user.password)
-                    syncFlowIds(villageList)
+                    syncFlowIds(villageList, pullClinical)
                 },
             )
         }
@@ -482,7 +706,7 @@ class BenFlowRepo @Inject constructor(
 
     private suspend fun getBenFlowCountToDownload(villageList: VillageIdList): NetworkResult<NetworkResponse>{
         return networkResultInterceptor {
-            val response = apiService.getBeneficiariesCount(villageList)
+            val response = apiService.getBenFlowRecordCount(villageList)
             val responseBody = response.body()?.string()
             refreshTokenInterceptor(
                 responseBody = responseBody,
@@ -490,6 +714,10 @@ class BenFlowRepo @Inject constructor(
                     val data = responseBody.let { JSONObject(it).getString("data") }
                     val result = Gson().fromJson(data, CountDownSync::class.java)
                     WorkerUtils.totalRecordsToDownload = result.response.toInt()
+                    Log.i(
+                        "BenFlowFacilityDebug",
+                        "getBenFlowCountToDownload: serverCount=${result.response}, villageCount=${villageList.villageID.size}, lastSyncDate='${villageList.lastSyncDate}'"
+                    )
                     NetworkResult.Success(NetworkResponse())
                 },
                 onTokenExpired = {
@@ -599,48 +827,50 @@ class BenFlowRepo @Inject constructor(
 
 
 
-        suspend fun getAllocationItemForPharmacist(prescriptionDTO: PrescriptionDTO): NetworkResult<NetworkResponse> {
-            return networkResultInterceptor {
-                val listAllocation: MutableList<AllocationItemDataRequest> = mutableListOf()
-                prescriptionDTO.itemList.forEach { prescriptionItemDTO ->
-                    val allocationItemDataRequest = AllocationItemDataRequest(
-                        itemID = prescriptionItemDTO.drugID,
-                        quantity = prescriptionItemDTO.qtyPrescribed
-                    )
-                    listAllocation.add(allocationItemDataRequest)
-                }
-                Timber.d("******************* prescriptionBatchDTO Item DTO************** ",listAllocation)
-                val facilityID = userDao.getLoggedInUserFacilityID()
-                val response = apiService.getPharmacistAllocationItemList(listAllocation, facilityID)
-                val responseBody = response.body()?.string()
-
-                refreshTokenInterceptor(
-                    responseBody = responseBody,
-                    onSuccess = {
-                        val jsonObj = JSONObject(responseBody)
-                        val data = jsonObj.getJSONObject("data").toString()
-                        val prescriptionBatchApiDTO = Gson().fromJson(data, PrescriptionBatchApiDTO::class.java)
-                        Timber.d("******************* prescriptionBatchDTO Item DTO************** ",prescriptionBatchApiDTO)
-
-                        NetworkResult.Success(NetworkResponse())
-                    },
-                    onTokenExpired = {
-                        val user = userRepo.getLoggedInUser()!!
-                        userRepo.refreshTokenTmc(user.userName, user.password)
-                        getAllocationItemForPharmacist(prescriptionDTO)
-                    },
+    suspend fun getAllocationItemForPharmacist(prescriptionDTO: PrescriptionDTO): NetworkResult<NetworkResponse> {
+        return networkResultInterceptor {
+            val listAllocation: MutableList<AllocationItemDataRequest> = mutableListOf()
+            prescriptionDTO.itemList.forEach { prescriptionItemDTO ->
+                val allocationItemDataRequest = AllocationItemDataRequest(
+                    itemID = prescriptionItemDTO.drugID,
+                    quantity = prescriptionItemDTO.qtyPrescribed
                 )
+                listAllocation.add(allocationItemDataRequest)
             }
+            Timber.d("******************* prescriptionBatchDTO Item DTO************** ",listAllocation)
+            val facilityID = userDao.getLoggedInUserFacilityID()
+            val response = apiService.getPharmacistAllocationItemList(listAllocation, facilityID)
+            val responseBody = response.body()?.string()
+
+            refreshTokenInterceptor(
+                responseBody = responseBody,
+                onSuccess = {
+                    val jsonObj = JSONObject(responseBody)
+                    val data = jsonObj.getJSONObject("data").toString()
+                    val prescriptionBatchApiDTO = Gson().fromJson(data, PrescriptionBatchApiDTO::class.java)
+                    Timber.d("******************* prescriptionBatchDTO Item DTO************** ",prescriptionBatchApiDTO)
+
+                    NetworkResult.Success(NetworkResponse())
+                },
+                onTokenExpired = {
+                    val user = userRepo.getLoggedInUser()!!
+                    userRepo.refreshTokenTmc(user.userName, user.password)
+                    getAllocationItemForPharmacist(prescriptionDTO)
+                },
+            )
+        }
     }
 
-     suspend fun getStockDetailsOfSubStore(facilityID: Int): NetworkResult<NetworkResponse>{
+    suspend fun getStockDetailsOfSubStore(facilityID: Int): NetworkResult<NetworkResponse>{
         return networkResultInterceptor {
             val request = StockItemRequest(
                 itemName = "%%",
                 facilityID = facilityID.toString()
             )
+
             val response = apiService.getPharmacistStockItemList(request)
             val responseBody = response.body()?.string()
+
             refreshTokenInterceptor(
                 responseBody = responseBody,
                 onSuccess = {
@@ -648,6 +878,9 @@ class BenFlowRepo @Inject constructor(
                         val jsonObj = JSONObject(responseBody)
                         val dataArray = jsonObj.getJSONArray("data")
                         val batchList = mutableListOf<Batch>()
+                        var successCount = 0
+                        var failedCount = 0
+
                         for (i in 0 until dataArray.length()) {
                             val item = dataArray.getJSONObject(i).toString()
                             val apiItemStockEntry = Gson().fromJson(item, ApiItemStockEntry::class.java)
@@ -661,19 +894,22 @@ class BenFlowRepo @Inject constructor(
                                 quantityInHand = apiItemStockEntry.quantityInHand
                             )
 
-                            batchList.add(batch)
+                            // Try to insert each batch individually to handle foreign key constraints
+                            try {
+                                batchDao.insertBatch(batch)
+                                successCount++
+                            } catch (e: Exception) {
+                                failedCount++
+                                Log.w("BatchAPI", "Failed to insert batch for itemID ${apiItemStockEntry.itemID}: ${e.message}. Item may not exist in ItemMasterList.")
+                            }
                         }
-                        batchDao.insertAllBatches(batchList)
 
-                        Log.d("Medicine list", "$batchList")
                         NetworkResult.Success(NetworkResponse())
                     } catch (e: Exception) {
-                        Log.e("Medicine list", "Error during parsing or deserialization", e)
+                        NetworkResult.Error(0, e.message ?: "Failed to process batch data")
                     }
-                    NetworkResult.Success(NetworkResponse())
                 },
                 onTokenExpired = {
-                    Log.d("Token Expired", "Token Expired")
                     val user = userRepo.getLoggedInUser()!!
                     userRepo.refreshTokenTmc(user.userName, user.password)
                     getStockDetailsOfSubStore(facilityID)
@@ -711,22 +947,55 @@ class BenFlowRepo @Inject constructor(
         patient: Patient,
         facilityID: Int,
         patientDoctorBundle: PatientDoctorBundle,
-        patientVisitInfoSync: PatientVisitInfoSync
+        patientVisitInfoSync: PatientVisitInfoSync,
+        replaceLatestPending: Boolean = false
     ) {
         try {
-            Log.d("Pharmacist","Deleting existing prescriptions for patientID: ${patient.patientID}, visitNo: ${patientVisitInfoSync.benVisitNo}")
-            prescriptionDao.deletePrescriptionByPatientIDAndBenVisitNo(
-                patient.patientID,
-                patientVisitInfoSync.benVisitNo
-            )
+            val existingPrescriptions =
+                prescriptionDao.getPrescriptionsByPatientIdAndBenVisitNo(
+                    patient.patientID,
+                    patientVisitInfoSync.benVisitNo
+                ).orEmpty()
+            val existingPrimary = existingPrescriptions.firstOrNull {
+                (it.prescriptionID > 0L) || (it.visitCode > 0L)
+            } ?: existingPrescriptions.firstOrNull()
+            val benFlowForVisit = patientVisitInfoSync.benFlowID?.let { benFlowId ->
+                try {
+                    benFlowDao.getBenFlowByBenFlowID(benFlowId)
+                } catch (e: Exception) {
+                    null
+                }
+            }
+            if (replaceLatestPending && existingPrescriptions.isNotEmpty()) {
+                // Doctor is editing an already-pending pharmacist cycle:
+                // replace only latest pending draft and preserve older dispensed history.
+                Log.d(
+                    "Pharmacist",
+                    "Replacing latest pending prescription for patientID=${patient.patientID}, visitNo=${patientVisitInfoSync.benVisitNo}"
+                )
+                prescriptionDao.deleteLatestPrescriptionByPatientIDAndBenVisitNo(
+                    patient.patientID,
+                    patientVisitInfoSync.benVisitNo
+                )
+            } else {
+                // New cycle (or first local copy): append current medicines to preserve previous dispensed cycles.
+                Log.d(
+                    "Pharmacist",
+                    "Preserving existing prescription history for patientID=${patient.patientID}, visitNo=${patientVisitInfoSync.benVisitNo}"
+                )
+            }
             Log.d("Pharmacist", "patient:in benflowrepo ${patient}")
 
 
             val prescription = Prescription(
-                prescriptionID = 0, // Placeholder
-                beneficiaryRegID = 0, // Placeholder, adjust as needed
-                visitCode = 0, // Placeholder, adjust as needed
-                consultantName = null, // Or a placeholder name
+                prescriptionID = existingPrimary?.prescriptionID
+                    ?: patientVisitInfoSync.prescriptionID?.toLong()
+                    ?: 0,
+                beneficiaryRegID = existingPrimary?.beneficiaryRegID ?: 0,
+                visitCode = existingPrimary?.visitCode
+                    ?: benFlowForVisit?.visitCode
+                    ?: 0,
+                consultantName = existingPrimary?.consultantName,
                 patientID = patient.patientID,
                 benFlowID = null,
                 benVisitNo = patientVisitInfoSync.benVisitNo
@@ -742,7 +1011,7 @@ class BenFlowRepo @Inject constructor(
                     prescriptionID = prescriptionID,
                     dose = it.strength,
                     drugForm = it.itemFormName,
-                    drugStrength = it.strength,
+                    drugStrength = buildDrugStrength(it.strength, it.unitOfMeasurement),
                     duration = it.duration,
                     durationUnit = it.unit,
                     frequency = it.frequency,
@@ -776,13 +1045,13 @@ class BenFlowRepo @Inject constructor(
                     }
                 }
             }
-            } catch (e: Exception){
-                e.printStackTrace()
-                Log.d("Pharmacist",e.toString())
-            }
-
+        } catch (e: Exception){
+            e.printStackTrace()
+            Log.d("Pharmacist",e.toString())
         }
 
+    }
+
     fun parseDate(dateString: String): Date {
         val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
         sdf.timeZone = TimeZone.getTimeZone("UTC")
@@ -885,4 +1154,89 @@ class BenFlowRepo @Inject constructor(
             false
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Refresh only header fields (consultantName, visitCode, prescriptionID) without touching local item list.
+     * This preserves local doctor edits while ensuring header data is visible.
+     */
+    suspend fun refreshPrescriptionHeaderOnly(benVisitInfo: PatientDisplayWithVisitInfo): NetworkResult<NetworkResponse> {
+        return networkResultInterceptor {
+            val benRegId = benVisitInfo.patient.beneficiaryRegID ?: return@networkResultInterceptor NetworkResult.Error(0, "Missing beneficiaryRegID")
+            val benVisitNo = benVisitInfo.benVisitNo ?: return@networkResultInterceptor NetworkResult.Error(0, "Missing benVisitNo")
+            val facilityID = userDao.getLoggedInUserFacilityID()
+            val benFlow = benFlowDao.getBenFlowByBenRegIdAndBenVisitNo(benRegId, benVisitNo)
+                ?: return@networkResultInterceptor NetworkResult.Error(0, "Missing benFlow")
+
+            val visitCode = benFlow.visitCode
+                ?: return@networkResultInterceptor NetworkResult.Error(0, "Missing visitCode")
+            val request = PrescribedMedicineDataRequest(
+                beneficiaryRegID = benFlow.beneficiaryRegID!!,
+                facilityID = facilityID,
+                visitCode = visitCode
+            )
+
+            val response = apiService.getPharmacistPrescriptionList(request)
+            val responseBody = response.body()?.string()
+
+            refreshTokenInterceptor(
+                responseBody = responseBody,
+                onSuccess = {
+                    val jsonObj = JSONObject(responseBody)
+                    val data = jsonObj.getJSONObject("data").toString()
+                    val prescriptionDTO = Gson().fromJson(data, PrescriptionDTO::class.java)
+                    prescriptionDao.updatePrescriptionHeader(
+                        patientID = benVisitInfo.patient.patientID,
+                        benVisitNo = benVisitNo,
+                        prescriptionID = prescriptionDTO.prescriptionID,
+                        visitCode = prescriptionDTO.visitCode,
+                        consultantName = prescriptionDTO.consultantName
+                    )
+                    NetworkResult.Success(NetworkResponse())
+                },
+                onTokenExpired = {
+                    val user = userRepo.getLoggedInUser()!!
+                    userRepo.refreshTokenTmc(user.userName, user.password)
+                    refreshPrescriptionHeaderOnly(benVisitInfo)
+                },
+            )
+        }
+    }
+
+    /**
+     * When doctor has submitted prescription locally (saved in Prescription_Cases_Recorde) but API
+     * has not synced yet, copy that data to the Prescription table so pharmacist module can show medicines.
+     */
+    suspend fun copyPrescriptionFromCaseRecordToPharmacistTable(
+        benVisitInfo: PatientDisplayWithVisitInfo,
+        replaceLatestPending: Boolean? = null
+    ): Boolean {
+        return try {
+            val prescriptionCaseRecordVal = caseRecordeDao.getPrescriptionCaseRecordeByPatientIDAndBenVisitNo(
+                benVisitInfo.patient.patientID,
+                benVisitInfo.benVisitNo!!
+            )
+            if (prescriptionCaseRecordVal.isNullOrEmpty()) return false
+            val sync = patientVisitInfoSyncDao.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                benVisitInfo.patient.patientID,
+                benVisitInfo.benVisitNo!!
+            ) ?: return false
+            val facilityID = userDao.getLoggedInUserFacilityID()
+            val bundle = PatientDoctorBundle(
+                patient = benVisitInfo.patient,
+                patientVisitInfoSync = sync,
+                prescriptionCaseRecordVal = prescriptionCaseRecordVal
+            )
+            savePrescriptionListForPharmacist(
+                patient = benVisitInfo.patient,
+                facilityID = facilityID,
+                patientDoctorBundle = bundle,
+                patientVisitInfoSync = sync,
+                replaceLatestPending = replaceLatestPending ?: ((benVisitInfo.pharmacist_flag ?: 0) == 1)
+            )
+            true
+        } catch (e: Exception) {
+            Timber.e(e, "copyPrescriptionFromCaseRecordToPharmacistTable")
+            false
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/BenVisitRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/BenVisitRepo.kt
index 4bb2910ee..73e5bd697 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/BenVisitRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/BenVisitRepo.kt
@@ -122,6 +122,7 @@ class BenVisitRepo @Inject constructor(
 
     }
 
+
     private suspend fun registerLabData(labResultDTO: LabResultDTO): NetworkResult<NetworkResponse> {
 
         return networkResultInterceptor {
@@ -165,13 +166,25 @@ class BenVisitRepo @Inject constructor(
 
     }
 
+    // Returns true when every unsynced nurse record was resolved (pushed, or genuinely had nothing
+    // to do). Returns false when at least one record was SKIPPED because a transient precondition
+    // had not landed yet — the beneficiary is not yet registered on the server (beneficiaryRegID
+    // null) or the server BenFlow (nurseFlag==1) has not been pulled into the local DB. The caller
+    // (PushBenVisitInfoToAmrit) maps false to a bounded Result.retry() so the push re-runs once the
+    // prerequisite registration/benflow pull catches up, instead of leaving the visit UNSYNCED until
+    // the next periodic down-sync.
     suspend fun processUnsyncedNurseData() : Boolean{
 
         val patientNurseDataUnSyncList = patientVisitInfoSyncRepo.getPatientNurseDataUnsynced()
         val user = userRepo.getLoggedInUser()
+        var anyPending = false
 
         patientNurseDataUnSyncList.forEach {
 
+            if(it.patient.beneficiaryRegID == null){
+                anyPending = true
+                Timber.w("Nurse data upsync SKIPPED: beneficiaryRegID is null for patientID=${it.patient.patientID}, benVisitNo=${it.patientVisitInfoSync.benVisitNo}. Beneficiary not yet registered on server; clinical data stays UNSYNCED.")
+            }
             if(it.patient.beneficiaryRegID != null){
 
                 withContext(Dispatchers.IO){
@@ -217,12 +230,15 @@ class BenVisitRepo @Inject constructor(
                             else -> { }
                         }
 
-                    } else { }
+                    } else {
+                        anyPending = true
+                        Timber.w("Nurse data upsync SKIPPED: no matching BenFlow with nurseFlag==1 for patientID=${it.patient.patientID}, benRegID=${it.patient.beneficiaryRegID}, benVisitNo=${it.patientVisitInfoSync.benVisitNo} (benFlow=$benFlow). Clinical data stays UNSYNCED.")
+                    }
                 }
             }
         }
 
-        return true
+        return !anyPending
 
     }
 
@@ -234,6 +250,9 @@ class BenVisitRepo @Inject constructor(
 
         patientDoctorDataUnSyncList.forEach {
 
+            if(it.patient.beneficiaryRegID == null){
+                Timber.w("Doctor data (pending test) upsync SKIPPED: beneficiaryRegID is null for patientID=${it.patient.patientID}, benVisitNo=${it.patientVisitInfoSync.benVisitNo}. Beneficiary not yet registered on server; clinical data stays UNSYNCED.")
+            }
             if(it.patient.beneficiaryRegID != null){
                 withContext(Dispatchers.IO){
 
@@ -288,6 +307,9 @@ class BenVisitRepo @Inject constructor(
 
         patientDoctorDataUnSyncList.forEach {
 
+            if(it.patient.beneficiaryRegID == null){
+                Timber.w("Doctor data (without test) upsync SKIPPED: beneficiaryRegID is null for patientID=${it.patient.patientID}, benVisitNo=${it.patientVisitInfoSync.benVisitNo}. Beneficiary not yet registered on server; clinical data stays UNSYNCED.")
+            }
             if(it.patient.beneficiaryRegID != null){
                 withContext(Dispatchers.IO){
 
@@ -342,6 +364,9 @@ class BenVisitRepo @Inject constructor(
 
         patientDoctorDataUnSyncList.forEach {
 
+            if(it.patient.beneficiaryRegID == null){
+                Timber.w("Doctor data (after test) upsync SKIPPED: beneficiaryRegID is null for patientID=${it.patient.patientID}, benVisitNo=${it.patientVisitInfoSync.benVisitNo}. Beneficiary not yet registered on server; clinical data stays UNSYNCED.")
+            }
             if(it.patient.beneficiaryRegID != null){
                 withContext(Dispatchers.IO){
 
@@ -441,7 +466,7 @@ class BenVisitRepo @Inject constructor(
                              visitCode = benFlow.visitCode,
                              providerServiceMapID = benFlow.providerServiceMapId,
                              specialist_flag = null,
-                             vanID = benFlow.vanID,
+                             facilityID = benFlow.facilityID ?: user.facilityID,
                              parkingPlaceID = benFlow.parkingPlaceID
                         )
 
@@ -566,11 +591,13 @@ class BenVisitRepo @Inject constructor(
                                     val pharmacistPatientIssueDataRequest = PharmacistItemStockExitDataRequest(
                                         itemID = prescriptionItemDTO.drugID,
                                         itemStockEntryID = item.itemStockEntryID,
-                                        quantity = prescriptionItemDTO.qtyPrescribed,
+                                        quantity = item.qty,
                                         createdBy = user?.userName!!
                                     )
 
-                                    itemStockExitList+=pharmacistPatientIssueDataRequest
+                                    if (item.qty > 0) {
+                                        itemStockExitList+=pharmacistPatientIssueDataRequest
+                                    }
                                 }
                             }
 
@@ -578,7 +605,6 @@ class BenVisitRepo @Inject constructor(
                             val pharmacistPatientIssueDataRequest = PharmacistPatientIssueDataRequest(
                                 issuedBy = "MMU",
                                 visitCode = benFlow.visitCode,
-                                facilityID = userDao.getLoggedInUserFacilityID(),
                                 age = it.patient.age,
                                 beneficiaryID = it.patient.beneficiaryID,
                                 benRegID = it.patient.beneficiaryRegID!!,
@@ -593,7 +619,7 @@ class BenVisitRepo @Inject constructor(
                                 visitID = benFlow.benVisitID,
                                 visitDate = benFlow.visitDate,
                                 parkingPlaceID = benFlow.parkingPlaceID,
-                                vanID = benFlow.vanID,
+                                facilityID = benFlow.facilityID ?: user?.facilityID,
                                 itemStockExit = itemStockExitList
                             )
                             if (pharmacistPatientIssueDataRequest.itemStockExit.isNotEmpty()) {
@@ -648,11 +674,13 @@ class BenVisitRepo @Inject constructor(
                             val pharmacistPatientIssueDataRequest = PharmacistItemStockExitDataRequest(
                                 itemID = prescriptionItemDTO.drugID,
                                 itemStockEntryID = item.itemStockEntryID,
-                                quantity = prescriptionItemDTO.qtyPrescribed,
+                                quantity = item.qty,
                                 createdBy = user?.userName!!
                             )
 
-                            itemStockExitList+=pharmacistPatientIssueDataRequest
+                            if (item.qty > 0) {
+                                itemStockExitList+=pharmacistPatientIssueDataRequest
+                            }
                         }
                     }
 
@@ -660,7 +688,6 @@ class BenVisitRepo @Inject constructor(
                     val pharmacistPatientIssueDataRequest = PharmacistPatientIssueDataRequest(
                         issuedBy = "MMU",
                         visitCode = benFlow.visitCode,
-                        facilityID = userDao.getLoggedInUserFacilityID(),
                         age = benVisitInfo.patient.age,
                         beneficiaryID = benVisitInfo.patient.beneficiaryID,
                         benRegID = benVisitInfo.patient.beneficiaryRegID!!,
@@ -675,7 +702,7 @@ class BenVisitRepo @Inject constructor(
                         visitID = benFlow.benVisitID,
                         visitDate = benFlow.visitDate,
                         parkingPlaceID = benFlow.parkingPlaceID,
-                        vanID = benFlow.vanID,
+                        facilityID = benFlow.facilityID ?: user?.facilityID,
                         itemStockExit = itemStockExitList
                     )
 
@@ -700,4 +727,4 @@ class BenVisitRepo @Inject constructor(
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/CaseRecordeRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/CaseRecordeRepo.kt
index d0f74b04c..36fcc2643 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/CaseRecordeRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/CaseRecordeRepo.kt
@@ -26,11 +26,20 @@ import javax.inject.Inject
 class CaseRecordeRepo @Inject constructor(
     private val caseRecordDao: CaseRecordeDao,
     private val benFlowDao: BenFlowDao,
+    private val procedureRepo: ProcedureRepo,
 ) {
     suspend fun saveInvestigationToCatche(investigationCaseRecord: InvestigationCaseRecord) {
         try{
             withContext(Dispatchers.IO){
                 caseRecordDao.insertInvestigationCaseRecord(investigationCaseRecord)
+                // Copy prescribed lab procedures from master so lab technician can render form from DB without API
+                investigationCaseRecord.benVisitNo?.let { benVisitNo ->
+                    procedureRepo.copyProceduresFromMasterForVisit(
+                        investigationCaseRecord.patientID,
+                        benVisitNo,
+                        investigationCaseRecord.newTestIds
+                    )
+                }
             }
         } catch (e: Exception){
             Timber.d("Error in saving Investigation $e")
@@ -73,17 +82,20 @@ class CaseRecordeRepo @Inject constructor(
         return caseRecordDao.getPrescriptionCasesRecordId(prescriptionId)
     }
     suspend fun getPrescriptionByPatientIDAndVisitNumber(benVisitInfo: PatientDisplayWithVisitInfo): List<PrescriptionCaseRecord?> {
-        return caseRecordDao.getPrescriptionByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+        val visitNo = benVisitInfo.benVisitNo ?: return emptyList()
+        return caseRecordDao.getPrescriptionByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, visitNo)
     }
     fun getDiagnosis(diagnosisId:String): LiveData<DiagnosisCaseRecord> {
         return caseRecordDao.getDiagnosisCasesRecordById(diagnosisId)
     }
     suspend fun getDiagnosisByPatientIDAndVisitNumber(benVisitInfo: PatientDisplayWithVisitInfo): List<DiagnosisCaseRecord?> {
-        return caseRecordDao.getDiagnosisByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+        val visitNo = benVisitInfo.benVisitNo ?: return emptyList()
+        return caseRecordDao.getDiagnosisByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, visitNo)
     }
 
     suspend fun getInvestigationCasesRecordByPatientIDAndVisitNumber(benVisitInfo: PatientDisplayWithVisitInfo): InvestigationCaseRecord? {
-        return caseRecordDao.getPrescriptionCasesRecordByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+        val visitNo = benVisitInfo.benVisitNo ?: return null
+        return caseRecordDao.getPrescriptionCasesRecordByPatientIDAndBenVisitNo(benVisitInfo.patient.patientID, visitNo)
     }
 
     suspend fun updateBenIdAndBenRegId(beneficiaryID: Long, beneficiaryRegID: Long, patientID: String){
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/CbacRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/CbacRepo.kt
index a38e82dc4..44f4d3afe 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/CbacRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/CbacRepo.kt
@@ -113,6 +113,11 @@ class CbacRepo @Inject constructor(
         return withContext(Dispatchers.IO) {
             val user = userRepo.getLoggedInUser()
                 ?: throw IllegalStateException("No user logged in!!")
+            val facilityID = user.facilityID
+            if (facilityID == null) {
+                Timber.w("pushUnSyncedCbacRecords: logged-in user has no facilityID; skipping CBAC sync")
+                return@withContext false
+            }
 
             val cbacCacheList: List<CbacCache> =
                 cbacDao.getAllUnprocessedCbac(SyncState.UNSYNCED)
@@ -140,14 +145,14 @@ class CbacRepo @Inject constructor(
                             visitDetails = VisitDetailsWrapper(
                             visitDetails = CbacVisitDetails(
                                 beneficiaryRegID = patient.beneficiaryRegID!!,
-                                providerServiceMapID = userRepo.getLoggedInUser()!!.serviceMapId,
+                                providerServiceMapID = user.serviceMapId,
                                 visitNo = null ,
                                 visitReason = "New Chief Complaint",
                                 visitCategory = "NCD screening",
                                 IdrsOrCbac = "CBAC",
                                 createdBy = user.userName,
-                                vanID = userRepo.getLoggedInUser()!!.vanId,
-                                parkingPlaceID = userRepo.getLoggedInUser()!!.parkingPlaceId,
+                                facilityID = facilityID,
+                                parkingPlaceID = user.parkingPlaceId,
                                 subVisitCategory = null,
                                 pregnancyStatus = null,
                                 followUpForFpMethod = null,
@@ -164,12 +169,12 @@ class CbacRepo @Inject constructor(
                             benFlowID = patient.beneficiaryRegID!!,
                             beneficiaryID = patient.beneficiaryID!!,
                             sessionID = 3,
-                            parkingPlaceID = userRepo.getLoggedInUser()!!.parkingPlaceId,
+                            parkingPlaceID = user.parkingPlaceId,
                             createdBy = user.userName,
-                            vanID = userRepo.getLoggedInUser()!!.vanId,
+                            facilityID = facilityID,
                             beneficiaryRegID = patient.beneficiaryRegID!!,
                             benVisitID = null,
-                            providerServiceMapID = userRepo.getLoggedInUser()!!.serviceMapId
+                            providerServiceMapID = user.serviceMapId
                         )
 
                         try {
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/CphcDetailsRepository.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/CphcDetailsRepository.kt
new file mode 100644
index 000000000..6c8ad7e56
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/CphcDetailsRepository.kt
@@ -0,0 +1,76 @@
+package org.piramalswasthya.cho.repositories
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.database.room.dao.EarDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.ElderlyHealthAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.MentalHealthScreeningDao
+import org.piramalswasthya.cho.database.room.dao.NoseDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.OralHealthDao
+import org.piramalswasthya.cho.database.room.dao.OphthalmicDao
+import org.piramalswasthya.cho.database.room.dao.PainAndSymptomAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.PsychosocialCaregiverSupportDao
+import org.piramalswasthya.cho.database.room.dao.ThroatDiagnosisAssessmentDao
+import org.piramalswasthya.cho.database.room.dao.VisitReasonsAndCategoriesDao
+import org.piramalswasthya.cho.model.ChiefComplaintDB
+import org.piramalswasthya.cho.model.VisitDB
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CphcDetailsRepository @Inject constructor(
+    private val visitReasonsAndCategoriesDao: VisitReasonsAndCategoriesDao,
+    private val earDiagnosisAssessmentDao: EarDiagnosisAssessmentDao,
+    private val noseDiagnosisAssessmentDao: NoseDiagnosisAssessmentDao,
+    private val throatDiagnosisAssessmentDao: ThroatDiagnosisAssessmentDao,
+    private val oralHealthDao: OralHealthDao,
+    private val ophthalmicDao: OphthalmicDao,
+    private val elderlyHealthAssessmentDao: ElderlyHealthAssessmentDao,
+    private val mentalHealthScreeningDao: MentalHealthScreeningDao,
+    private val painAndSymptomAssessmentDao: PainAndSymptomAssessmentDao,
+    private val psychosocialCaregiverSupportDao: PsychosocialCaregiverSupportDao,
+) {
+
+    suspend fun getLatestVisitDb(patientID: String, benVisitNo: Int): VisitDB? {
+        return withContext(Dispatchers.IO) {
+            visitReasonsAndCategoriesDao.getLatestVisitDbByPatientIDAndBenVisitNo(patientID, benVisitNo)
+        }
+    }
+
+    suspend fun replaceVisitAndChiefComplaints(
+        visitDB: VisitDB,
+        chiefComplaints: List<ChiefComplaintDB>,
+        patientID: String,
+        benVisitNo: Int,
+    ) {
+        withContext(Dispatchers.IO) {
+            visitReasonsAndCategoriesDao.deleteVisitDbByPatientIdAndBenVisitNo(patientID, benVisitNo)
+            visitReasonsAndCategoriesDao.deleteChiefComplaintsByPatientIdAndBenVisitNo(patientID, benVisitNo)
+            visitReasonsAndCategoriesDao.insertVisitDB(visitDB)
+            if (chiefComplaints.isNotEmpty()) {
+                visitReasonsAndCategoriesDao.insertAll(chiefComplaints)
+            }
+        }
+    }
+
+    suspend fun replaceVisitDb(visitDB: VisitDB, patientID: String, benVisitNo: Int) {
+        withContext(Dispatchers.IO) {
+            visitReasonsAndCategoriesDao.deleteVisitDbByPatientIdAndBenVisitNo(patientID, benVisitNo)
+            visitReasonsAndCategoriesDao.insertVisitDB(visitDB)
+        }
+    }
+
+    suspend fun clearAssessmentsForVisit(patientID: String, benVisitNo: Int) {
+        withContext(Dispatchers.IO) {
+            earDiagnosisAssessmentDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            noseDiagnosisAssessmentDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            throatDiagnosisAssessmentDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            oralHealthDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            ophthalmicDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            elderlyHealthAssessmentDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            mentalHealthScreeningDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            painAndSymptomAssessmentDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+            psychosocialCaregiverSupportDao.deleteByPatientIdAndVisitNo(patientID, benVisitNo)
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/DeliveryOutcomeRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/DeliveryOutcomeRepo.kt
index 6e8ef7f49..2b068ce6e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/DeliveryOutcomeRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/DeliveryOutcomeRepo.kt
@@ -1,36 +1,56 @@
 package org.piramalswasthya.cho.repositories
 
-import androidx.lifecycle.LiveData
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.room.dao.DeliveryOutcomeDao
+import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
-import org.piramalswasthya.cho.helpers.Konstants
-import org.piramalswasthya.cho.helpers.setToStartOfTheDay
 import org.piramalswasthya.cho.model.DeliveryOutcomeCache
 import org.piramalswasthya.cho.model.DeliveryOutcomePost
+import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.network.AmritApiService
+import org.piramalswasthya.cho.network.VillageIdList
 //import org.piramalswasthya.cho.network.GetDataPaginatedRequest
 import timber.log.Timber
-import java.io.IOException
 import java.net.SocketTimeoutException
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Locale
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class DeliveryOutcomeRepo @Inject constructor(
     private val preferenceDao: PreferenceDao,
     private val amritApiService: AmritApiService,
     private val userRepo: UserRepo,
-    private val deliveryOutcomeDao: DeliveryOutcomeDao
+    private val deliveryOutcomeDao: DeliveryOutcomeDao,
+    private val patientDao: PatientDao
 ) {
 
+    private fun buildVillageList(assignVillageIds: String?): VillageIdList {
+        return VillageIdList(
+            RepositorySyncUtils.parseVillageIds(assignVillageIds ?: ""),
+            preferenceDao.getLastPatientSyncTime()
+        )
+    }
+
+    private fun extractDataArray(jsonObj: JSONObject): JSONArray {
+        return when (val dataNode = jsonObj.opt("data")) {
+            is JSONArray -> dataNode
+            is JSONObject -> dataNode.optJSONArray("data")
+            else -> null
+        } ?: JSONArray()
+    }
+
+    private suspend fun refreshAndRetryIfNeeded(
+        responseStatusCode: Int,
+        userName: String,
+        password: String
+    ): Boolean {
+        return responseStatusCode == 5002 && userRepo.refreshTokenTmc(userName, password)
+    }
+
     suspend fun getDeliveryOutcome(patientID: String): DeliveryOutcomeCache? {
         return withContext(Dispatchers.IO) {
             deliveryOutcomeDao.getDeliveryOutcome(patientID)
@@ -39,8 +59,289 @@ class DeliveryOutcomeRepo @Inject constructor(
 
     suspend fun saveDeliveryOutcome(deliveryOutcomeCache: DeliveryOutcomeCache) {
         withContext(Dispatchers.IO) {
-            deliveryOutcomeDao.saveDeliveryOutcome(deliveryOutcomeCache)
+            // Upsert pattern: check for existing record by patientID and reuse its id if found
+            val existing = deliveryOutcomeDao.getDeliveryOutcome(deliveryOutcomeCache.patientID)
+
+            if (existing != null) {
+                // Reuse existing record's id and update
+                val updatedCache = deliveryOutcomeCache.copy(id = existing.id)
+                val rowsAffected = deliveryOutcomeDao.updateDeliveryOutcome(updatedCache)
+                if (rowsAffected == 0) {
+                    // Update failed (record not found by id), insert instead
+                    deliveryOutcomeDao.saveDeliveryOutcome(updatedCache)
+                }
+            } else if (deliveryOutcomeCache.id != 0L) {
+                // Has id but not found in DB, try update first
+                val rowsAffected = deliveryOutcomeDao.updateDeliveryOutcome(deliveryOutcomeCache)
+                if (rowsAffected == 0) {
+                    // Update failed (id doesn't exist), insert instead
+                    deliveryOutcomeDao.saveDeliveryOutcome(deliveryOutcomeCache)
+                }
+            } else {
+                // New record, insert
+                deliveryOutcomeDao.saveDeliveryOutcome(deliveryOutcomeCache)
+            }
+        }
+    }
+
+    /**
+     * Ensures an active delivery-outcome row exists so postnatal beneficiaries
+     * registered/edited via beneficiary form can enter the PNC workflow.
+     */
+    suspend fun ensureActiveDeliveryOutcomeForPnc(patient: Patient) {
+        withContext(Dispatchers.IO) {
+            val existing = deliveryOutcomeDao.getDeliveryOutcome(patient.patientID)
+            if (existing != null) {
+                if (!existing.isActive) {
+                    existing.isActive = true
+                    existing.syncState = SyncState.UNSYNCED
+                    deliveryOutcomeDao.updateDeliveryOutcome(existing)
+                }
+                return@withContext
+            }
+
+            val userName = userRepo.getLoggedInUser()?.userName?.takeIf { it.isNotBlank() } ?: "system"
+            deliveryOutcomeDao.saveDeliveryOutcome(
+                DeliveryOutcomeCache(
+                    patientID = patient.patientID,
+                    isActive = true,
+                    dateOfDelivery = null,
+                    createdBy = userName,
+                    updatedBy = userName,
+                    syncState = SyncState.UNSYNCED
+                )
+            )
+        }
+    }
+
+    suspend fun processNewDeliveryOutcomes(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val deliveryList = deliveryOutcomeDao.getAllUnprocessedDeliveryOutcomes()
+            if (deliveryList.isEmpty()) {
+                Timber.d("No unsynced Delivery Outcome records found for upload")
+                return@withContext true
+            }
+
+            var hasFailures = false
+            val payload = mutableSetOf<DeliveryOutcomePost>()
+
+            deliveryList.forEach { record ->
+                payload.clear()
+                val patient = patientDao.getPatient(record.patientID)
+                val benId = patient.beneficiaryID
+                if (benId == null || benId == 0L) {
+                    Timber.w("Skipping Delivery Outcome upload for ${record.patientID}: beneficiaryID missing")
+                    hasFailures = true
+                    return@forEach
+                }
+
+                record.syncState = SyncState.SYNCING
+                deliveryOutcomeDao.updateDeliveryOutcome(record)
+                payload.add(record.asPostModel(benId))
+
+                val uploaded = postDeliveryOutcomeToAmritServer(payload)
+                if (uploaded) {
+                    record.processed = "P"
+                    record.syncState = SyncState.SYNCED
+                } else {
+                    record.syncState = SyncState.UNSYNCED
+                    hasFailures = true
+                }
+                deliveryOutcomeDao.updateDeliveryOutcome(record)
+            }
+
+            return@withContext !hasFailures
+        }
+    }
+
+    private suspend fun postDeliveryOutcomeToAmritServer(payload: MutableSet<DeliveryOutcomePost>): Boolean {
+        if (payload.isEmpty()) return false
+        val user = userRepo.getLoggedInUser()
+            ?: throw IllegalStateException("No user logged in!!")
+        while (true) {
+            try {
+                val response = amritApiService.postDeliveryOutcomeForm(payload.toList())
+                val statusCode = response.code()
+                if (statusCode != 200) {
+                    Timber.w("Bad response from server for DeliveryOutcome saveAll, code=$statusCode")
+                    return false
+                }
+
+                val responseString = response.body()?.string()
+                if (responseString.isNullOrBlank()) {
+                    Timber.d("DeliveryOutcome saveAll succeeded with empty response body")
+                    return true
+                }
+
+                val jsonObj = try {
+                    JSONObject(responseString)
+                } catch (e: Exception) {
+                    Timber.w(e, "DeliveryOutcome saveAll returned non-JSON body, treating as success: $responseString")
+                    return true
+                }
+
+                val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                val errorMessage = jsonObj.optString("errorMessage")
+                when (responseStatusCode) {
+                    200 -> return true
+                    else -> {
+                        if (refreshAndRetryIfNeeded(responseStatusCode, user.userName, user.password)) {
+                            continue
+                        }
+                        Timber.w("DeliveryOutcome saveAll failed: $errorMessage")
+                        return false
+                    }
+                }
+            } catch (e: SocketTimeoutException) {
+                Timber.d("Caught timeout for DeliveryOutcome saveAll $e; retrying")
+                continue
+            } catch (e: JSONException) {
+                Timber.d("Caught JSON exception for DeliveryOutcome saveAll $e")
+                return false
+            }
+        }
+    }
+
+    suspend fun pullDeliveryOutcomesFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            while (true) {
+                try {
+                    val villageList = buildVillageList(user.assignVillageIds)
+                    val response = amritApiService.getAllDeliveryOutcomes(villageList)
+                    if (response.code() != 200) {
+                        Timber.w("Bad response from server for DeliveryOutcome getAll: $response")
+                        return@withContext false
+                    }
+
+                    val responseString = response.body()?.string()
+                    if (responseString.isNullOrBlank()) {
+                        Timber.w("Empty response body for DeliveryOutcome getAll")
+                        return@withContext false
+                    }
+
+                    val jsonObj = JSONObject(responseString)
+                    val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                    val errorMessage = jsonObj.optString("errorMessage")
+                    when (responseStatusCode) {
+                        200 -> {
+                            val dataArray = extractDataArray(jsonObj)
+                            val gson = Gson()
+                            var savedCount = 0
+                            var skippedNoPatientCount = 0
+                            for (i in 0 until dataArray.length()) {
+                                val networkModel = gson.fromJson(
+                                    dataArray.getJSONObject(i).toString(),
+                                    DeliveryOutcomePost::class.java
+                                )
+                                if (networkModel.benId == 0L) {
+                                    Timber.w("Skipping DeliveryOutcome getAll item with invalid benId at index=$i")
+                                    continue
+                                }
+
+                                val patient = patientDao.getPatientByAnyBeneficiaryId(networkModel.benId)
+                                    ?: ensurePatientPlaceholderForDeliveryOutcome(networkModel.benId)
+                                if (patient == null) {
+                                    Timber.w("No local patient found for DeliveryOutcome benId=${networkModel.benId}, skipping")
+                                    skippedNoPatientCount++
+                                    continue
+                                }
+
+                                val incoming = networkModel.toDeliveryCache(patient.patientID).copy(
+                                    processed = "P",
+                                    syncState = SyncState.SYNCED,
+                                    updatedDate = System.currentTimeMillis(),
+                                    updatedBy = networkModel.updatedBy.ifBlank { user.userName }
+                                )
+                                val existing = deliveryOutcomeDao.getDeliveryOutcome(patient.patientID)
+                                val merged = if (existing != null) {
+                                    mergeDeliveryOutcome(existing, incoming)
+                                } else incoming
+
+                                saveDeliveryOutcome(merged)
+                                savedCount++
+                            }
+                            Timber.d("DeliveryOutcome getAll downsync completed, saved=$savedCount skippedNoPatient=$skippedNoPatientCount received=${dataArray.length()}")
+                            return@withContext true
+                        }
+                        5000 -> {
+                            Timber.d("No Delivery Outcome records found on server")
+                            return@withContext true
+                        }
+                        else -> {
+                            if (refreshAndRetryIfNeeded(responseStatusCode, user.userName, user.password)) {
+                                continue
+                            }
+                            Timber.w("DeliveryOutcome getAll failed: $errorMessage")
+                            return@withContext false
+                        }
+                    }
+                } catch (e: SocketTimeoutException) {
+                    Timber.d("Caught timeout for DeliveryOutcome getAll $e; retrying")
+                    continue
+                } catch (e: JSONException) {
+                    Timber.d("Caught JSON exception for DeliveryOutcome getAll $e")
+                    return@withContext false
+                }
+            }
+            return@withContext false
         }
     }
 
-}
\ No newline at end of file
+    private suspend fun ensurePatientPlaceholderForDeliveryOutcome(benId: Long): Patient? {
+        if (benId <= 0L) return null
+        val existing = patientDao.getPatientByAnyBeneficiaryId(benId)
+        if (existing != null) return existing
+        Timber.w("Skipping DeliveryOutcome downsync record: patient not found for benId=$benId")
+        return null
+    }
+
+    private fun mergeDeliveryOutcome(
+        existing: DeliveryOutcomeCache,
+        incoming: DeliveryOutcomeCache
+    ): DeliveryOutcomeCache {
+        return incoming.copy(
+            id = existing.id,
+            patientID = existing.patientID,
+            isActive = incoming.isActive,
+            dateOfDelivery = incoming.dateOfDelivery ?: existing.dateOfDelivery,
+            timeOfDelivery = incoming.timeOfDelivery ?: existing.timeOfDelivery,
+            placeOfDelivery = incoming.placeOfDelivery ?: existing.placeOfDelivery,
+            typeOfDelivery = incoming.typeOfDelivery ?: existing.typeOfDelivery,
+            hadComplications = incoming.hadComplications ?: existing.hadComplications,
+            complication = incoming.complication ?: existing.complication,
+            causeOfDeath = incoming.causeOfDeath ?: existing.causeOfDeath,
+            otherCauseOfDeath = incoming.otherCauseOfDeath ?: existing.otherCauseOfDeath,
+            otherComplication = incoming.otherComplication ?: existing.otherComplication,
+            deliveryOutcome = incoming.deliveryOutcome ?: existing.deliveryOutcome,
+            liveBirth = incoming.liveBirth ?: existing.liveBirth,
+            stillBirth = incoming.stillBirth ?: existing.stillBirth,
+            dateOfDischarge = incoming.dateOfDischarge ?: existing.dateOfDischarge,
+            timeOfDischarge = incoming.timeOfDischarge ?: existing.timeOfDischarge,
+            isJSYBenificiary = incoming.isJSYBenificiary ?: existing.isJSYBenificiary,
+            gestationalAgeAtDelivery = incoming.gestationalAgeAtDelivery ?: existing.gestationalAgeAtDelivery,
+            deliveryConductedBy = incoming.deliveryConductedBy ?: existing.deliveryConductedBy,
+            modeOfDelivery = incoming.modeOfDelivery ?: existing.modeOfDelivery,
+            indicationForLSCS = incoming.indicationForLSCS ?: existing.indicationForLSCS,
+            indicationForLSCSOther = incoming.indicationForLSCSOther ?: existing.indicationForLSCSOther,
+            privateHospitalName = incoming.privateHospitalName ?: existing.privateHospitalName,
+            motherCondition = incoming.motherCondition ?: existing.motherCondition,
+            maternalComplications = incoming.maternalComplications ?: existing.maternalComplications,
+            motherCurrentlyAdmitted = incoming.motherCurrentlyAdmitted ?: existing.motherCurrentlyAdmitted,
+            isDeath = incoming.isDeath ?: existing.isDeath,
+            isDeathValue = incoming.isDeathValue ?: existing.isDeathValue,
+            dateOfDeath = incoming.dateOfDeath ?: existing.dateOfDeath,
+            placeOfDeath = incoming.placeOfDeath ?: existing.placeOfDeath,
+            placeOfDeathId = incoming.placeOfDeathId ?: existing.placeOfDeathId,
+            otherPlaceOfDeath = incoming.otherPlaceOfDeath ?: existing.otherPlaceOfDeath,
+            processed = incoming.processed ?: existing.processed,
+            createdBy = if (existing.createdBy.isNotBlank()) existing.createdBy else incoming.createdBy,
+            createdDate = if (existing.createdDate > 0L) existing.createdDate else incoming.createdDate,
+            updatedBy = incoming.updatedBy,
+            updatedDate = incoming.updatedDate,
+            syncState = incoming.syncState
+        )
+    }
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/DoctorMasterDataMaleRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/DoctorMasterDataMaleRepo.kt
index 5a9bfd356..8aae8f3cd 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/DoctorMasterDataMaleRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/DoctorMasterDataMaleRepo.kt
@@ -54,7 +54,7 @@ class DoctorMasterDataMaleRepo @Inject constructor(
 
             val response = amritApiService.getDoctorMasterData(
                 visitCategoryID, providerServiceMapID,
-                gender,facilityID,vanID, apiKey
+                gender,facilityID, apiKey
             )
 
             if (response.code() == 200) {
@@ -159,6 +159,10 @@ class DoctorMasterDataMaleRepo @Inject constructor(
         return healthCenterDao.getItemMasterListById(id)
     }
 
+    suspend fun getItemMasterQtyInHandById(id: Int): Int {
+        return healthCenterDao.getItemMasterQtyInHandById(id) ?: 0
+    }
+
     suspend fun getHigherHealthTypeByNameMap():Map<Int,String>{
         return healthCenterDao.getHigherHealthMap().associate {
             it.institutionID to it.institutionName
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/EarDiagnosisRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/EarDiagnosisRepo.kt
new file mode 100644
index 000000000..a7434305d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/EarDiagnosisRepo.kt
@@ -0,0 +1,108 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.EarDiagnosisAssessmentDao
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.EarDiagnosisNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+
+class EarDiagnosisRepo @Inject constructor(
+    private val earDiagnosisAssessmentDao: EarDiagnosisAssessmentDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: EarDiagnosisAssessment) {
+        if (assessment.assessmentId == 0L) {
+            assessment.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientId, visitNo)
+            }
+            earDiagnosisAssessmentDao.insert(assessment)
+        } else {
+            earDiagnosisAssessmentDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(patientID: String): EarDiagnosisAssessment? {
+        return earDiagnosisAssessmentDao.getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessmentByPatientIdAndVisitNo(patientID: String, benVisitNo: Int): EarDiagnosisAssessment? {
+        return earDiagnosisAssessmentDao.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processEarVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = earDiagnosisAssessmentDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postEarForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    earDiagnosisAssessmentDao.update(assessment)
+                },
+                logLabel = "Ear Diagnosis records"
+            )
+        }
+    }
+
+    suspend fun pullEarVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getEarVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), EarDiagnosisNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessmentByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Ear records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/EcrRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/EcrRepo.kt
index 882d25843..b6c9c0590 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/EcrRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/EcrRepo.kt
@@ -1,16 +1,21 @@
 package org.piramalswasthya.cho.repositories
 
 import android.util.Log
+import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.withContext
-import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.room.InAppDb
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.ECTNetwork
+import org.piramalswasthya.cho.model.EligibleCoupleRegCache
 import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
+import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.network.AmritApiService
+import org.piramalswasthya.cho.network.VillageIdList
 //import org.piramalswasthya.sakhi.database.room.SyncState
 //import org.piramalswasthya.sakhi.database.shared_preferences.PreferenceDao
 //import org.piramalswasthya.sakhi.helpers.Konstants
@@ -25,8 +30,6 @@ import org.piramalswasthya.cho.network.AmritApiService
 import timber.log.Timber
 import java.io.IOException
 import java.net.SocketTimeoutException
-import java.text.SimpleDateFormat
-import java.util.Locale
 import javax.inject.Inject
 
 class EcrRepo @Inject constructor(
@@ -38,34 +41,103 @@ class EcrRepo @Inject constructor(
     private val tmcNetworkApiService: AmritApiService
 ) {
 
+    // ===== Eligible Couple Registration Methods =====
+
+    fun getAllPatientsWithECR() = database.ecrDao.getAllPatientsWithECR()
+
+    suspend fun getPatientWithECR(patientId: String) =
+        database.ecrDao.getPatientWithECR(patientId)
+
+    suspend fun getSavedECR(patientId: String) =
+        database.ecrDao.getSavedECR(patientId)
+
+    suspend fun saveECR(ecrCache: org.piramalswasthya.cho.model.EligibleCoupleRegCache) {
+        database.ecrDao.upsert(ecrCache)
+    }
+
+    suspend fun updateECR(ecrCache: org.piramalswasthya.cho.model.EligibleCoupleRegCache) {
+        database.ecrDao.update(ecrCache)
+    }
+
+    suspend fun getECRCount() =
+        database.ecrDao.ecrCount()
+
+    // ===== Eligible Couple Tracking Methods =====
 
     suspend fun getAllECT(patientID: String): List<EligibleCoupleTrackingCache> {
-        return withContext(Dispatchers.IO) {
-            database.ecrDao.getAllECT(patientID)
-        }
+        return database.ecrDao.getAllECT(patientID)
     }
 
     suspend fun getEct(patientID: String, createdDate: Long): EligibleCoupleTrackingCache? {
-        return withContext(Dispatchers.IO) {
-            database.ecrDao.getEct(patientID, createdDate)
-        }
+        return database.ecrDao.getEct(patientID, createdDate)
+    }
+
+    fun getPatientsForTrackingList(): Flow<List<Patient>> {
+        return database.ecrDao.getPatientsForTrackingList()
+    }
+
+    fun getEligibleCoupleTrackingCount(): Flow<Int> {
+        return database.ecrDao.getEligibleCoupleTrackingCount()
     }
 
     suspend fun saveEct(eligibleCoupleTrackingCache: EligibleCoupleTrackingCache) {
-        withContext(Dispatchers.IO) {
-            database.ecrDao.upsert(eligibleCoupleTrackingCache)
+        database.ecrDao.upsert(eligibleCoupleTrackingCache)
+    }
+
+    suspend fun resetEctAfterAbortion(patientID: String, createdBy: String) {
+        val allEct = database.ecrDao.getAllECT(patientID)
+        val mostRecent = allEct.maxByOrNull { it.visitDate }
+        val hasActive = allEct.any { it.isActive }
+
+        allEct.forEach { ect ->
+            var changed = false
+            if (ect.isPregnant != null) {
+                ect.isPregnant = null
+                changed = true
+            }
+            if (ect.pregnancyTestResult != null) {
+                ect.pregnancyTestResult = null
+                changed = true
+            }
+            // Reactivate the most recent row only when nothing is currently active,
+            // so the EC-tracking DAO (which filters on isActive = 1) keeps the
+            // patient visible after the post-abortion statusOfWomanID = 1 reset.
+            if (!hasActive && ect === mostRecent && !ect.isActive) {
+                ect.isActive = true
+                changed = true
+            }
+            if (changed) {
+                if (ect.processed != "N") ect.processed = "U"
+                ect.syncState = SyncState.UNSYNCED
+                database.ecrDao.upsert(ect)
+            }
+        }
+
+        if (allEct.isEmpty()) {
+            val freshEct = EligibleCoupleTrackingCache(
+                patientID = patientID,
+                visitDate = System.currentTimeMillis(),
+                createdBy = createdBy,
+                updatedBy = createdBy,
+                processed = "N",
+                isActive = true,
+                syncState = SyncState.UNSYNCED
+            )
+            database.ecrDao.upsert(freshEct)
         }
     }
 
 
     suspend fun pushAndUpdateEctRecord(): Boolean {
         return withContext(Dispatchers.IO) {
-            val user = userRepo.getLoggedInUser()
-                ?: throw IllegalStateException("No user logged in!!")
-
             val ectList = database.ecrDao.getAllUnprocessedECT()
+            if (ectList.isEmpty()) {
+                Timber.d("No unsynced EC tracking records found for upload")
+                return@withContext true
+            }
 
             val ectPostList = mutableSetOf<EligibleCoupleTrackingCache>()
+            var hasFailures = false
 
             ectList.forEach {
                 ectPostList.clear()
@@ -78,13 +150,14 @@ class EcrRepo @Inject constructor(
                     it.syncState = SyncState.SYNCED
                 } else {
                     it.syncState = SyncState.UNSYNCED
+                    hasFailures = true
                 }
                 database.ecrDao.updateEligibleCoupleTracking(it)
 //                if(!uploadDone)
 //                    return@withContext false
             }
 
-            return@withContext true
+            return@withContext !hasFailures
         }
     }
 
@@ -94,15 +167,25 @@ class EcrRepo @Inject constructor(
         val user =
             userRepo.getLoggedInUser() ?: throw IllegalStateException("No user logged in!!")
         try {
+            val ectPayload = ectPostList.toList().mapNotNull { cache ->
+                val benId = runCatching { patientRepo.getPatient(cache.patientID).beneficiaryID }
+                    .getOrNull()
+                if (benId == null || benId <= 0L) {
+                    Timber.w("Skipping ECT upload: unresolved beneficiaryID for patient ${cache.patientID}")
+                    null
+                } else {
+                    cache.asNetworkModel(benId)
+                }
+            }
+
+            if (ectPayload.isEmpty()) {
+                Timber.w("Skipping ECT upload: no valid beneficiary IDs found in payload")
+                return false
+            }
+
+            Timber.d("Uploading EC tracking payload count=${ectPayload.size}")
             val response =
-                amritApiService.postEctForm(
-                    ectPostList.toList()
-                    .filter{ ben -> patientRepo.getPatient(ben.patientID).beneficiaryID != null }
-                    .map {
-                        val pat = patientRepo.getPatient(it.patientID)
-                        it.asNetworkModel(pat.beneficiaryID!!)
-                    }
-                )
+                amritApiService.postEctForm(ectPayload)
             val statusCode = response.code()
 
             if (statusCode == 200) {
@@ -154,8 +237,140 @@ class EcrRepo @Inject constructor(
     }
 
     suspend fun getLatestEctByBenId(benId: String): EligibleCoupleTrackingCache? {
-        return withContext(Dispatchers.IO){
-            database.ecrDao.getLatestEct(benId)
+        return database.ecrDao.getLatestEct(benId)
+    }
+
+    // ===== Pull Eligible Couples from Server =====
+
+    suspend fun pullEligibleCouplesFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            try {
+                val villageList = VillageIdList(
+                    RepositorySyncUtils.parseVillageIds(user.assignVillageIds ?: ""),
+                    preferenceDao.getLastPatientSyncTime()
+                )
+                val response = amritApiService.getEligibleCouples(villageList)
+                val statusCode = response.code()
+                if (statusCode == 200) {
+                    val responseString = response.body()?.string()
+                    if (responseString != null) {
+                        val jsonObj = JSONObject(responseString)
+                        val errorMessage = jsonObj.optString("errorMessage")
+                        val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                        when (responseStatusCode) {
+                            200 -> {
+                                try {
+                                    val dataArray = when (val dataNode = jsonObj.opt("data")) {
+                                        is org.json.JSONArray -> dataNode
+                                        is org.json.JSONObject -> dataNode.optJSONArray("data")
+                                        else -> null
+                                    } ?: org.json.JSONArray()
+                                    val gson = Gson()
+                                    var savedCount = 0
+                                    for (i in 0 until dataArray.length()) {
+                                        val ectNetwork = gson.fromJson(
+                                            dataArray.getJSONObject(i).toString(),
+                                            ECTNetwork::class.java
+                                        )
+                                        val benId = ectNetwork.benId
+                                        if (benId == null || benId == 0L) {
+                                            Timber.w("Skipping EC record: benId missing/invalid in payload index=$i")
+                                            continue
+                                        }
+                                        // Map server benId to local patientID.
+                                        // benId may come as beneficiaryID or beneficiaryRegID depending on backend source.
+                                        val patient = patientRepo.getPatientByAnyBeneficiaryId(benId)
+                                        if (patient != null) {
+                                            val existingEct = database.ecrDao.getEct(
+                                                patient.patientID,
+                                                org.piramalswasthya.cho.network.getLongFromDate(ectNetwork.visitDate)
+                                            ) ?: database.ecrDao.getEctByVisitDay(
+                                                patient.patientID,
+                                                org.piramalswasthya.cho.network.getLongFromDate(ectNetwork.visitDate)
+                                            )
+                                            if (existingEct == null) {
+                                                val cache = ectNetwork.toCache(patient.patientID)
+                                                database.ecrDao.upsert(cache)
+                                                savedCount++
+                                                Timber.d("Saved EC tracking record for patient ${patient.patientID}")
+                                            } else {
+                                                Timber.d("EC tracking record already exists for patient ${patient.patientID} on ${ectNetwork.visitDate}")
+                                            }
+                                            val ecrSource = existingEct ?: ectNetwork.toCache(patient.patientID)
+                                            ensureEcrRowForTrackedPatient(patient.patientID, ecrSource, user.userName)
+                                        } else {
+                                            Timber.w("No local patient found for benId $benId, skipping EC record")
+                                        }
+                                    }
+                                    Timber.d("EC downsync completed, received=${dataArray.length()} saved=$savedCount")
+                                } catch (e: Exception) {
+                                    Timber.e(e, "Error parsing EC downsync data")
+                                    return@withContext false
+                                }
+                                return@withContext true
+                            }
+                            5002 -> {
+                                if (userRepo.refreshTokenTmc(
+                                        user.userName, user.password
+                                    )
+                                ) throw SocketTimeoutException()
+                            }
+                            5000 -> {
+                                Timber.d("No EC records found on server")
+                                return@withContext true
+                            }
+                            else -> {
+                                Log.d("error ec pull", errorMessage)
+                                throw IOException("EC pull failed with code $responseStatusCode")
+                            }
+                        }
+                    }
+                }
+                Timber.w("Bad response from server for EC pull: $response")
+                return@withContext false
+            } catch (e: SocketTimeoutException) {
+                Timber.d("Caught timeout exception $e, retrying EC pull")
+                return@withContext pullEligibleCouplesFromServer()
+            } catch (e: JSONException) {
+                Timber.d("Caught JSON exception $e for EC pull")
+                return@withContext false
+            }
+        }
+    }
+
+    private suspend fun ensureEcrRowForTrackedPatient(
+        patientId: String,
+        trackingCache: EligibleCoupleTrackingCache,
+        defaultUserName: String
+    ) {
+        val existingEcr = database.ecrDao.getSavedECR(patientId)
+        if (existingEcr != null) {
+            if ((existingEcr.lmpDate == null || existingEcr.lmpDate == 0L) && trackingCache.lmpDate != null) {
+                existingEcr.lmpDate = trackingCache.lmpDate
+                existingEcr.syncState = SyncState.SYNCED
+                existingEcr.processed = "P"
+                database.ecrDao.update(existingEcr)
+            }
+            return
         }
+
+        val ecr = EligibleCoupleRegCache(
+            patientID = patientId,
+            dateOfReg = trackingCache.createdDate,
+            lmpDate = trackingCache.lmpDate,
+            noOfChildren = 0,
+            noOfLiveChildren = 0,
+            noOfMaleChildren = 0,
+            noOfFemaleChildren = 0,
+            isRegistered = true,
+            processed = "P",
+            createdBy = trackingCache.createdBy.ifBlank { defaultUserName },
+            createdDate = trackingCache.createdDate,
+            updatedBy = trackingCache.updatedBy.ifBlank { defaultUserName },
+            syncState = SyncState.SYNCED
+        )
+        database.ecrDao.upsert(ecr)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/ElderlyHealthRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/ElderlyHealthRepo.kt
new file mode 100644
index 000000000..86dee4768
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/ElderlyHealthRepo.kt
@@ -0,0 +1,103 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.ElderlyHealthAssessmentDao
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.ElderlyHealthNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+
+class ElderlyHealthRepo @Inject constructor(
+    private val elderlyHealthAssessmentDao: ElderlyHealthAssessmentDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: ElderlyHealthAssessment) {
+        if (assessment.assessmentId == 0L) {
+            cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientId, assessment.benVisitNo)
+            elderlyHealthAssessmentDao.insert(assessment)
+        } else {
+            elderlyHealthAssessmentDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(patientID: String): ElderlyHealthAssessment? {
+        return elderlyHealthAssessmentDao.getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessment(patientID: String, benVisitNo: Int): ElderlyHealthAssessment? {
+        return elderlyHealthAssessmentDao.getAssessment(patientID, benVisitNo)
+    }
+    suspend fun processElderlyVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = elderlyHealthAssessmentDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postElderlyForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    elderlyHealthAssessmentDao.update(assessment)
+                },
+                logLabel = "Elderly Health records"
+            )
+        }
+    }
+
+    suspend fun pullElderlyVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getElderlyVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), ElderlyHealthNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessment(patientId, networkObj.benVisitNo ?: 0) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Elderly records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/InfantRegRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/InfantRegRepo.kt
new file mode 100644
index 000000000..478a2f1d1
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/InfantRegRepo.kt
@@ -0,0 +1,995 @@
+package org.piramalswasthya.cho.repositories
+
+import com.google.gson.Gson
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import okhttp3.ResponseBody
+import org.json.JSONException
+import org.json.JSONArray
+import org.json.JSONObject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.InfantRegDao
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.ChildApiPost
+import org.piramalswasthya.cho.model.ChildRegDomain
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.Gender
+import org.piramalswasthya.cho.model.InfantRegApiPost
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.InfantRegDomain
+import org.piramalswasthya.cho.model.InfantRegWithPatient
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.getIsoDateTimeStringFromLong
+import org.piramalswasthya.cho.network.AmritApiService
+import org.piramalswasthya.cho.network.VillageIdList
+import timber.log.Timber
+import java.net.SocketTimeoutException
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+import retrofit2.Response
+
+class InfantRegRepo @Inject constructor(
+    private val preferenceDao: PreferenceDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val patientDao: PatientDao,
+    private val infantRegDao: InfantRegDao
+) {
+    /**
+     * Get list of infants eligible for registration
+     * Source of truth: combined DELIVERY_OUTCOME + INFANT_REG.
+     * - Generates rows from total delivery outcome count.
+     * - Marks only live-birth rows as registerable.
+     * - Maps synced infant rows onto generated indices for View state.
+     */
+    fun getListForInfantReg(): Flow<List<InfantRegDomain>> {
+        return infantRegDao.getListForInfantRegister()
+            .map { list ->
+                list
+                    .flatMap { it.asDomainModel() }
+                    .sortedByDescending { it.deliveryOutcome.dateOfDelivery ?: 0L }
+            }
+    }
+
+    /**
+     * Get count of infants eligible for registration
+     */
+    fun getInfantRegisterCount(): Flow<Int> {
+        return infantRegDao.getInfantRegisterCount()
+    }
+
+    /**
+     * Get all registered infants for child registration list
+     */
+    fun getRegisteredInfants(): Flow<List<ChildRegDomain>> {
+        return infantRegDao.getAllRegisteredInfants()
+            .map { list ->
+                list
+                    .map { it.asDomainModel() }
+            }
+    }
+
+    /**
+     * Get count of registered infants
+     */
+    fun getRegisteredInfantsCount(): Flow<Int> {
+        return infantRegDao.getAllRegisteredInfantsCount()
+    }
+
+    suspend fun getInfantReg(patientID: String, babyIndex: Int): InfantRegCache? =
+        infantRegDao.getInfantReg(patientID, babyIndex)
+
+    suspend fun getInfantRegFromChildPatientID(childPatientID: String): InfantRegCache? =
+        infantRegDao.getInfantRegFromChildPatientID(childPatientID)
+
+    suspend fun saveInfantReg(infantRegCache: InfantRegCache) {
+        upsertInfantReg(infantRegCache)
+    }
+
+    suspend fun upsertInfantReg(infantRegCache: InfantRegCache) {
+        // IMPORTANT:
+        // Downsync payload can contain non-zero server-side IDs that do not exist in local DB.
+        // So we must not assume `id != 0` means "already present locally".
+        // Local uniqueness for this module is motherPatientID + babyIndex.
+        val existing = infantRegDao.getInfantReg(
+            infantRegCache.motherPatientID,
+            infantRegCache.babyIndex
+        )
+
+        if (existing != null) {
+            infantRegDao.updateInfantReg(infantRegCache.copy(id = existing.id))
+        } else {
+            infantRegDao.saveInfantReg(infantRegCache.copy(id = 0))
+        }
+    }
+
+    suspend fun getNumBabiesRegistered(patientID: String): Int =
+        infantRegDao.getNumBabiesRegistered(patientID)
+
+    /**
+     * Creates/ensures infant placeholder rows in INFANT_REG based on Delivery Outcome count.
+     * We keep placeholders as processed/synced so they are local list entries until user fills details.
+     */
+    suspend fun ensureInfantPlaceholdersForDeliveryOutcome(
+        motherPatientID: String,
+        motherName: String?,
+        infantCount: Int,
+        userName: String
+    ) {
+        if (infantCount <= 0) return
+        val safeMotherName = motherName?.trim().takeUnless { it.isNullOrBlank() } ?: "Mother"
+        val now = System.currentTimeMillis()
+
+        for (index in 0 until infantCount) {
+            val existing = infantRegDao.getInfantReg(motherPatientID, index)
+            if (existing != null) continue
+
+            val placeholder = InfantRegCache(
+                motherPatientID = motherPatientID,
+                babyIndex = index,
+                babyName = "baby ${index + 1} of $safeMotherName",
+                isActive = true,
+                processed = "Y",
+                createdBy = userName,
+                createdDate = now,
+                updatedBy = userName,
+                updatedDate = now,
+                syncState = SyncState.SYNCED
+            )
+            upsertInfantReg(placeholder)
+        }
+    }
+
+    suspend fun processNewInfantRegister(): Boolean {
+        return withContext(Dispatchers.IO) {
+            if (preferenceDao.getLoggedInUser() == null) {
+                throw IllegalStateException("No user logged in")
+            }
+
+            val infantRegList = infantRegDao.getAllUnprocessedInfantReg()
+            if (infantRegList.isEmpty()) return@withContext true
+
+            val deduplicatedInfantRegs = infantRegList
+                .groupBy { it.motherPatientID to it.babyIndex }
+                .map { (_, records) ->
+                    records.maxWithOrNull(
+                        compareBy<InfantRegCache> { it.updatedDate }
+                            .thenBy { it.createdDate }
+                            .thenBy { it.id }
+                    ) ?: records.first()
+                }
+
+            var hasFailures = false
+            deduplicatedInfantRegs.forEach { infantReg ->
+                val motherPatient = getPatientOrNull(infantReg.motherPatientID)
+                val motherBenId = motherPatient?.beneficiaryID
+
+                if (motherBenId == null) {
+                    Timber.w("Skipping infant registration ${infantReg.id}: mother beneficiary ID missing")
+                    hasFailures = true
+                    return@forEach
+                }
+
+                val childBenId = infantReg.childPatientID
+                    ?.let { getPatientOrNull(it)?.beneficiaryID }
+                    ?: 0L
+
+                val payload = infantReg.toApiPost(
+                    motherBenId = motherBenId,
+                    childBenId = childBenId
+                )
+
+                infantReg.syncState = SyncState.SYNCING
+                infantRegDao.updateInfantReg(infantReg)
+
+                val uploadDone = postDataToAmritServer(listOf(payload))
+                if (uploadDone) {
+                    infantReg.processed = "P"
+                    infantReg.syncState = SyncState.SYNCED
+                } else {
+                    infantReg.syncState = SyncState.UNSYNCED
+                    hasFailures = true
+                }
+                infantRegDao.updateInfantReg(infantReg)
+            }
+
+            return@withContext !hasFailures
+        }
+    }
+
+    suspend fun syncChildRegistration(infantReg: InfantRegCache): Boolean {
+        return withContext(Dispatchers.IO) {
+            val motherPatient = getPatientOrNull(infantReg.motherPatientID)
+            val motherBenId = motherPatient?.beneficiaryID
+            if (motherBenId == null || motherBenId <= 0L) {
+                Timber.w("Skipping child registration sync ${infantReg.id}: mother beneficiary ID missing")
+                return@withContext false
+            }
+
+            val childBenId = infantReg.childPatientID
+                ?.let { getPatientOrNull(it)?.beneficiaryID }
+                ?.takeIf { it > 0L }
+                ?: motherBenId
+
+            val childGenderID = infantReg.childPatientID
+                ?.let { getPatientOrNull(it)?.genderID }
+                ?: infantReg.genderID
+
+            val childPayload = infantReg.toChildApiPost(
+                childBenId = childBenId,
+                childGenderID = childGenderID
+            )
+            val syncDone = postChildDataToAmritServer(listOf(childPayload))
+            if (syncDone) {
+                val now = System.currentTimeMillis()
+                val updated = infantReg.copy(
+                    processed = "C",
+                    syncState = SyncState.SYNCED,
+                    updatedDate = now
+                )
+                upsertInfantReg(updated)
+            }
+            syncDone
+        }
+    }
+
+    private suspend fun postWithTokenRefreshRetry(
+        moduleName: String,
+        call: suspend () -> Response<ResponseBody>
+    ): Boolean {
+        val user = preferenceDao.getLoggedInUser()
+            ?: throw IllegalStateException("No user logged in")
+        var refreshed = false
+        while (true) {
+            try {
+                val response = call()
+                if (response.code() != 200) {
+                    Timber.w("$moduleName sync failed with HTTP ${response.code()}")
+                    return false
+                }
+
+                val responseString = response.body()?.string()
+                if (responseString.isNullOrBlank()) {
+                    Timber.d("$moduleName saveAll succeeded with empty response body")
+                    return true
+                }
+                val jsonObj = JSONObject(responseString)
+                val responseStatusCode = jsonObj.optInt("statusCode", -1)
+                when (responseStatusCode) {
+                    200 -> return true
+                    401, 5002 -> {
+                        if (!refreshed && userRepo.refreshTokenTmc(user.userName, user.password)) {
+                            refreshed = true
+                            Timber.d("Retrying $moduleName sync after token refresh")
+                            continue
+                        }
+                        return false
+                    }
+                    else -> {
+                        Timber.w("$moduleName sync failed with response statusCode=$responseStatusCode")
+                        return false
+                    }
+                }
+            } catch (e: SocketTimeoutException) {
+                if (!refreshed && userRepo.refreshTokenTmc(user.userName, user.password)) {
+                    refreshed = true
+                    Timber.d("Retrying $moduleName sync after token refresh")
+                    continue
+                }
+                Timber.e(e, "$moduleName sync failed")
+                return false
+            } catch (e: JSONException) {
+                Timber.e(e, "$moduleName sync parse failed")
+                return false
+            } catch (e: Exception) {
+                Timber.e(e, "$moduleName sync failed")
+                return false
+            }
+        }
+    }
+
+    private suspend fun postChildDataToAmritServer(
+        childPostList: List<ChildApiPost>
+    ): Boolean {
+        if (childPostList.isEmpty()) return true
+        return postWithTokenRefreshRetry(
+            moduleName = "Child",
+            call = { amritApiService.postChildDetails(childPostList) }
+        )
+    }
+
+    private suspend fun postDataToAmritServer(
+        infantRegPostList: List<InfantRegApiPost>
+    ): Boolean {
+        if (infantRegPostList.isEmpty()) return true
+        return postWithTokenRefreshRetry(
+            moduleName = "Infant",
+            call = { amritApiService.postInfantRegForm(infantRegPostList) }
+        )
+    }
+
+    private suspend fun getPatientOrNull(patientID: String) =
+        runCatching { patientDao.getPatient(patientID) }.getOrNull()
+
+    private suspend fun pullWithTokenRefreshRetry(
+        moduleName: String,
+        fetch: suspend (VillageIdList) -> Response<ResponseBody>,
+        onSuccess200: suspend (jsonObj: JSONObject, userName: String) -> Boolean
+    ): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            var refreshed = false
+            while (true) {
+                try {
+                    val villageList = VillageIdList(
+                        RepositorySyncUtils.parseVillageIds(user.assignVillageIds ?: ""),
+                        preferenceDao.getLastPatientSyncTime()
+                    )
+                    val response = fetch(villageList)
+                    if (response.code() != 200) {
+                        Timber.w("Bad response from server for $moduleName getAll: $response")
+                        return@withContext false
+                    }
+
+                    val responseString = response.body()?.string()
+                    if (responseString.isNullOrBlank()) {
+                        Timber.w("Empty response body for $moduleName getAll")
+                        return@withContext false
+                    }
+
+                    val jsonObj = JSONObject(responseString)
+                    val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                    val errorMessage = jsonObj.optString("errorMessage")
+                    when (responseStatusCode) {
+                        200 -> return@withContext onSuccess200(jsonObj, user.userName)
+                        5000 -> {
+                            Timber.d("No ${moduleName.lowercase(Locale.ENGLISH)} records found on server")
+                            return@withContext true
+                        }
+                        401, 5002 -> {
+                            if (!refreshed && userRepo.refreshTokenTmc(user.userName, user.password)) {
+                                refreshed = true
+                                Timber.d("Retrying ${moduleName.lowercase(Locale.ENGLISH)} getAll after token refresh")
+                                continue
+                            }
+                            return@withContext false
+                        }
+                        else -> {
+                            Timber.w("$moduleName getAll failed: $errorMessage")
+                            return@withContext false
+                        }
+                    }
+                } catch (e: SocketTimeoutException) {
+                    if (!refreshed && userRepo.refreshTokenTmc(user.userName, user.password)) {
+                        refreshed = true
+                        Timber.d("Retrying ${moduleName.lowercase(Locale.ENGLISH)} getAll after token refresh")
+                        continue
+                    }
+                    Timber.e(e, "$moduleName getAll failed")
+                    return@withContext false
+                } catch (e: JSONException) {
+                    Timber.e(e, "$moduleName getAll parse failed")
+                    return@withContext false
+                } catch (e: Exception) {
+                    Timber.e(e, "$moduleName getAll failed")
+                    return@withContext false
+                }
+            }
+            return@withContext false
+        }
+    }
+
+    suspend fun pullInfantsFromServer(): Boolean {
+        return pullWithTokenRefreshRetry(
+            moduleName = "Infant",
+            fetch = { villageList -> amritApiService.getAllInfants(villageList) }
+        ) { jsonObj, userName ->
+            val dataArray = extractInfantDataArray(jsonObj)
+            val gson = Gson()
+            var savedCount = 0
+            var skippedNoMotherCount = 0
+            var skippedInvalidPayloadCount = 0
+            var failedSaveCount = 0
+            for (i in 0 until dataArray.length()) {
+                try {
+                    val rawObj = extractInfantItemObject(dataArray, i)
+                    if (rawObj == null) {
+                        skippedInvalidPayloadCount++
+                        continue
+                    }
+                    val normalizedObj = normalizeInfantPayload(rawObj)
+                    val networkModel = gson.fromJson(
+                        normalizedObj.toString(),
+                        InfantRegApiPost::class.java
+                    )
+                    if (networkModel.benId <= 0L) {
+                        Timber.w("Invalid infant payload at index=$i: benId=${networkModel.benId}, skipping")
+                        skippedInvalidPayloadCount++
+                        continue
+                    }
+                    val mother = patientDao.getPatientByAnyBeneficiaryId(networkModel.benId)
+                        ?: ensureMotherPlaceholderForInfant(benId = networkModel.benId)
+                    if (mother == null) {
+                        Timber.w("No local mother patient found for infant benId=${networkModel.benId}, skipping")
+                        skippedNoMotherCount++
+                        continue
+                    }
+                    val childPatientID = if (networkModel.childBenId > 0) {
+                        patientDao.getPatientByAnyBeneficiaryId(networkModel.childBenId)?.patientID
+                    } else null
+
+                    val incoming = networkModel.toCacheModel(
+                        motherPatientID = mother.patientID,
+                        childPatientID = childPatientID
+                    ).copy(
+                        processed = "P",
+                        syncState = SyncState.SYNCED,
+                        updatedDate = System.currentTimeMillis(),
+                        updatedBy = networkModel.updatedBy?.ifBlank { userName } ?: userName
+                    )
+                    val existing = infantRegDao.getInfantReg(mother.patientID, incoming.babyIndex)
+                    val merged = if (existing != null) {
+                        if (existing.syncState == SyncState.SYNCED) {
+                            incoming.copy(
+                                id = existing.id,
+                                childPatientID = incoming.childPatientID ?: existing.childPatientID,
+                                babyName = incoming.babyName ?: existing.babyName,
+                                infantTerm = incoming.infantTerm ?: existing.infantTerm,
+                                corticosteroidGiven = incoming.corticosteroidGiven ?: existing.corticosteroidGiven,
+                                genderID = incoming.genderID ?: existing.genderID,
+                                babyCriedAtBirth = incoming.babyCriedAtBirth ?: existing.babyCriedAtBirth,
+                                resuscitation = incoming.resuscitation ?: existing.resuscitation,
+                                referred = incoming.referred ?: existing.referred,
+                                hadBirthDefect = incoming.hadBirthDefect ?: existing.hadBirthDefect,
+                                birthDefect = incoming.birthDefect ?: existing.birthDefect,
+                                otherDefect = incoming.otherDefect ?: existing.otherDefect,
+                                weight = incoming.weight ?: existing.weight,
+                                breastFeedingStarted = incoming.breastFeedingStarted ?: existing.breastFeedingStarted,
+                                opv0Dose = incoming.opv0Dose ?: existing.opv0Dose,
+                                bcgDose = incoming.bcgDose ?: existing.bcgDose,
+                                hepBDose = incoming.hepBDose ?: existing.hepBDose,
+                                vitkDose = incoming.vitkDose ?: existing.vitkDose,
+                                outcomeAtBirth = incoming.outcomeAtBirth ?: existing.outcomeAtBirth,
+                                typeOfResuscitation = incoming.typeOfResuscitation ?: existing.typeOfResuscitation,
+                                newbornComplications = incoming.newbornComplications ?: existing.newbornComplications,
+                                currentStatusOfBaby = incoming.currentStatusOfBaby ?: existing.currentStatusOfBaby,
+                                causeOfDeath = incoming.causeOfDeath ?: existing.causeOfDeath,
+                                otherCauseOfDeath = incoming.otherCauseOfDeath ?: existing.otherCauseOfDeath,
+                                birthDoseVaccinesGiven = incoming.birthDoseVaccinesGiven ?: existing.birthDoseVaccinesGiven,
+                                reasonForNoVaccines = incoming.reasonForNoVaccines ?: existing.reasonForNoVaccines,
+                                vitaminKInjectionGiven = incoming.vitaminKInjectionGiven ?: existing.vitaminKInjectionGiven,
+                                reasonForNoVitaminK = incoming.reasonForNoVitaminK ?: existing.reasonForNoVitaminK,
+                                birthCertificateIssued = incoming.birthCertificateIssued ?: existing.birthCertificateIssued,
+                                createdDate = if (existing.createdDate > 0L) existing.createdDate else incoming.createdDate,
+                                createdBy = if (existing.createdBy.isNotBlank()) existing.createdBy else incoming.createdBy
+                            )
+                        } else {
+                            existing.copy(
+                                id = existing.id,
+                                childPatientID = existing.childPatientID ?: incoming.childPatientID
+                            )
+                        }
+                    } else incoming
+                    upsertInfantReg(merged)
+                    savedCount++
+                } catch (e: Exception) {
+                    failedSaveCount++
+                    Timber.w(e, "Failed saving infant payload index=$i")
+                }
+            }
+            Timber.d(
+                "Infant getAll downsync completed, saved=$savedCount " +
+                    "skippedNoMother=$skippedNoMotherCount " +
+                    "skippedInvalidPayload=$skippedInvalidPayloadCount failedSave=$failedSaveCount " +
+                    "received=${dataArray.length()}"
+            )
+            failedSaveCount == 0 &&
+                skippedNoMotherCount == 0 &&
+                skippedInvalidPayloadCount == 0
+        }
+    }
+
+    suspend fun pullChildrenFromServer(): Boolean {
+        return pullWithTokenRefreshRetry(
+            moduleName = "Child",
+            fetch = { villageList -> amritApiService.getAllChildren(villageList) }
+        ) { jsonObj, userName ->
+            val dataArray = extractInfantDataArray(jsonObj)
+            val gson = Gson()
+            var savedCount = 0
+            var skippedNoMotherCount = 0
+            var skippedInvalidPayloadCount = 0
+            var failedSaveCount = 0
+
+            for (i in 0 until dataArray.length()) {
+                try {
+                    val rawObj = extractInfantItemObject(dataArray, i)
+                    if (rawObj == null) {
+                        skippedInvalidPayloadCount++
+                        continue
+                    }
+                    val normalizedObj = normalizeChildPayload(rawObj)
+                    val networkModel = gson.fromJson(
+                        normalizedObj.toString(),
+                        ChildApiPost::class.java
+                    )
+                    if (networkModel.benId <= 0L) {
+                        skippedInvalidPayloadCount++
+                        continue
+                    }
+
+                    val mother = patientDao.getPatientByAnyBeneficiaryId(networkModel.benId)
+                        ?: ensureMotherPlaceholderForInfant(networkModel.benId)
+                    if (mother == null) {
+                        skippedNoMotherCount++
+                        continue
+                    }
+
+                    val existingRegs = infantRegDao.getAllInfantRegs(setOf(mother.patientID))
+                        .filter { it.isActive }
+                        .sortedWith(
+                            compareBy<InfantRegCache> { it.babyIndex }
+                                .thenByDescending { it.updatedDate }
+                        )
+                    val resolvedExisting = resolveChildRecord(existingRegs, networkModel)
+                    val resolvedBabyIndex = resolvedExisting?.babyIndex
+                        ?: existingRegs.firstOrNull { !it.hasRegistrationData() }?.babyIndex
+                        ?: existingRegs.size
+
+                    val merged = mergeChildDownsync(
+                        existing = resolvedExisting,
+                        motherPatientID = mother.patientID,
+                        child = networkModel,
+                        babyIndex = resolvedBabyIndex,
+                        userName = userName
+                    )
+
+                    upsertInfantReg(merged)
+                    savedCount++
+                } catch (e: Exception) {
+                    failedSaveCount++
+                    Timber.w(e, "Failed saving child payload index=$i")
+                }
+            }
+
+            Timber.d(
+                "Child getAll downsync completed, saved=$savedCount " +
+                    "skippedNoMother=$skippedNoMotherCount " +
+                    "skippedInvalidPayload=$skippedInvalidPayloadCount failedSave=$failedSaveCount " +
+                    "received=${dataArray.length()}"
+            )
+            true
+        }
+    }
+
+    private fun InfantRegCache.toApiPost(motherBenId: Long, childBenId: Long): InfantRegApiPost {
+        return InfantRegApiPost(
+            id = id,
+            benId = motherBenId,
+            childBenId = childBenId,
+            isActive = isActive,
+            babyName = babyName,
+            babyIndex = babyIndex,
+            infantTerm = infantTerm,
+            corticosteroidGiven = corticosteroidGiven,
+            gender = mapGender(genderID),
+            babyCriedAtBirth = babyCriedAtBirth,
+            resuscitation = resuscitation,
+            referred = referred,
+            hadBirthDefect = hadBirthDefect,
+            birthDefect = birthDefect,
+            otherDefect = otherDefect,
+            weight = weight ?: 0.0,
+            breastFeedingStarted = breastFeedingStarted,
+            opv0Dose = getIsoDateTimeStringFromLong(opv0Dose),
+            bcgDose = getIsoDateTimeStringFromLong(bcgDose),
+            hepBDose = getIsoDateTimeStringFromLong(hepBDose),
+            vitkDose = getIsoDateTimeStringFromLong(vitkDose),
+            outcomeAtBirth = outcomeAtBirth,
+            typeOfResuscitation = typeOfResuscitation,
+            newbornComplications = newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued,
+            createdDate = getIsoDateTimeStringFromLong(createdDate),
+            createdBy = createdBy,
+            updatedDate = getIsoDateTimeStringFromLong(updatedDate),
+            updatedBy = updatedBy
+        )
+    }
+
+    private fun InfantRegCache.toChildApiPost(childBenId: Long, childGenderID: Int?): ChildApiPost {
+        return ChildApiPost(
+            id = id,
+            benId = childBenId,
+            babyName = babyName,
+            infantTerm = infantTerm,
+            corticosteroidGiven = corticosteroidGiven,
+            gender = mapGender(childGenderID),
+            babyCriedAtBirth = babyCriedAtBirth,
+            resuscitation = resuscitation,
+            referred = referred,
+            hadBirthDefect = hadBirthDefect,
+            birthDefect = birthDefect,
+            otherDefect = otherDefect,
+            weight = weight ?: 0.0,
+            breastFeedingStarted = breastFeedingStarted,
+            opv0Dose = getIsoDateTimeStringFromLong(opv0Dose),
+            bcgDose = getIsoDateTimeStringFromLong(bcgDose),
+            hepBDose = getIsoDateTimeStringFromLong(hepBDose),
+            vitkDose = getIsoDateTimeStringFromLong(vitkDose),
+            createdDate = getIsoDateTimeStringFromLong(createdDate),
+            createdBy = createdBy,
+            updatedDate = getIsoDateTimeStringFromLong(updatedDate),
+            updatedBy = updatedBy
+        )
+    }
+
+    private fun mapGender(genderID: Int?): String? {
+        return when (genderID) {
+            1 -> Gender.MALE.name
+            2 -> Gender.FEMALE.name
+            3 -> Gender.TRANSGENDER.name
+            else -> null
+        }
+    }
+
+    private fun InfantRegWithPatient.toInfantRegDomain(): InfantRegDomain {
+        val fallbackDelivery = DeliveryOutcomeCache(
+            patientID = motherPatient.patientID,
+            isActive = true,
+            dateOfDelivery = infant.createdDate,
+            createdBy = infant.createdBy,
+            updatedBy = infant.updatedBy,
+            syncState = infant.syncState
+        )
+        return InfantRegDomain(
+            motherPatient = motherPatient,
+            babyIndex = infant.babyIndex,
+            deliveryOutcome = fallbackDelivery,
+            savedIr = infant
+        )
+    }
+
+    private fun InfantRegApiPost.toCacheModel(
+        motherPatientID: String,
+        childPatientID: String?
+    ): InfantRegCache {
+        val genderID = when (gender?.trim()?.lowercase(Locale.ENGLISH)) {
+            "male" -> 1
+            "female" -> 2
+            "transgender" -> 3
+            else -> null
+        }
+        return InfantRegCache(
+            id = id,
+            motherPatientID = motherPatientID,
+            childPatientID = childPatientID,
+            isActive = isActive,
+            babyName = babyName,
+            babyIndex = babyIndex,
+            infantTerm = infantTerm,
+            corticosteroidGiven = corticosteroidGiven,
+            genderID = genderID,
+            babyCriedAtBirth = babyCriedAtBirth,
+            resuscitation = resuscitation,
+            referred = referred,
+            hadBirthDefect = hadBirthDefect,
+            birthDefect = birthDefect,
+            otherDefect = otherDefect,
+            weight = weight,
+            breastFeedingStarted = breastFeedingStarted,
+            opv0Dose = org.piramalswasthya.cho.network.getLongFromDate(opv0Dose),
+            bcgDose = org.piramalswasthya.cho.network.getLongFromDate(bcgDose),
+            hepBDose = org.piramalswasthya.cho.network.getLongFromDate(hepBDose),
+            vitkDose = org.piramalswasthya.cho.network.getLongFromDate(vitkDose),
+            outcomeAtBirth = outcomeAtBirth,
+            typeOfResuscitation = typeOfResuscitation,
+            newbornComplications = newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby,
+            causeOfDeath = causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued,
+            processed = "P",
+            createdBy = createdBy ?: "system",
+            createdDate = org.piramalswasthya.cho.network.getLongFromDate(createdDate),
+            updatedBy = updatedBy ?: (createdBy ?: "system"),
+            updatedDate = org.piramalswasthya.cho.network.getLongFromDate(updatedDate),
+            syncState = SyncState.SYNCED
+        )
+    }
+
+    private fun extractInfantDataArray(root: JSONObject): JSONArray {
+        // Try strict path first for current contracts.
+        val dataNode = root.opt("data")
+        if (dataNode is JSONArray) return dataNode
+        if (dataNode is String) {
+            parseJsonArrayFromString(dataNode)?.let { return it }
+            parseJsonObjectFromString(dataNode)?.let { obj ->
+                val nested = extractInfantDataArray(JSONObject().put("data", obj))
+                if (nested.length() > 0) return nested
+            }
+        }
+        if (dataNode is JSONObject) {
+            val keys = listOf("data", "response", "records", "content", "list", "items")
+            for (key in keys) {
+                val arr = dataNode.optJSONArray(key)
+                if (arr != null) return arr
+                val text = dataNode.optString(key, "")
+                parseJsonArrayFromString(text)?.let { return it }
+            }
+        }
+        // Fallback: recursively scan full response for first JSON array payload.
+        findFirstJsonArray(root)?.let { return it }
+        return JSONArray()
+    }
+
+    private fun extractInfantItemObject(dataArray: JSONArray, index: Int): JSONObject? {
+        val direct = dataArray.optJSONObject(index)
+        if (direct != null) return direct
+
+        val raw = dataArray.opt(index)
+        if (raw is String) {
+            parseJsonObjectFromString(raw)?.let { return it }
+        }
+        return null
+    }
+
+    private fun normalizeInfantPayload(source: JSONObject): JSONObject {
+        val target = JSONObject(source.toString())
+
+        if (!target.has("benId") || target.optLong("benId", 0L) <= 0L) {
+            firstPositiveLong(
+                source,
+                "beneficiaryID", "beneficiaryId", "beneficiaryid", "benID", "benid",
+                "motherBenId", "motherBeneficiaryID", "motherBeneficiaryId"
+            )?.let { target.put("benId", it) }
+        }
+
+        if (!target.has("childBenId") || target.optLong("childBenId", 0L) < 0L) {
+            firstPositiveLong(
+                source,
+                "childBeneficiaryID", "childBeneficiaryId", "childbeneficiaryid",
+                "childBenID", "childBenId", "childID", "childId"
+            )?.let { target.put("childBenId", it) }
+        }
+
+        if (!target.has("babyIndex")) {
+            firstNonNegativeInt(source, "babyNo", "babyNumber", "childIndex", "index")
+                ?.let { target.put("babyIndex", it) }
+        }
+
+        return target
+    }
+
+    private fun normalizeChildPayload(source: JSONObject): JSONObject {
+        val target = JSONObject(source.toString())
+        if (!target.has("benId") || target.optLong("benId", 0L) <= 0L) {
+            firstPositiveLong(
+                source,
+                "beneficiaryID", "beneficiaryId", "beneficiaryid", "benID", "benid",
+                "motherBenId", "motherBeneficiaryID", "motherBeneficiaryId"
+            )?.let { target.put("benId", it) }
+        }
+        return target
+    }
+
+    private fun resolveChildRecord(
+        existingRegs: List<InfantRegCache>,
+        child: ChildApiPost
+    ): InfantRegCache? {
+        existingRegs.firstOrNull { child.id > 0L && it.id == child.id }?.let { return it }
+        existingRegs.firstOrNull {
+            val localName = it.babyName?.trim().orEmpty()
+            val serverName = child.babyName?.trim().orEmpty()
+            localName.isNotBlank() && serverName.isNotBlank() && localName.equals(serverName, ignoreCase = true)
+        }?.let { return it }
+        return existingRegs.firstOrNull { !it.hasRegistrationData() }
+    }
+
+    private fun mergeChildDownsync(
+        existing: InfantRegCache?,
+        motherPatientID: String,
+        child: ChildApiPost,
+        babyIndex: Int,
+        userName: String
+    ): InfantRegCache {
+        val now = System.currentTimeMillis()
+        val incoming = InfantRegCache(
+            id = child.id,
+            childPatientID = existing?.childPatientID,
+            motherPatientID = motherPatientID,
+            isActive = true,
+            babyName = child.babyName ?: existing?.babyName,
+            babyIndex = babyIndex,
+            infantTerm = child.infantTerm ?: existing?.infantTerm,
+            corticosteroidGiven = child.corticosteroidGiven ?: existing?.corticosteroidGiven,
+            genderID = when (child.gender?.trim()?.lowercase(Locale.ENGLISH)) {
+                "male" -> 1
+                "female" -> 2
+                "transgender" -> 3
+                else -> existing?.genderID
+            },
+            babyCriedAtBirth = child.babyCriedAtBirth ?: existing?.babyCriedAtBirth,
+            resuscitation = child.resuscitation ?: existing?.resuscitation,
+            referred = child.referred ?: existing?.referred,
+            hadBirthDefect = child.hadBirthDefect ?: existing?.hadBirthDefect,
+            birthDefect = child.birthDefect ?: existing?.birthDefect,
+            otherDefect = child.otherDefect ?: existing?.otherDefect,
+            weight = child.weight.takeIf { it != 0.0 } ?: existing?.weight,
+            breastFeedingStarted = child.breastFeedingStarted ?: existing?.breastFeedingStarted,
+            opv0Dose = org.piramalswasthya.cho.network.getLongFromDate(child.opv0Dose) ?: existing?.opv0Dose,
+            bcgDose = org.piramalswasthya.cho.network.getLongFromDate(child.bcgDose) ?: existing?.bcgDose,
+            hepBDose = org.piramalswasthya.cho.network.getLongFromDate(child.hepBDose) ?: existing?.hepBDose,
+            vitkDose = org.piramalswasthya.cho.network.getLongFromDate(child.vitkDose) ?: existing?.vitkDose,
+            outcomeAtBirth = existing?.outcomeAtBirth,
+            typeOfResuscitation = existing?.typeOfResuscitation,
+            newbornComplications = existing?.newbornComplications,
+            currentStatusOfBaby = existing?.currentStatusOfBaby,
+            causeOfDeath = existing?.causeOfDeath,
+            otherCauseOfDeath = existing?.otherCauseOfDeath,
+            birthDoseVaccinesGiven = existing?.birthDoseVaccinesGiven,
+            reasonForNoVaccines = existing?.reasonForNoVaccines,
+            vitaminKInjectionGiven = existing?.vitaminKInjectionGiven,
+            reasonForNoVitaminK = existing?.reasonForNoVitaminK,
+            birthCertificateIssued = existing?.birthCertificateIssued,
+            processed = "C",
+            createdBy = child.createdBy ?: existing?.createdBy ?: userName,
+            createdDate = org.piramalswasthya.cho.network.getLongFromDate(child.createdDate)
+                ?: existing?.createdDate
+                ?: now,
+            updatedBy = child.updatedBy ?: existing?.updatedBy ?: userName,
+            updatedDate = org.piramalswasthya.cho.network.getLongFromDate(child.updatedDate)
+                ?: now,
+            syncState = SyncState.SYNCED
+        )
+
+        return if (existing != null) {
+            incoming.copy(id = existing.id)
+        } else {
+            incoming.copy(id = 0)
+        }
+    }
+
+    private fun firstPositiveLong(source: JSONObject, vararg keys: String): Long? {
+        // Direct key lookup.
+        for (key in keys) {
+            val value = source.optLong(key, 0L)
+            if (value > 0L) return value
+            source.optString(key, "").trim().toLongOrNull()?.takeIf { it > 0L }?.let { return it }
+        }
+        // Case-insensitive fallback.
+        val lowerKeyMap = mutableMapOf<String, String>()
+        val iterator = source.keys()
+        while (iterator.hasNext()) {
+            val realKey = iterator.next()
+            lowerKeyMap[realKey.lowercase(Locale.ENGLISH)] = realKey
+        }
+        for (key in keys) {
+            val realKey = lowerKeyMap[key.lowercase(Locale.ENGLISH)] ?: continue
+            val value = source.optLong(realKey, 0L)
+            if (value > 0L) return value
+            source.optString(realKey, "").trim().toLongOrNull()?.takeIf { it > 0L }?.let { return it }
+        }
+        return null
+    }
+
+    private fun firstNonNegativeInt(source: JSONObject, vararg keys: String): Int? {
+        for (key in keys) {
+            if (!source.has(key)) continue
+            val value = source.optInt(key, Int.MIN_VALUE)
+            if (value != Int.MIN_VALUE && value >= 0) return value
+            source.optString(key, "").trim().toIntOrNull()?.takeIf { it >= 0 }?.let { return it }
+        }
+        return null
+    }
+
+    private fun parseJsonArrayFromString(value: String?): JSONArray? {
+        val trimmed = value?.trim().orEmpty()
+        if (trimmed.isEmpty() || !trimmed.startsWith("[")) return null
+        return runCatching { JSONArray(trimmed) }.getOrNull()
+    }
+
+    private fun parseJsonObjectFromString(value: String?): JSONObject? {
+        val trimmed = value?.trim().orEmpty()
+        if (trimmed.isEmpty() || !trimmed.startsWith("{")) return null
+        return runCatching { JSONObject(trimmed) }.getOrNull()
+    }
+
+    private fun findFirstJsonArray(node: Any?): JSONArray? {
+        when (node) {
+            is JSONArray -> {
+                if (node.length() > 0) return node
+            }
+            is JSONObject -> {
+                val iterator = node.keys()
+                while (iterator.hasNext()) {
+                    val key = iterator.next()
+                    val child = node.opt(key)
+                    if (child is JSONArray && child.length() > 0) return child
+                    if (child is JSONObject) {
+                        findFirstJsonArray(child)?.let { return it }
+                    } else if (child is String) {
+                        parseJsonArrayFromString(child)?.let { if (it.length() > 0) return it }
+                        parseJsonObjectFromString(child)?.let { obj ->
+                            findFirstJsonArray(obj)?.let { return it }
+                        }
+                    }
+                }
+            }
+            is String -> {
+                parseJsonArrayFromString(node)?.let { if (it.length() > 0) return it }
+                parseJsonObjectFromString(node)?.let { obj ->
+                    findFirstJsonArray(obj)?.let { return it }
+                }
+            }
+        }
+        return null
+    }
+
+    /**
+     * Ensures INFANT_REG downsync can be saved even when mother is not yet present in PATIENT.
+     * Creates a lightweight local placeholder mother record keyed by beneficiaryID.
+     */
+    private suspend fun ensureMotherPlaceholderForInfant(
+        benId: Long
+    ): Patient? {
+        if (benId <= 0L) return null
+        val existing = patientDao.getPatientByAnyBeneficiaryId(benId)
+        if (existing != null) return existing
+
+        val placeholderPatientId = "infant-mother-$benId"
+        val now = Date()
+        val placeholder = Patient(
+            patientID = placeholderPatientId,
+            firstName = "Mother",
+            lastName = benId.toString(),
+            dob = null,
+            age = null,
+            ageUnitID = null,
+            maritalStatusID = null,
+            spouseName = null,
+            ageAtMarriage = null,
+            phoneNo = null,
+            genderID = null,
+            registrationDate = now,
+            stateID = null,
+            districtID = null,
+            blockID = null,
+            districtBranchID = null,
+            communityID = null,
+            religionID = null,
+            parentName = null,
+            syncState = SyncState.SYNCED,
+            beneficiaryID = benId,
+            beneficiaryRegID = null,
+            benImage = null,
+            statusOfWomanID = null,
+            isNewAbha = false,
+            healthIdDetails = null,
+            labTechnicianFlag = 0,
+            faceEmbedding = null
+        )
+
+        return runCatching {
+            patientDao.insertPatient(placeholder)
+            patientDao.getPatient(placeholderPatientId)
+        }.onFailure { err ->
+            Timber.w(err, "Unable to create mother placeholder for infant benId=$benId")
+        }.getOrNull()
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/LanguageRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/LanguageRepo.kt
index cd1505829..c5dd4a4c0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/LanguageRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/LanguageRepo.kt
@@ -30,13 +30,12 @@ class LanguageRepo @Inject constructor(
         }
     }
     suspend fun saveResponseToCacheLang() {
-        languageService().forEach { language: Language ->
+        val languages = languageService()
+        if (languages.isNotEmpty()) {
             withContext(Dispatchers.IO) {
-                languageDao.insertAllLanguages(language)
+                languageDao.insertLanguages(languages)
             }
-            Timber.tag("itemLang").d(language.toString())
         }
-
     }
 
     suspend fun getCachedResponseLang(): List<Language> {
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/MaleMasterDataRepository.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/MaleMasterDataRepository.kt
index 74aee3356..70ca22d9b 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/MaleMasterDataRepository.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/MaleMasterDataRepository.kt
@@ -14,6 +14,7 @@ import org.json.JSONObject
 import org.piramalswasthya.cho.database.converters.MasterDataListConverter
 import org.piramalswasthya.cho.database.room.dao.ChiefComplaintMasterDao
 import org.piramalswasthya.cho.database.room.dao.HistoryDao
+import org.piramalswasthya.cho.database.room.dao.ProcedureMasterDao
 import org.piramalswasthya.cho.database.room.dao.SubCatVisitDao
 import org.piramalswasthya.cho.database.room.dao.UserDao
 import org.piramalswasthya.cho.model.AlcoholDropdown
@@ -44,6 +45,7 @@ class MaleMasterDataRepository @Inject constructor(
     private val chiefComplaintMasterDao: ChiefComplaintMasterDao,
     private val subCatVisitDao: SubCatVisitDao,
     private val historyDao: HistoryDao,
+    private val procedureMasterDao: ProcedureMasterDao,
     private val userRepo: UserRepo,
     private val userDao: UserDao,
 ) {
@@ -309,9 +311,18 @@ class MaleMasterDataRepository @Inject constructor(
         return chiefComplaintMasterDao.getChiefCompMasterMap().associate {
             it.chiefComplaintID to it.chiefComplaint}
     }
-    suspend fun getProcedureTypeByNameMap():Map<Int,String>{
-        return historyDao.getProceduresMap().associate {
-            it.procedureID to it.procedureName
+    /**
+     * Returns procedure ID -> name for doctor's lab test dropdown.
+     * Uses procedure_master first (so IDs match lab record form); falls back to Procedures_Master_Data if empty.
+     */
+    suspend fun getProcedureTypeByNameMap(): Map<Int, String> {
+        val fromProcedureMaster = procedureMasterDao.getAllProcedures()
+        return if (fromProcedureMaster.isNotEmpty()) {
+            fromProcedureMaster.associate { it.procedureID.toInt() to it.procedureName }
+        } else {
+            historyDao.getProceduresMap().associate {
+                it.procedureID to it.procedureName
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/MaternalHealthRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/MaternalHealthRepo.kt
index dc24fc110..2a082f26f 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/MaternalHealthRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/MaternalHealthRepo.kt
@@ -1,26 +1,47 @@
 package org.piramalswasthya.cho.repositories
 
+import android.content.Context
+import android.icu.util.Calendar
 import android.util.Log
-import androidx.lifecycle.LiveData
 import com.google.gson.Gson
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.withContext
+import okhttp3.ResponseBody
+import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.room.InAppDb
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.AshaDueListCache
+//import org.piramalswasthya.cho.database.room.InAppDb
+//import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.AbortionDomain
+import org.piramalswasthya.cho.model.PatientWithPwrCache
+import org.piramalswasthya.cho.model.PmsmaDomain
+import org.piramalswasthya.cho.model.asPmsmaDomainModel
 import org.piramalswasthya.cho.model.PregnantWomanAncCache
 import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
 import org.piramalswasthya.cho.network.AmritApiService
+import org.piramalswasthya.cho.network.VillageIdList
+import org.piramalswasthya.cho.network.getLongFromDate
 import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.AshaDueListDao
 import org.piramalswasthya.cho.database.room.dao.MaternalHealthDao
 import org.piramalswasthya.cho.database.room.dao.PatientDao
 //import org.piramalswasthya.sakhi.database.room.dao.BenDao
 //import org.piramalswasthya.sakhi.database.room.dao.MaternalHealthDao
 import org.piramalswasthya.cho.helpers.Konstants
+import org.piramalswasthya.cho.helpers.getTodayMillis
+import org.piramalswasthya.cho.helpers.getWeeksOfPregnancy
 import org.piramalswasthya.cho.model.ANCPost
+import org.piramalswasthya.cho.model.AncCompletedListItem
+import org.piramalswasthya.cho.model.AncDueListItem
+import org.piramalswasthya.cho.model.PwrPost
 //import org.piramalswasthya.sakhi.helpers.getTodayMillis
 //import org.piramalswasthya.sakhi.model.*
 //import org.piramalswasthya.sakhi.network.GetDataPaginatedRequest
@@ -28,14 +49,25 @@ import org.piramalswasthya.cho.model.ANCPost
 import timber.log.Timber
 import java.io.IOException
 import java.net.SocketTimeoutException
-import java.text.SimpleDateFormat
-import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import retrofit2.Response
+
+/** Outcome of an upload attempt for one record. */
+private sealed class AncUploadResult {
+    object Success : AncUploadResult()
+    /** Recoverable failure (network blip, 5xx, token refresh): worth retrying next cycle. */
+    object Transient : AncUploadResult()
+    /** Server rejected the payload itself (e.g. statusCode 5000 "Saving anc data to db failed").
+     *  Retrying the same body forever just wastes cycles — caller should park the row. */
+    data class Terminal(val message: String) : AncUploadResult()
+}
 
 class MaternalHealthRepo @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val amritApiService: AmritApiService,
     private val maternalHealthDao: MaternalHealthDao,
+    private val ashaDueListDao: AshaDueListDao,
     private val database: InAppDb,
     private val userRepo: UserRepo,
     private val patientDao: PatientDao,
@@ -46,6 +78,10 @@ class MaternalHealthRepo @Inject constructor(
         return maternalHealthDao.getSavedRecord(benId)
     }
 
+    suspend fun getLatestRegistrationRecord(benId: String): PregnantWomanRegistrationCache? {
+        return maternalHealthDao.getLatestRegistrationRecord(benId)
+    }
+
 
 
     suspend fun getActiveRegistrationRecord(benId: String): PregnantWomanRegistrationCache? {
@@ -53,7 +89,6 @@ class MaternalHealthRepo @Inject constructor(
             maternalHealthDao.getSavedActiveRecord(benId)
         }
     }
-//
 
     suspend fun getLastVisitNumber(benId: String): Int? {
         return maternalHealthDao.getLastVisitNumber(benId)
@@ -65,29 +100,82 @@ class MaternalHealthRepo @Inject constructor(
         }
     }
 
-
-//
-//    suspend fun getLatestAncRecord(benId: Long): PregnantWomanAncCache? {
-//        return withContext(Dispatchers.IO) {
-//            maternalHealthDao.getLatestAnc(benId)
-//        }
-//    }
-//
     suspend fun getAllActiveAncRecords(benId: String): List<PregnantWomanAncCache> {
          return maternalHealthDao.getAllActiveAncRecords(benId)
     }
 
+    suspend fun getCompletedActiveAncRecords(benId: String): List<PregnantWomanAncCache> {
+        return maternalHealthDao.getCompletedActiveAncRecords(benId)
+    }
+
     suspend fun getLastAnc(benId: String): PregnantWomanAncCache? {
         return maternalHealthDao.getLastAnc(benId)
     }
 
+    suspend fun getLastCompletedAnc(benId: String): PregnantWomanAncCache? {
+        return maternalHealthDao.getLastCompletedAnc(benId)
+    }
+
     suspend fun persistRegisterRecord(pregnancyRegistrationForm: PregnantWomanRegistrationCache) {
         withContext(Dispatchers.IO) {
             maternalHealthDao.saveRecord(pregnancyRegistrationForm)
+            generateAndPersistAncSchedule(pregnancyRegistrationForm)
         }
     }
 
 
+    suspend fun registerPregnancyWithAncAndAshaDueList(
+        pwr: PregnantWomanRegistrationCache,
+        benId: String,
+        ashaId: Int
+    ): Long = withContext(Dispatchers.IO) {
+        val registrationId = maternalHealthDao.saveRecord(pwr)
+        generateAndPersistAncSchedule(pwr)
+        addBeneficiaryToAshaDueList(benId, ashaId, pwr.createdBy)
+        registrationId
+    }
+
+    private suspend fun addBeneficiaryToAshaDueList(patientID: String, ashaId: Int, createdBy: String) {
+        val patient = patientDao.getPatient(patientID)
+        val beneficiaryID = patient?.beneficiaryID
+        val record = AshaDueListCache(
+            patientID = patientID,
+            beneficiaryID = beneficiaryID,
+            listType = "ANC",
+            addedDate = System.currentTimeMillis(),
+            ashaId = ashaId,
+            createdBy = createdBy,
+            syncState = SyncState.UNSYNCED
+        )
+        ashaDueListDao.insert(record)
+    }
+
+
+    private suspend fun generateAndPersistAncSchedule(pwr: PregnantWomanRegistrationCache) {
+        if (maternalHealthDao.getLastActiveVisitNumber(pwr.patientID) != null) return
+        val cal = Calendar.getInstance().apply {
+            timeInMillis = pwr.lmpDate
+            set(Calendar.HOUR_OF_DAY, 0)
+            set(Calendar.MINUTE, 0)
+            set(Calendar.SECOND, 0)
+            set(Calendar.MILLISECOND, 0)
+        }
+        val lmpStartOfDayMillis = cal.timeInMillis
+        val ancScheduleDaysFromLmp = listOf(84,98,196,252)
+        ancScheduleDaysFromLmp.forEachIndexed { index, days ->
+            val scheduledDateMillis = lmpStartOfDayMillis + TimeUnit.DAYS.toMillis(days.toLong())
+            val ancCache = PregnantWomanAncCache(
+                patientID = pwr.patientID,
+                visitNumber = index + 1,
+                ancDate = scheduledDateMillis,
+                isActive = true,
+                createdBy = pwr.createdBy,
+                updatedBy = pwr.updatedBy,
+                syncState = SyncState.UNSYNCED
+            )
+            maternalHealthDao.saveRecord(ancCache)
+        }
+    }
 
     suspend fun persistAncRecord(ancCache: PregnantWomanAncCache) {
         withContext(Dispatchers.IO) {
@@ -101,95 +189,694 @@ class MaternalHealthRepo @Inject constructor(
         }
     }
 
+    suspend fun updatePwr(pwr: PregnantWomanRegistrationCache) {
+        withContext(Dispatchers.IO) {
+            maternalHealthDao.updatePwr(pwr)
+        }
+    }
+
+    /**
+     * Retire active pregnancy records when a beneficiary is marked postnatal
+     * during registration/edit so she moves off PWR/ANC lists onto PNC Mother list.
+     */
+    suspend fun retirePregnancyLifecycleForPostNatal(patientID: String) {
+        withContext(Dispatchers.IO) {
+            getSavedRegistrationRecord(patientID)?.let { pwr ->
+                if (pwr.active) {
+                    pwr.active = false
+                    pwr.syncState = SyncState.UNSYNCED
+                    maternalHealthDao.updatePwr(pwr)
+                }
+            }
+
+            val activeAnc = maternalHealthDao.getAllActiveAncRecords(patientID)
+            if (activeAnc.isNotEmpty()) {
+                activeAnc.forEach {
+                    it.pregnantWomanDelivered = true
+                    it.isActive = false
+                    it.processed = "U"
+                    it.syncState = SyncState.UNSYNCED
+                }
+                maternalHealthDao.updateANC(*activeAnc.toTypedArray())
+            }
+
+            database.ecrDao.getAllECT(patientID).forEach { ect ->
+                if (ect.isPregnant != null || ect.pregnancyTestResult != null) {
+                    ect.isPregnant = null
+                    ect.pregnancyTestResult = null
+                    if (ect.processed != "N") ect.processed = "U"
+                    ect.syncState = SyncState.UNSYNCED
+                    database.ecrDao.updateEligibleCoupleTracking(ect)
+                }
+            }
+        }
+    }
+
+    suspend fun getAncDueList(ancStage: Int): List<AncDueListItem> {
+        return withContext(Dispatchers.IO) {
+            val allPwr = maternalHealthDao.getAllActivePregnancyRegistrations()
+            val todayMillis = getTodayMillis()
+            allPwr.mapNotNull { pwr ->
+                val ancRecords = maternalHealthDao.getAllActiveAncRecords(pwr.patientID)
+                
+                // Skip if already delivered
+                if (ancRecords.any { it.pregnantWomanDelivered == true }) {
+                    return@mapNotNull null
+                }
+                
+                val gaWeeks = getWeeksOfPregnancy(todayMillis, pwr.lmpDate)
+                val isDue = isAncStageDue(ancStage, ancRecords, gaWeeks)
+                
+                if (isDue) {
+                    Timber.d("ANC Due List: Patient ${pwr.patientID} added to ANC $ancStage due list (GA: $gaWeeks weeks)")
+                    AncDueListItem(pwr.patientID, gaWeeks, ancStage)
+                } else null
+            }
+        }
+    }
+
+    private fun isAncStageDue(ancStage: Int, ancRecords: List<PregnantWomanAncCache>, gaWeeks: Int): Boolean {
+        // ANC 1-4: previous stage completed (weight IS NOT NULL) + GA in range
+        // Per Jira MHWC-196: Check if previous visit is COMPLETED, not just exists
+        return when (ancStage) {
+            1 -> {
+                // ANC 1: Pregnancy registered AND GA ≤12 weeks (≤84 days from LMP)
+                val anc1Completed = ancRecords.any { it.visitNumber == 1 && it.weight != null }
+                !anc1Completed && gaWeeks <= Konstants.maxAnc1Week
+            }
+            2 -> {
+                // ANC 2: ANC 1 completed AND GA ≥14 weeks AND <28 weeks
+                val anc1Completed = ancRecords.any { it.visitNumber == 1 && it.weight != null }
+                val anc2Completed = ancRecords.any { it.visitNumber == 2 && it.weight != null }
+                anc1Completed && !anc2Completed && gaWeeks >= Konstants.minAnc2Week && gaWeeks < 28
+            }
+            3 -> {
+                // ANC 3: ANC 2 completed AND GA ≥28 weeks AND <36 weeks
+                val anc2Completed = ancRecords.any { it.visitNumber == 2 && it.weight != null }
+                val anc3Completed = ancRecords.any { it.visitNumber == 3 && it.weight != null }
+                anc2Completed && !anc3Completed && gaWeeks >= Konstants.minAnc3Week && gaWeeks < 36
+            }
+            4 -> {
+                // ANC 4: ANC 3 completed AND GA ≥36 weeks AND ≤40 weeks
+                val anc3Completed = ancRecords.any { it.visitNumber == 3 && it.weight != null }
+                val anc4Completed = ancRecords.any { it.visitNumber == 4 && it.weight != null }
+                anc3Completed && !anc4Completed && gaWeeks >= Konstants.minAnc4Week && gaWeeks <= Konstants.maxAnc4Week
+            }
+            else -> false
+        }
+    }
+
+    suspend fun getAncCompletedList(ancStage: Int): List<AncCompletedListItem> {
+        return withContext(Dispatchers.IO) {
+            val allPwr = maternalHealthDao.getAllActivePregnancyRegistrations()
+            allPwr.mapNotNull { pwr ->
+                val ancRecords = maternalHealthDao.getAllActiveAncRecords(pwr.patientID)
+                if (ancRecords.any { it.pregnantWomanDelivered == true }) return@mapNotNull null
+                // Per Jira MHWC-196: Only include visits that are COMPLETED (weight IS NOT NULL)
+                ancRecords.find { it.visitNumber == ancStage && it.weight != null }?.let { anc ->
+                    Timber.d("ANC Completed List: Patient ${pwr.patientID} in ANC $ancStage completed list (Visit: ${anc.visitNumber})")
+                    AncCompletedListItem(pwr.patientID, ancStage, anc.visitNumber)
+                }
+            }
+        }
+    }
 
     suspend fun processNewAncVisit(): Boolean {
         return withContext(Dispatchers.IO) {
             val ancList = maternalHealthDao.getAllUnprocessedAncVisits()
+            Timber.d("ANC upload queue size: ${ancList.size}")
+            if (ancList.isEmpty()) {
+                Timber.d("No unsynced ANC records found for upload")
+                return@withContext true
+            }
 
             val ancPostList = mutableSetOf<ANCPost>()
+            val user = userRepo.getLoggedInUser()
+            var hasFailures = false
             ancList.forEach {
                 ancPostList.clear()
                 val ben = patientDao.getPatient(it.patientID)
                 if(ben.beneficiaryID != null){
-                    ancPostList.add(it.asPostModel(ben.beneficiaryID!!))
+                    ancPostList.add(
+                        it.asPostModel(
+                            benId = ben.beneficiaryID!!,
+                            benRegId = ben.beneficiaryRegID,
+                            providerServiceMapID = user?.serviceMapId,
+                            context = context,
+                        )
+                    )
                     it.syncState = SyncState.SYNCING
                     maternalHealthDao.updateANC(it)
-                    val uploadDone = postDataToAmritServer(ancPostList)
-                    if (uploadDone) {
-                        it.processed = "P"
-                        it.syncState = SyncState.SYNCED
-                    } else {
-                        it.syncState = SyncState.UNSYNCED
+                    Timber.d("processNewAncVisit: posting row id=${it.id} patientID=${it.patientID}")
+                    when (val result = postDataToAmritServer(ancPostList)) {
+                        AncUploadResult.Success -> {
+                            // Targeted column update — avoids writing the whole
+                            // row (which would persist any stale field still on
+                            // `it`) and is robust against parallel writers in
+                            // the same sync chain.
+                            maternalHealthDao.markAncSynced(it.id)
+                            Timber.d("processNewAncVisit: row id=${it.id} marked SYNCED")
+                        }
+                        is AncUploadResult.Terminal -> {
+                            // Park the row: getAllUnprocessedAncVisits filters on
+                            // processed IN ('N','U'), so "F" stops the retry loop.
+                            // A subsequent edit resets processed to 'U' and the row
+                            // re-enters the queue.
+                            Timber.w("Parking ANC row ${it.id}: ${result.message}")
+                            it.processed = "F"
+                            it.syncState = SyncState.UNSYNCED
+                            maternalHealthDao.updateANC(it)
+                            hasFailures = true
+                        }
+                        AncUploadResult.Transient -> {
+                            it.syncState = SyncState.UNSYNCED
+                            maternalHealthDao.updateANC(it)
+                            hasFailures = true
+                        }
                     }
-                    maternalHealthDao.updateANC(it)
-//                if (!uploadDone)
-//                    return@withContext false
+                } else {
+                    Timber.w("Skipping ANC upload for patient ${it.patientID}: beneficiaryID is null")
+                    hasFailures = true
+                }
+            }
+
+            return@withContext !hasFailures
+        }
+    }
+
+    suspend fun processNewPWRRecords(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val pwrList = maternalHealthDao.getAllUnprocessedPWRs()
+            if (pwrList.isEmpty()) {
+                Timber.d("No unsynced PWR records found for upload")
+                return@withContext true
+            }
+
+            var hasFailures = false
+            val pwrPostList = mutableSetOf<PwrPost>()
+
+            pwrList.forEach { pwr ->
+                pwrPostList.clear()
+                val patient = patientDao.getPatient(pwr.patientID)
+                val benId = patient.beneficiaryID
+                if (benId == null) {
+                    Timber.w("Skipping PWR upload for patient ${pwr.patientID}: beneficiaryID is null")
+                    hasFailures = true
+                    return@forEach
+                }
+
+                pwr.syncState = SyncState.SYNCING
+                maternalHealthDao.updatePwr(pwr)
+
+                pwrPostList.add(pwr.asPwrPost().copy(benId = benId))
+                val uploadDone = postPwrDataToAmritServer(pwrPostList)
+                if (uploadDone) {
+                    pwr.processed = "P"
+                    pwr.syncState = SyncState.SYNCED
+                } else {
+                    pwr.syncState = SyncState.UNSYNCED
+                    hasFailures = true
                 }
+                maternalHealthDao.updatePwr(pwr)
+            }
+
+            return@withContext !hasFailures
+        }
+    }
+
+    /**
+     * Get all patients with their pregnancy registration data
+     */
+    fun getAllPatientsWithPWR(): Flow<List<PatientWithPwrCache>> {
+        return maternalHealthDao.getAllPatientsWithPWR()
+            .combine(maternalHealthDao.getAllPatientsWithPWRFromEligibleCoupleTracking()) { pwrList, ectPositiveList ->
+                (pwrList + ectPositiveList)
+                    .distinctBy { it.patient.patientID }
+                    .sortedByDescending {
+                        it.getActiveOrLatestPwr()?.createdDate ?: it.patient.registrationDate?.time ?: 0L
+                    }
+            }
+    }
+
+    fun getAllPatientsWithANC(): Flow<List<PatientWithPwrCache>> {
+        return maternalHealthDao.getAllPatientsWithANC()
+            .combine(maternalHealthDao.getAllPatientsWithPWRFromEligibleCoupleTracking()) { pwrList, ectPositiveList ->
+                (pwrList + ectPositiveList)
+                    .distinctBy { it.patient.patientID }
+                    .sortedByDescending {
+                        it.getActiveOrLatestPwr()?.createdDate ?: it.patient.registrationDate?.time ?: 0L
+                    }
             }
+    }
+
+    /**
+     * Get specific patient with pregnancy registration
+     */
+    suspend fun getPatientWithPWR(patientID: String): PatientWithPwrCache? {
+        return withContext(Dispatchers.IO) {
+            maternalHealthDao.getPatientWithPWR(patientID)
+        }
+    }
 
-            return@withContext true
+    /**
+     * Get count of women on the Pregnant Women Registration list.
+     * Derives from the same combined Flow as PregnantWomenRegistrationFragment
+     * (PWR-side + ECT-positive catch-all) and applies the same Kotlin predicate,
+     * so the grid count and the list row count cannot drift.
+     */
+    fun getPWRCount(): Flow<Int> {
+        return getAllPatientsWithPWR().map { list ->
+            list.map { it.asDomainModel() }
+                .count { domain ->
+                    val isFemale = domain.patient.genderID == 2
+                    val age = domain.patient.age ?: 0
+                    val isReproductiveAge = age in 15..49
+                    val isPostnatal = domain.patient.statusOfWomanID == 3
+                    isFemale && isReproductiveAge && !isPostnatal
+                }
+        }
+    }
+
+    /**
+     * Get count of women eligible for ANC.
+     * Derives from the same combined Flow as ANCVisitsFragment (PWR-side + ECT-positive catch-all)
+     * and applies the same Kotlin predicate, so the grid count and the list row count cannot drift.
+     */
+    fun getANCCount(): Flow<Int> {
+        val ancEligibilityWindowMillis = 35L * 24 * 60 * 60 * 1000
+        return getAllPatientsWithANC().map { list ->
+            val now = System.currentTimeMillis()
+            val cutoff = now - ancEligibilityWindowMillis
+            list.map { it.asDomainModel() }
+                .count { domain ->
+                    val hasActivePWR = domain.pwr != null && domain.isActive()
+                    val isFemale = domain.patient.genderID == 2
+                    val age = domain.patient.age ?: 0
+                    val isReproductiveAge = age in 15..49
+                    val isEligibleForANC = domain.pwr?.lmpDate?.let { lmp ->
+                        lmp <= cutoff
+                    } ?: false
+                    hasActivePWR && isFemale && isReproductiveAge && isEligibleForANC
+                }
         }
     }
 
-    private suspend fun postDataToAmritServer(ancPostList: MutableSet<ANCPost>): Boolean {
-        if (ancPostList.isEmpty()) return false
+    /**
+     * Get all patients who have delivered
+     * Uses batch query to avoid N+1 queries
+     */
+    fun getAllDeliveredWomen(): Flow<List<PatientWithPwrCache>> {
+        return maternalHealthDao.getDeliveredWomenPatientIDs()
+            .transformLatest { patientIDs ->
+                if (patientIDs.isNotEmpty()) {
+                    val patients = maternalHealthDao.getDeliveredWomenByIDs(patientIDs)
+                    emit(patients)
+                } else {
+                    emit(emptyList())
+                }
+            }
+    }
+
+    /**
+     * Get count of delivered women
+     */
+    fun getDeliveredWomenCount(): Flow<Int> {
+        return maternalHealthDao.getDeliveredWomenCount()
+    }
+
+    /**
+     * Get all women with abortion records
+     */
+    fun getAbortionPregnantWomanList(): Flow<List<AbortionDomain>> {
+        return maternalHealthDao.getAllAbortionWomenList()
+            .map { list ->
+                list.map { it.asAbortionDomainModel() }
+                    .filter { it.abortionDate != null } // Ensure abortion date exists
+            }
+    }
+
+    /**
+     * Get count of abortion women
+     */
+    fun getAbortionWomenCount(): Flow<Int> {
+        return maternalHealthDao.getAllAbortionWomenCount()
+    }
+
+    /**
+     * Get all women registered for pregnancy (eligible for PMSMA)
+     */
+    fun getRegisteredPmsmaWomenList(): Flow<List<PmsmaDomain>> {
+        return maternalHealthDao.getAllRegisteredPmsmaWomenList()
+            .map { list -> list.map { it.asPmsmaDomainModel() } }
+    }
+
+    /**
+     * Get count of PMSMA eligible women
+     */
+    fun getRegisteredPmsmaWomenCount(): Flow<Int> {
+        return maternalHealthDao.getAllRegisteredPmsmaWomenCount()
+    }
+
+    /**
+     * Get e-PMSMA women — the subset of ANC-eligible women who have at least one
+     * active ANC visit flagged anyHighRisk = true.
+     *
+     * Derived from the same Flow as ANCVisitsFragment / getANCCount and intersected
+     * with the high-risk patientID set, so the e-PMSMA list cannot drift from the
+     * ANC tile.
+     */
+    fun getEPmsmaWomenList(): Flow<List<PmsmaDomain>> {
+        val ancEligibilityWindowMillis = 35L * 24 * 60 * 60 * 1000
+        return getAllPatientsWithANC()
+            .combine(maternalHealthDao.getHighRiskAncPatientIDs()) { patientList, hrIds ->
+                val cutoff = System.currentTimeMillis() - ancEligibilityWindowMillis
+                val hrSet = hrIds.toHashSet()
+                patientList
+                    .filter { hrSet.contains(it.patient.patientID) }
+                    .filter { p ->
+                        val domain = p.asDomainModel()
+                        val hasActivePWR = domain.pwr != null && domain.isActive()
+                        val isFemale = domain.patient.genderID == 2
+                        val age = domain.patient.age ?: 0
+                        val isReproductiveAge = age in 15..49
+                        val isEligibleForANC =
+                            domain.pwr?.lmpDate?.let { lmp -> lmp <= cutoff } ?: false
+                        hasActivePWR && isFemale && isReproductiveAge && isEligibleForANC
+                    }
+                    .map { it.asPmsmaDomainModel() }
+                    .sortedByDescending { it.pwr?.dateOfRegistration ?: 0L }
+            }
+    }
+
+    /**
+     * Count of e-PMSMA women. Derived from getEPmsmaWomenList so the tile count
+     * and list row count cannot drift.
+     */
+    fun getEPmsmaWomenCount(): Flow<Int> = getEPmsmaWomenList().map { it.size }
+
+    /**
+     * Get all women eligible for neonatal outcome (those with a saved delivery outcome)
+     */
+    fun getNeonatalOutcomeEligibleWomen(): Flow<List<PatientWithPwrCache>> {
+        return maternalHealthDao.getNeonatalOutcomeEligibleWomenPatientIDs()
+            .transformLatest { patientIDs ->
+                if (patientIDs.isNotEmpty()) {
+                    val patients = maternalHealthDao.getDeliveredWomenByIDs(patientIDs)
+                    emit(patients)
+                } else {
+                    emit(emptyList())
+                }
+            }
+    }
+
+    /**
+     * Get patientIDs of women who have a saved delivery outcome
+     */
+    fun getNeonatalOutcomeEligibleWomenPatientIDs(): Flow<List<String>> {
+        return maternalHealthDao.getNeonatalOutcomeEligibleWomenPatientIDs()
+    }
+
+    /**
+     * Get count of women eligible for neonatal outcome
+     */
+    fun getNeonatalOutcomeEligibleWomenCount(): Flow<Int> {
+        return maternalHealthDao.getNeonatalOutcomeEligibleWomenCount()
+    }
+
+    private suspend fun postDataToAmritServer(ancPostList: MutableSet<ANCPost>): AncUploadResult {
+        if (ancPostList.isEmpty()) return AncUploadResult.Transient
         val user =
             userRepo.getLoggedInUser()
                 ?: throw IllegalStateException("No user logged in!!")
 
-        try {
+        // Bounded retry: recursion + non-local control flow via thrown
+        // SocketTimeoutException could spin forever (and eventually overflow
+        // the stack) when the server is persistently issuing 5002 or the
+        // network is permanently flaky. After MAX_ANC_UPLOAD_ATTEMPTS we
+        // yield to WorkManager — its outer backoff is the right place to
+        // delay further attempts.
+        repeat(MAX_ANC_UPLOAD_ATTEMPTS) { attempt ->
+            try {
+                val response = amritApiService.postAncForm(ancPostList.toList())
+                val httpCode = response.code()
+                if (httpCode != 200) {
+                    Timber.w("ANC saveAll bad HTTP code=$httpCode (attempt ${attempt + 1})")
+                    return AncUploadResult.Transient
+                }
 
-            val response = amritApiService.postAncForm(ancPostList.toList())
-            val statusCode = response.code()
+                val responseString = response.body()?.string()
+                Timber.d("ANC saveAll response body: ${responseString?.take(300)}")
+                if (responseString.isNullOrBlank()) {
+                    Timber.d("ANC saveAll succeeded with empty response body")
+                    return AncUploadResult.Success
+                }
 
-            if (statusCode == 200) {
-                try {
-                    val responseString = response.body()?.string()
-                    if (responseString != null) {
-                        val jsonObj = JSONObject(responseString)
-
-                        val errormessage = jsonObj.getString("errorMessage")
-                        if (jsonObj.isNull("statusCode")) throw IllegalStateException("Amrit server not responding properly, Contact Service Administrator!!")
-                        val responsestatuscode = jsonObj.getInt("statusCode")
-
-                        when (responsestatuscode) {
-                            200 -> {
-                                Timber.d("Saved Successfully to server")
-                                return true
-                            }
+                val jsonObj = try {
+                    JSONObject(responseString)
+                } catch (e: Exception) {
+                    Timber.w(e, "ANC saveAll non-JSON body, treating as success: $responseString")
+                    return AncUploadResult.Success
+                }
 
-                            5002 -> {
-                                if (userRepo.refreshTokenTmc(
-                                        user.userName,
-                                        user.password
-                                    )
-                                ) throw SocketTimeoutException()
-                            }
+                val statusCode = jsonObj.optInt("statusCode", 200)
+                val errorMessage = jsonObj.optString("errorMessage")
+
+                when (statusCode) {
+                    200 -> {
+                        Timber.d("ANC saved successfully to server")
+                        return AncUploadResult.Success
+                    }
+                    5002 -> {
+                        Timber.d("ANC saveAll got 5002; refreshing token (attempt ${attempt + 1})")
+                        if (!userRepo.refreshTokenTmc(user.userName, user.password)) {
+                            Timber.w("Token refresh failed")
+                            return AncUploadResult.Transient
+                        }
+                        // Token refreshed — fall through to next loop iteration.
+                        return@repeat
+                    }
+                    // 5000 = server-side persistence failure — usually a payload
+                    // the server refuses to accept (e.g. oversized base64 image).
+                    // Retrying the same body just loops forever, so we mark it
+                    // terminal and park the row until the user edits / re-saves.
+                    5000 -> {
+                        Log.d("anc error message", errorMessage)
+                        Timber.w("ANC saveAll permanently rejected (5000): $errorMessage")
+                        return AncUploadResult.Terminal(errorMessage)
+                    }
+                    else -> {
+                        Log.d("anc error message", errorMessage)
+                        Timber.w("ANC saveAll server error $statusCode: $errorMessage")
+                        return AncUploadResult.Transient
+                    }
+                }
+            } catch (e: SocketTimeoutException) {
+                Timber.d("ANC saveAll timed out (attempt ${attempt + 1}); retrying")
+                // Fall through to next iteration.
+            } catch (e: JSONException) {
+                Timber.d("ANC saveAll JSON parse error: $e")
+                return AncUploadResult.Transient
+            }
+        }
+
+        Timber.w("ANC saveAll exhausted $MAX_ANC_UPLOAD_ATTEMPTS attempts; deferring to next sync cycle")
+        return AncUploadResult.Transient
+    }
+
+    private companion object {
+        private const val MAX_ANC_UPLOAD_ATTEMPTS = 3
+    }
 
-                            else -> {
-                                Log.d("anc error message", errormessage)
-                                throw IOException("Throwing away IO eXcEpTiOn")
+    private suspend fun postPwrDataToAmritServer(pwrPostList: MutableSet<PwrPost>): Boolean {
+        if (pwrPostList.isEmpty()) return false
+        val user = userRepo.getLoggedInUser()
+            ?: throw IllegalStateException("No user logged in!!")
+        try {
+            val response = amritApiService.postPregnantWomanForm(pwrPostList.toList())
+            val statusCode = response.code()
+            if (statusCode == 200) {
+                val responseString = response.body()?.string()
+                if (responseString != null) {
+                    val jsonObj = JSONObject(responseString)
+                    val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                    val errorMessage = jsonObj.optString("errorMessage")
+                    when (responseStatusCode) {
+                        200 -> {
+                            Timber.d("PWR saved successfully to server")
+                            return true
+                        }
+                        5002 -> {
+                            if (userRepo.refreshTokenTmc(user.userName, user.password)) {
+                                throw SocketTimeoutException()
                             }
                         }
+                        else -> {
+                            Timber.w("PWR saveAll failed: $errorMessage")
+                            throw IOException("PWR saveAll failed with statusCode=$responseStatusCode")
+                        }
                     }
-                } catch (e: IOException) {
-                    e.printStackTrace()
-                } catch (e: Exception) {
-                    e.printStackTrace()
                 }
-            } else {
-                //server_resp5();
             }
-            Timber.w("Bad Response from server, need to check $ancPostList $response ")
+            Timber.w("Bad response from server for PWR saveAll: $response")
             return false
         } catch (e: SocketTimeoutException) {
-            Timber.d("Caught exception $e here")
-            return postDataToAmritServer(ancPostList)
+            Timber.d("Caught timeout for PWR sync $e; retrying")
+            return postPwrDataToAmritServer(pwrPostList)
         } catch (e: JSONException) {
-            Timber.d("Caught exception $e here")
+            Timber.d("Caught JSON exception for PWR sync $e")
             return false
         }
     }
 
+    private fun extractGetAllDataArray(jsonObj: JSONObject): JSONArray {
+        return when (val dataNode = jsonObj.opt("data")) {
+            is JSONArray -> dataNode
+            is JSONObject -> dataNode.optJSONArray("data")
+            else -> null
+        } ?: JSONArray()
+    }
+
+    private suspend fun <T> pullMaternalRecordsFromServer(
+        moduleName: String,
+        fetch: suspend (VillageIdList) -> Response<ResponseBody>,
+        retryOnTimeout: suspend () -> Boolean,
+        parseItem: (Gson, JSONObject) -> T,
+        benIdOf: (T) -> Long,
+        saveItem: suspend (item: T, patientID: String, userName: String) -> Unit
+    ): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            try {
+                val villageList = VillageIdList(
+                    RepositorySyncUtils.parseVillageIds(user.assignVillageIds ?: ""),
+                    preferenceDao.getLastPatientSyncTime()
+                )
+                val response = fetch(villageList)
+                if (response.code() != 200) {
+                    Timber.w("Bad response from server for $moduleName getAll: $response")
+                    return@withContext false
+                }
+
+                val responseString = response.body()?.string()
+                if (responseString.isNullOrBlank()) {
+                    Timber.w("Empty response body for $moduleName getAll")
+                    return@withContext false
+                }
+
+                val jsonObj = JSONObject(responseString)
+                val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                val errorMessage = jsonObj.optString("errorMessage")
+                when (responseStatusCode) {
+                    200 -> {
+                        val dataArray = extractGetAllDataArray(jsonObj)
+                        val gson = Gson()
+                        var savedCount = 0
+                        for (i in 0 until dataArray.length()) {
+                            val item = parseItem(gson, dataArray.getJSONObject(i))
+                            val benId = benIdOf(item)
+                            if (benId == 0L) {
+                                Timber.w("Skipping $moduleName getAll item with invalid benId at index=$i")
+                                continue
+                            }
+
+                            val patient = patientDao.getPatientByAnyBeneficiaryId(benId)
+                            if (patient == null) {
+                                Timber.w("No local patient found for $moduleName benId=$benId, skipping")
+                                continue
+                            }
+
+                            saveItem(item, patient.patientID, user.userName)
+                            savedCount++
+                        }
+                        Timber.d("$moduleName getAll downsync completed, saved=$savedCount received=${dataArray.length()}")
+                        return@withContext true
+                    }
+
+                    5000 -> {
+                        Timber.d("No $moduleName records found on server")
+                        return@withContext true
+                    }
+
+                    5002 -> {
+                        if (userRepo.refreshTokenTmc(user.userName, user.password)) {
+                            throw SocketTimeoutException()
+                        }
+                    }
+
+                    else -> {
+                        Timber.w("$moduleName getAll failed: $errorMessage")
+                        throw IOException("$moduleName getAll failed with statusCode=$responseStatusCode")
+                    }
+                }
+                return@withContext false
+            } catch (e: SocketTimeoutException) {
+                Timber.d("Caught timeout for $moduleName getAll $e; retrying")
+                return@withContext retryOnTimeout()
+            } catch (e: JSONException) {
+                Timber.d("Caught JSON exception for $moduleName getAll $e")
+                return@withContext false
+            }
+        }
+    }
+
+    suspend fun pullPregnantWomenFromServer(): Boolean {
+        return pullMaternalRecordsFromServer(
+            moduleName = "PWR",
+            fetch = { villageList -> amritApiService.getAllPregnantWomen(villageList) },
+            retryOnTimeout = { pullPregnantWomenFromServer() },
+            parseItem = { gson, json -> gson.fromJson(json.toString(), PwrPost::class.java) },
+            benIdOf = { pwrNetwork -> pwrNetwork.benId },
+            saveItem = { pwrNetwork, patientID, userName ->
+                val incoming = pwrNetwork.toPwrCache().copy(
+                    patientID = patientID,
+                    processed = "P",
+                    syncState = SyncState.SYNCED,
+                    updatedDate = System.currentTimeMillis(),
+                    updatedBy = pwrNetwork.updatedBy.ifBlank { userName }
+                )
+                val existing = maternalHealthDao.getSavedRecord(patientID)
+                val merged = if (existing != null) {
+                    incoming.copy(
+                        id = existing.id,
+                        createdDate = if (existing.createdDate > 0L) existing.createdDate else incoming.createdDate,
+                        createdBy = if (existing.createdBy.isNotBlank()) existing.createdBy else incoming.createdBy
+                    )
+                } else {
+                    incoming
+                }
+                maternalHealthDao.saveRecord(merged)
+            }
+        )
+    }
 
-}
\ No newline at end of file
+    suspend fun pullAncVisitsFromServer(): Boolean {
+        return pullMaternalRecordsFromServer(
+            moduleName = "ANC",
+            fetch = { villageList -> amritApiService.getAllAncVisits(villageList) },
+            retryOnTimeout = { pullAncVisitsFromServer() },
+            parseItem = { gson, json -> gson.fromJson(json.toString(), ANCPost::class.java) },
+            benIdOf = { ancNetwork -> ancNetwork.benId },
+            saveItem = { ancNetwork, patientID, userName ->
+                val incoming = ancNetwork.toAncCache().copy(
+                    patientID = patientID,
+                    processed = "P",
+                    syncState = SyncState.SYNCED,
+                    updatedDate = if (ancNetwork.updatedDate.isNullOrBlank()) System.currentTimeMillis() else getLongFromDate(ancNetwork.updatedDate),
+                    updatedBy = ancNetwork.updatedBy.ifBlank { userName }
+                )
+                val existing = maternalHealthDao.getSavedRecord(patientID, incoming.visitNumber)
+                val merged = if (existing != null) {
+                    incoming.copy(
+                        id = existing.id,
+                        createdDate = if (existing.createdDate > 0L) existing.createdDate else incoming.createdDate,
+                        createdBy = if (existing.createdBy.isNotBlank()) existing.createdBy else incoming.createdBy
+                    )
+                } else {
+                    incoming
+                }
+                maternalHealthDao.saveRecord(merged)
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/MentalHealthScreeningRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/MentalHealthScreeningRepo.kt
new file mode 100644
index 000000000..654a1d1ad
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/MentalHealthScreeningRepo.kt
@@ -0,0 +1,121 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.MentalHealthScreeningDao
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.MentalHealthNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import timber.log.Timber
+
+class MentalHealthScreeningRepo @Inject constructor(
+    private val mentalHealthScreeningDao: MentalHealthScreeningDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveScreening(screening: MentalHealthScreeningCache): MentalHealthScreeningCache {
+        return if (screening.screeningId == 0L) {
+            screening.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(screening.patientId, visitNo)
+            }
+            val screeningId = mentalHealthScreeningDao.insert(screening)
+            screening.copy(screeningId = screeningId)
+        } else {
+            mentalHealthScreeningDao.update(screening)
+            screening
+        }
+    }
+
+    suspend fun getScreeningByPatientId(
+        patientID: String
+    ): MentalHealthScreeningCache? {
+        return mentalHealthScreeningDao.getScreeningByPatientId(patientID)
+    }
+
+    suspend fun getScreeningByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): MentalHealthScreeningCache? {
+        return mentalHealthScreeningDao.getScreeningByPatientIdAndVisitNo(
+            patientID, benVisitNo
+        )
+    }
+    suspend fun processMentalVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = mentalHealthScreeningDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postMentalForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    mentalHealthScreeningDao.update(assessment)
+                },
+                logLabel = "Mental Health records"
+            )
+        }
+    }
+
+    suspend fun pullMentalVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+            if (user == null) {
+                Timber.w("No user logged in. Skipping pull for Mental Health records")
+                return@withContext false
+            }
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getMentalVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), MentalHealthNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getScreeningByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveScreening(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Mental Health records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/NeonatalOutcomeRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/NeonatalOutcomeRepo.kt
new file mode 100644
index 000000000..a14647ceb
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/NeonatalOutcomeRepo.kt
@@ -0,0 +1,109 @@
+package org.piramalswasthya.cho.repositories
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.asLiveData
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.NeonatalOutcomeDao
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
+import javax.inject.Inject
+
+/**
+ * Repository for Neonatal Outcome operations
+ * Handles data access and business logic for neonatal outcome records
+ */
+class NeonatalOutcomeRepo @Inject constructor(
+    private val neonatalOutcomeDao: NeonatalOutcomeDao
+) {
+    
+    /**
+     * Insert a single neonatal outcome record
+     */
+    suspend fun insertNeonatalOutcome(neonatalOutcome: NeonatalOutcomeCache): Long {
+        return neonatalOutcomeDao.insertNeonatalOutcome(neonatalOutcome)
+    }
+    
+    /**
+     * Insert multiple neonatal outcomes (for twins/triplets/etc.)
+     */
+    suspend fun insertNeonatalOutcomes(neonatalOutcomes: List<NeonatalOutcomeCache>): List<Long> {
+        return neonatalOutcomeDao.insertNeonatalOutcomes(neonatalOutcomes)
+    }
+    
+    /**
+     * Update an existing neonatal outcome record
+     */
+    suspend fun updateNeonatalOutcome(neonatalOutcome: NeonatalOutcomeCache): Int {
+        return neonatalOutcomeDao.updateNeonatalOutcome(neonatalOutcome)
+    }
+    
+    /**
+     * Get all neonatal outcomes for a specific delivery
+     */
+    suspend fun getNeonatalOutcomesByDeliveryId(deliveryOutcomeId: Long): List<NeonatalOutcomeCache> {
+        return neonatalOutcomeDao.getNeonatalOutcomesByDeliveryId(deliveryOutcomeId)
+    }
+    
+    /**
+     * Get all neonatal outcomes for a delivery as Flow (for reactive UI)
+     */
+    fun getNeonatalOutcomesByDeliveryIdFlow(deliveryOutcomeId: Long): Flow<List<NeonatalOutcomeCache>> {
+        return neonatalOutcomeDao.getNeonatalOutcomesByDeliveryIdFlow(deliveryOutcomeId)
+    }
+    
+    /**
+     * Get all neonatal outcomes for a delivery as LiveData
+     */
+    fun getNeonatalOutcomesByDeliveryIdLiveData(deliveryOutcomeId: Long): LiveData<List<NeonatalOutcomeCache>> {
+        return neonatalOutcomeDao.getNeonatalOutcomesByDeliveryIdFlow(deliveryOutcomeId).asLiveData()
+    }
+    
+    /**
+     * Get a specific neonatal outcome by ID
+     */
+    suspend fun getNeonatalOutcomeById(neonatalOutcomeId: Long): NeonatalOutcomeCache? {
+        return neonatalOutcomeDao.getNeonatalOutcomeById(neonatalOutcomeId)
+    }
+    
+    /**
+     * Get a specific neonate by delivery ID and index
+     */
+    suspend fun getNeonatalOutcomeByIndexAndDelivery(deliveryOutcomeId: Long, neonateIndex: Int): NeonatalOutcomeCache? {
+        return neonatalOutcomeDao.getNeonatalOutcomeByIndexAndDelivery(deliveryOutcomeId, neonateIndex)
+    }
+    
+    /**
+     * Get all records pending sync with server
+     */
+    suspend fun getAllPendingSync(): List<NeonatalOutcomeCache> {
+        return neonatalOutcomeDao.getAllPendingSync(SyncState.UNSYNCED)
+    }
+    
+    /**
+     * Get count of neonates for a delivery
+     */
+    suspend fun getCountByDeliveryId(deliveryOutcomeId: Long): Int {
+        return neonatalOutcomeDao.getCountByDeliveryId(deliveryOutcomeId)
+    }
+    
+    /**
+     * Update sync state for a neonatal outcome
+     */
+    suspend fun updateSyncState(id: Long, syncState: SyncState): Int {
+        return neonatalOutcomeDao.updateSyncState(id, syncState)
+    }
+    
+    /**
+     * Check if neonatal outcomes exist for a delivery
+     */
+    suspend fun hasNeonatalOutcomes(deliveryOutcomeId: Long): Boolean {
+        return neonatalOutcomeDao.hasNeonatalOutcomes(deliveryOutcomeId)
+    }
+    
+    /**
+     * Delete all neonatal outcomes for a delivery
+     */
+    suspend fun deleteByDeliveryId(deliveryOutcomeId: Long): Int {
+        return neonatalOutcomeDao.deleteByDeliveryId(deliveryOutcomeId)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/NoseDiagnosisRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/NoseDiagnosisRepo.kt
new file mode 100644
index 000000000..8f5513961
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/NoseDiagnosisRepo.kt
@@ -0,0 +1,115 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.NoseDiagnosisAssessmentDao
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.NoseDiagnosisNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import timber.log.Timber
+
+class NoseDiagnosisRepo @Inject constructor(
+    private val noseDiagnosisAssessmentDao: NoseDiagnosisAssessmentDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: NoseDiagnosisAssessment) {
+        if (assessment.assessmentId == 0L) {
+            assessment.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientId, visitNo)
+            }
+            noseDiagnosisAssessmentDao.insert(assessment)
+        } else {
+            noseDiagnosisAssessmentDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(patientID: String): NoseDiagnosisAssessment? {
+        return noseDiagnosisAssessmentDao.getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): NoseDiagnosisAssessment? {
+        return noseDiagnosisAssessmentDao.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processNoseVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = noseDiagnosisAssessmentDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postNoseForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    noseDiagnosisAssessmentDao.update(assessment)
+                },
+                logLabel = "Nose Diagnosis records"
+            )
+        }
+    }
+
+    suspend fun pullNoseVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+            if (user == null) {
+                Timber.w("No user logged in. Skipping pull for Nose Diagnosis records")
+                return@withContext false
+            }
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getNoseVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), NoseDiagnosisNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessmentByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Nose Diagnosis records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/OphthalmicRepository.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/OphthalmicRepository.kt
new file mode 100644
index 000000000..32941a560
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/OphthalmicRepository.kt
@@ -0,0 +1,117 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.OphthalmicDao
+import org.piramalswasthya.cho.model.OphthalmicVisit
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.OphthalmicNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.utils.generateUuid
+import timber.log.Timber
+import org.json.JSONArray
+
+class OphthalmicRepository @Inject constructor(
+    private val ophthalmicDao: OphthalmicDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun getOphthalmicVisit(patientID: String, benVisitNo: Int): OphthalmicVisit? {
+        return ophthalmicDao.getOphthalmicVisit(patientID, benVisitNo)
+    }
+
+    suspend fun saveOphthalmicVisit(visit: OphthalmicVisit) {
+        if (visit.visitId.isNotEmpty()) {
+             val existing = ophthalmicDao.getOphthalmicVisitById(visit.visitId)
+             if (existing == null) {
+                 cphcDetailsRepo.clearAssessmentsForVisit(visit.patientID, visit.benVisitNo)
+                 ophthalmicDao.insertOphthalmicVisit(visit)
+             } else {
+                 ophthalmicDao.updateOphthalmicVisit(visit)
+             }
+        } else {
+            cphcDetailsRepo.clearAssessmentsForVisit(visit.patientID, visit.benVisitNo)
+            ophthalmicDao.insertOphthalmicVisit(visit)
+        }
+    }
+    
+    suspend fun updateOphthalmicVisit(visit: OphthalmicVisit) {
+        ophthalmicDao.updateOphthalmicVisit(visit)
+    }
+    suspend fun processOphthalmicVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = ophthalmicDao.getUnsyncedOphthalmicVisits()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientID)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postOphthalmicForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    ophthalmicDao.updateOphthalmicVisit(assessment)
+                },
+                logLabel = "Ophthalmic records"
+            )
+        }
+    }
+
+    suspend fun pullOphthalmicVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getOphthalmicVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), OphthalmicNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            val visitNo = networkObj.benVisitNo ?: 0
+                            getOphthalmicVisit(patientId, visitNo) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            val visitId: String = networkObj.visitId?.takeIf { it.isNotBlank() }
+                                ?: generateUuid()
+                            saveOphthalmicVisit(
+                                networkObj.toCacheModel(patientId).copy(
+                                    visitId = visitId,
+                                    patientID = patientId,
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Ophthalmic records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/OralHealthRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/OralHealthRepo.kt
new file mode 100644
index 000000000..ee54fb052
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/OralHealthRepo.kt
@@ -0,0 +1,110 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.OralHealthDao
+import org.piramalswasthya.cho.model.OralHealth
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.OralHealthNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import timber.log.Timber
+import org.json.JSONArray
+
+class OralHealthRepo @Inject constructor(
+    private val oralHealthDao: OralHealthDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun save(oralHealth: OralHealth) {
+        if (oralHealth.oralHealthId == 0L) {
+            oralHealth.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(oralHealth.patientID, visitNo)
+            }
+            oralHealthDao.insert(oralHealth)
+        } else {
+            oralHealthDao.update(oralHealth)
+        }
+    }
+
+    suspend fun getByPatientId(patientID: String): OralHealth? {
+        return oralHealthDao.getByPatientId(patientID)
+    }
+
+    suspend fun getByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): OralHealth? {
+        return oralHealthDao.getByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processOralVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = oralHealthDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientID)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postOralForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    oralHealthDao.update(assessment)
+                },
+                logLabel = "Oral Health records"
+            )
+        }
+    }
+
+    suspend fun pullOralVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getOralVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), OralHealthNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getByPatientIdAndVisitNo(patientId, networkObj.benVisitNo ?: 0) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            save(
+                                networkObj.toCacheModel(patientID = patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Oral Health records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/PainAndSymptomAssessmentRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/PainAndSymptomAssessmentRepo.kt
new file mode 100644
index 000000000..49fcbae3e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/PainAndSymptomAssessmentRepo.kt
@@ -0,0 +1,119 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.PainAndSymptomAssessmentDao
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PainAssessmentNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import timber.log.Timber
+import org.json.JSONArray
+
+class PainAndSymptomAssessmentRepo @Inject constructor(
+    private val painAndSymptomAssessmentDao: PainAndSymptomAssessmentDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: PainAndSymptomAssessment) {
+        if (assessment.assessmentId == 0L) {
+            assessment.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientID, visitNo)
+            }
+            painAndSymptomAssessmentDao.insert(assessment)
+        } else {
+            painAndSymptomAssessmentDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(
+        patientID: String
+    ): PainAndSymptomAssessment? {
+        return painAndSymptomAssessmentDao.getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): PainAndSymptomAssessment? {
+        return painAndSymptomAssessmentDao
+            .getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processPainvisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = painAndSymptomAssessmentDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientID)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postPainForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    painAndSymptomAssessmentDao.update(assessment)
+                },
+                logLabel = "Pain Assessment records"
+            )
+        }
+    }
+
+    suspend fun pullPainVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+            if (user == null) {
+                Timber.w("No user logged in. Skipping pull for Pain Assessment records")
+                return@withContext false
+            }
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getPainVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), PainAssessmentNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessmentByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientID = patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Pain Assessment records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/PatientRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/PatientRepo.kt
index 2d2172cc4..f4fba921a 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/PatientRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/PatientRepo.kt
@@ -19,6 +19,7 @@ import org.piramalswasthya.cho.database.room.dao.DistrictMasterDao
 import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.room.dao.PrescriptionDao
 import org.piramalswasthya.cho.database.room.dao.ProcedureDao
+import org.piramalswasthya.cho.database.room.dao.ProcedureMasterDao
 import org.piramalswasthya.cho.database.room.dao.RegistrarMasterDataDao
 import org.piramalswasthya.cho.database.room.dao.StateMasterDao
 import org.piramalswasthya.cho.database.room.dao.VillageMasterDao
@@ -85,11 +86,36 @@ class PatientRepo @Inject constructor(
     private val blockMasterDao: BlockMasterDao,
     private val villageMasterDao: VillageMasterDao,
     private val procedureDao: ProcedureDao,
+    private val procedureMasterDao: ProcedureMasterDao,
     private val prescriptionDao: PrescriptionDao,
     private val registrarMasterDataDao: RegistrarMasterDataDao,
     private val batchDao: BatchDao,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
 ) {
 
+    companion object {
+        private const val STATUS_POST_NATAL_MOTHER = 3
+    }
+
+    private fun mapReproductiveStatusId(status: String?): Int? {
+        return when (status?.trim()?.lowercase()) {
+            "eligible couple" -> 1
+            "pregnant woman", "antenatal mother" -> 2
+            "postnatal",
+            "post natal",
+            "postnatal mother-lactating mother",
+            "post natal mother-lactating mother",
+            "postnatal mother",
+            "post natal mother" -> 3
+            "elderly" -> 4
+            "adolescent", "teenager" -> 5
+            "permanent sterilization", "permanently sterilised", "permanently sterilized" -> 6
+            "not applicable" -> 7
+            else -> null
+        }
+    }
+
     private var abdmFacilityId: String = ""
     private var abdmFacilityName: String = ""
 
@@ -97,6 +123,7 @@ class PatientRepo @Inject constructor(
         // Ensure master data exists before inserting patient
         ensureMasterDataExists(patient)
         patientDao.insertPatient(patient)
+        routePostNatalPatientIfNeeded(patient)
     }
 
     /**
@@ -175,9 +202,16 @@ class PatientRepo @Inject constructor(
     suspend fun updateRecord(it: Patient) {
         withContext(Dispatchers.IO) {
             patientDao.updatePatient(it)
+            routePostNatalPatientIfNeeded(it)
         }
     }
 
+    private suspend fun routePostNatalPatientIfNeeded(patient: Patient) {
+        if (patient.statusOfWomanID != STATUS_POST_NATAL_MOTHER || patient.genderID != 2) return
+        maternalHealthRepo.retirePregnancyLifecycleForPostNatal(patient.patientID)
+        deliveryOutcomeRepo.ensureActiveDeliveryOutcomeForPnc(patient)
+    }
+
     suspend fun updatePatientSyncing(patient: Patient) {
         patientDao.updatePatientSyncing(SyncState.SYNCING, patient.patientID)
     }
@@ -213,6 +247,56 @@ class PatientRepo @Inject constructor(
         return patientDao.getPatientListFlowForLab()
     }
 
+    /**
+     * Get all infants (0–365 days inclusive).
+     * Matches DAO day-based range; WHO RMNCHA+ infant definition.
+     */
+    fun getInfantList(): Flow<List<PatientDisplay>> {
+        return patientDao.getAllInfantList()
+    }
+
+    /**
+     * Get count of infants (0–365 days inclusive).
+     * Matches DAO day-based range; WHO RMNCHA+ infant definition.
+     */
+    fun getInfantListCount(): Flow<Int> {
+        return patientDao.getInfantListCount()
+    }
+
+    /**
+     * Get all children (365–3285 days inclusive, i.e. 1–9 years).
+     * Matches DAO day-based range; WHO RMNCHA+ child definition.
+     */
+    fun getChildList(): Flow<List<PatientDisplay>> {
+        return patientDao.getAllChildList()
+    }
+
+    /**
+     * Get count of children (365–3285 days inclusive, i.e. 1–9 years).
+     * Matches DAO day-based range; WHO RMNCHA+ child definition.
+     */
+    fun getChildListCount(): Flow<Int> {
+        return patientDao.getChildListCount()
+    }
+
+    /**
+     * Get all adolescents (3650–6935 days inclusive, i.e. 10–19 years).
+     * Matches DAO day-based range; WHO RMNCHA+ adolescent definition.
+     */
+    fun getAdolescentList(): Flow<List<PatientDisplay>> {
+        return patientDao.getAllAdolescentList()
+    }
+
+    /**
+     * Get count of adolescents (3650–6935 days inclusive, i.e. 10–19 years).
+     * Matches DAO day-based range; WHO RMNCHA+ adolescent definition.
+     */
+    fun getAdolescentListCount(): Flow<Int> {
+        return patientDao.getAdolescentListCount()
+    }
+
+
+
 //    suspend fun updateFlagsByBenRegId(benFlow: BenFlow) {
 //        val patient = patientDao.getPatientByBenRegId(benFlow.beneficiaryRegID!!)
 //        if(patient != null && benFlow.nurseFlag!! >= patient.nurseFlag!! && benFlow.doctorFlag!! >= patient.doctorFlag!!){
@@ -246,6 +330,10 @@ class PatientRepo @Inject constructor(
         return patientDao.getPatientByBenRegId(beneficiaryRegID)
     }
 
+    suspend fun getPatientByAnyBeneficiaryId(id: Long): Patient? {
+        return patientDao.getPatientByAnyBeneficiaryId(id)
+    }
+
     suspend fun registerNewPatient(patient : PatientDisplay, user: UserDomain?): NetworkResult<NetworkResponse> {
 
         val p = patient.patient
@@ -257,9 +345,21 @@ class PatientRepo @Inject constructor(
         }
 
         return networkResultInterceptor {
-            val patNet = PatientNetwork(patient, user)
-//            Timber.d("patient register is ", patNet.toString())
-            val response = apiService.saveBenificiaryDetails(patNet)
+            val basePayload = PatientNetwork(patient, user)
+            val isUpdateRequest = p.beneficiaryID != null && p.beneficiaryRegID != null
+            val payload = if (isUpdateRequest) {
+                basePayload
+            } else {
+                basePayload.copy(
+                    beneficiaryID = null,
+                    beneficiaryRegID = null
+                )
+            }
+            val response = if (isUpdateRequest) {
+                apiService.updateBenificiaryDetails(payload)
+            } else {
+                apiService.saveBenificiaryDetails(payload)
+            }
             
             // Check if response is successful
             if (!response.isSuccessful) {
@@ -346,10 +446,25 @@ class PatientRepo @Inject constructor(
     suspend fun downloadAndSyncPatientRecords(): Boolean {
 
         val user = userRepo.getLoggedInUser()
+        val parsedVillageIds = convertStringToIntList(user?.assignVillageIds ?: "")
+        val effectiveVillageIds = if (parsedVillageIds.isNotEmpty()) {
+            parsedVillageIds
+        } else {
+            user?.masterVillageID?.let { listOf(it) } ?: emptyList()
+        }
+        val lastSyncDate = preferenceDao.getLastPatientSyncTime()
+//        if (effectiveVillageIds.isEmpty() || lastSyncDate.isBlank()) {
+//            Timber.w(
+//                "downloadAndSyncPatientRecords skipped: incomplete payload villageIDs=%s lastSyncDate=%s",
+//                effectiveVillageIds,
+//                lastSyncDate
+//            )
+//            return false
+//        }
 
         val villageList = VillageIdList(
-            convertStringToIntList(user?.assignVillageIds ?: ""),
-            preferenceDao.getLastPatientSyncTime()
+            effectiveVillageIds,
+            lastSyncDate
         )
 
         when(val response = getPatientsCountToDownload(villageList)){
@@ -385,8 +500,8 @@ class PatientRepo @Inject constructor(
         if(villageIds.trim().nullIfEmpty() == null){
             return emptyList();
         }
-        return villageIds.split(",").map {
-            it.trim().toInt()
+        return villageIds.split(",").mapNotNull {
+            it.trim().toIntOrNull()
         }
     }
 
@@ -483,13 +598,17 @@ class PatientRepo @Inject constructor(
                         var isSuccess = true
 
                         var totalDownloaded = 0
+                        val patientsToInsert = mutableListOf<Patient>()
+                        var lastReportedProgress = -1
 
                         for(beneficiary in beneficiariesDTO){
 
                             totalDownloaded++
                             if(WorkerUtils.totalRecordsToDownload > 0 && totalDownloaded <= WorkerUtils.totalRecordsToDownload){
-                                withContext(Dispatchers.Main) {
-                                    WorkerUtils.totalPercentageCompleted.value = ((totalDownloaded.toDouble() / WorkerUtils.totalRecordsToDownload.toDouble())*100).toInt()
+                                val progressPercent = ((totalDownloaded.toDouble() / WorkerUtils.totalRecordsToDownload.toDouble()) * 100).toInt()
+                                if (progressPercent != lastReportedProgress) {
+                                    lastReportedProgress = progressPercent
+                                    WorkerUtils.totalPercentageCompleted.postValue(progressPercent)
                                 }
                             }
 
@@ -524,8 +643,11 @@ class PatientRepo @Inject constructor(
                                     syncState = SyncState.SYNCED,
                                     beneficiaryID = beneficiary.benId?.toLong(),
                                     beneficiaryRegID = beneficiary.benRegId?.toLong(),
+                                    statusOfWomanID = beneficiary.reproductiveStatusId
+                                        ?: mapReproductiveStatusId(beneficiary.reproductiveStatus),
                                     healthIdDetails = benHealthIdDetails ,
-                                    faceEmbedding = beneficiary.faceEmbedding
+                                    faceEmbedding = beneficiary.faceEmbedding,
+                                    benImage = beneficiary.benImage
                                 )
 
                                 setPatientAge(patient)
@@ -544,6 +666,7 @@ class PatientRepo @Inject constructor(
                                     if (patientDao.getCountByBenId(beneficiary.benId!!.toLong()) > 0) {
                                         patientDao.updatePatient(patient)
                                     } else {
+                                        patientsToInsert.add(patient)
                                         patientDao.insertPatient(patient)
                                     }
                                 }
@@ -552,6 +675,13 @@ class PatientRepo @Inject constructor(
                             }
                         }
 
+                        // Batch insert all new patients in a single transaction
+                        if (patientsToInsert.isNotEmpty()) {
+                            withContext(Dispatchers.IO) {
+                                patientDao.insertAllPatients(patientsToInsert)
+                            }
+                        }
+
                         NetworkResult.Success(DownsyncSuccess(isSuccess))
                     },
                     onTokenExpired = {
@@ -636,6 +766,30 @@ class PatientRepo @Inject constructor(
 
     }
 
+    suspend fun processPatientById(patientID: String): Boolean {
+        return withContext(Dispatchers.IO) {
+            val patient = runCatching { patientDao.getPatientById(patientID) }.getOrNull()
+                ?: return@withContext false
+            val user = userRepo.getLoggedInUser()
+            updatePatientSyncing(patient.patient)
+            when (val response = registerNewPatient(patient, user)) {
+                is NetworkResult.Success -> {
+                    val benificiarySaveResponse = response.data as BenificiarySaveResponse
+                    updatePatientSyncSuccess(patient.patient, benificiarySaveResponse)
+                    true
+                }
+                is NetworkResult.Error -> {
+                    updatePatientSyncingFailed(patient.patient)
+                    false
+                }
+                else -> {
+                    updatePatientSyncingFailed(patient.patient)
+                    false
+                }
+            }
+        }
+    }
+
     suspend fun getWorkLocationMappedAbdmFacility(visitCode: Long? = 0L, benId: Long? = 0L, benRegId: Long? = 0L): NetworkResult<NetworkResponse> {
 
         return networkResultInterceptor {
@@ -785,6 +939,10 @@ class PatientRepo @Inject constructor(
                 val procedures = procedureDao.getProceduresByPatientIdAndBenVisitNo(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
                 procedures?.forEach { procedure ->
                     val compListDetails: MutableList<ComponentDetailDTO> = mutableListOf()
+                    val procedureMaster = procedureMasterDao.getMasterProcedureById(procedure.procedureID)
+                    val masterComponents = procedureMaster
+                        ?.let { procedureMasterDao.getComponentDetails(it.id) }
+                        .orEmpty()
                     val procedureDTO = ProcedureDTO(
                         benRegId = benVisitInfo.patient.beneficiaryRegID!!,
                         procedureDesc = procedure.procedureDesc,
@@ -796,33 +954,60 @@ class PatientRepo @Inject constructor(
                         isMandatory = procedure.isMandatory
                     )
 
-                    val components = procedureDao.getComponentDetails(procedure.id)
-                    components?.forEach { componentDetails ->
+                    val visitComponents = procedureDao.getComponentDetails(procedure.id).orEmpty()
+                    val visitComponentByTestId = visitComponents.associateBy { it.testComponentID }
+
+                    // Render fields from component_details_master matched by procedure.procedure_id.
+                    masterComponents.forEach { masterComponent ->
+                        val visitComponent = visitComponentByTestId[masterComponent.testComponentID]
+                        val componentId = visitComponent?.id ?: procedureDao.insert(
+                            ComponentDetails(
+                                testComponentID = masterComponent.testComponentID,
+                                procedureID = procedure.id,
+                                rangeNormalMin = masterComponent.rangeNormalMin,
+                                rangeNormalMax = masterComponent.rangeNormalMax,
+                                rangeMin = masterComponent.rangeMin,
+                                rangeMax = masterComponent.rangeMax,
+                                isDecimal = masterComponent.isDecimal,
+                                inputType = masterComponent.inputType,
+                                measurementUnit = masterComponent.measurementUnit,
+                                testComponentName = masterComponent.testComponentName,
+                                testComponentDesc = masterComponent.testComponentDesc,
+                                testResultValue = null,
+                                remarks = null
+                            )
+                        )
                         val componentOptionDTOs: MutableList<ComponentOptionDTO> = mutableListOf()
                         val componentDetailDTO = ComponentDetailDTO(
-                            id = componentDetails.id,
-                            range_normal_min = componentDetails.rangeNormalMin,
-                            range_normal_max = componentDetails.rangeNormalMax,
-                            range_min = componentDetails.rangeMin,
-                            range_max = componentDetails.rangeMax,
-                            isDecimal = componentDetails.isDecimal,
-                            inputType = componentDetails.inputType,
-                            testComponentID = componentDetails.testComponentID,
-                            measurementUnit = componentDetails.measurementUnit,
-                            testComponentName = componentDetails.testComponentName,
-                            testComponentDesc = componentDetails.testComponentDesc,
-                            testResultValue = componentDetails.testResultValue,
-                            remarks = componentDetails.remarks,
+                            id = componentId,
+                            range_normal_min = masterComponent.rangeNormalMin,
+                            range_normal_max = masterComponent.rangeNormalMax,
+                            range_min = masterComponent.rangeMin,
+                            range_max = masterComponent.rangeMax,
+                            isDecimal = masterComponent.isDecimal,
+                            inputType = masterComponent.inputType,
+                            testComponentID = masterComponent.testComponentID,
+                            measurementUnit = masterComponent.measurementUnit,
+                            testComponentName = masterComponent.testComponentName,
+                            testComponentDesc = masterComponent.testComponentDesc,
+                            testResultValue = visitComponent?.testResultValue,
+                            remarks = visitComponent?.remarks,
                             compOpt = componentOptionDTOs
                         )
 
-                        val componentOptions = procedureDao.getComponentOptions(componentDetails.id)
+                        val componentOptions = procedureDao.getComponentOptions(componentId)
                         componentOptions?.forEach { option ->
                             val componentOptionDTO = ComponentOptionDTO(
                                 name = option.name
                             )
                             componentOptionDTOs += componentOptionDTO
                         }
+
+                        if (componentOptionDTOs.isEmpty() && (componentDetailDTO.inputType == "RadioButton" || componentDetailDTO.inputType == "DropDown")) {
+                            procedureMasterDao.getComponentOptions(masterComponent.id)?.forEach { opt ->
+                                    componentOptionDTOs += ComponentOptionDTO(name = opt.name)
+                            }
+                        }
                         componentDetailDTO.compOpt = componentOptionDTOs
                         compListDetails += componentDetailDTO
                     }
@@ -855,9 +1040,10 @@ class PatientRepo @Inject constructor(
         return withContext(Dispatchers.IO) {
             val componentDetailsId = componentDetails.id
 
+            val savedOptions = procedureDao.getComponentOptions(componentDetailsId).orEmpty()
             val updatedId = procedureDao.insert(componentDetails)
 
-            procedureDao.getComponentOptions(componentDetailsId)?.forEach { componentOption ->
+            savedOptions.forEach { componentOption ->
                 componentOption.componentDetailsId = updatedId
                 procedureDao.insert(componentOption)
             }
@@ -946,18 +1132,19 @@ class PatientRepo @Inject constructor(
                             prescriptionDao.updatePrescribedDrugsBatch(updatedBatch)
                         }
 
-
-                        updatedPrescribedDrugsBatches?.forEach { prescribedDrugsBatch ->
-                            val prescriptionBatchDTO = PrescriptionBatchDTO(
-                                expiresIn = prescribedDrugsBatch.expiresIn,
-                                batchNo = prescribedDrugsBatch.batchNo,
-                                expiryDate = prescribedDrugsBatch.expiryDate,
-                                itemStockEntryID = prescribedDrugsBatch.itemStockEntryID,
-                                qty = prescribedDrugsBatch.qty,
+                        // Use live stock from batchDao so Total Available Quantity reflects actual inventory
+                        batches.filter { batch ->
+                            DateTimeUtil.calculateExpiryInDays(batch.expiryDate) > 0 && batch.quantityInHand > 0
+                        }.forEach { batch ->
+                            batchList += PrescriptionBatchDTO(
+                                expiresIn = DateTimeUtil.calculateExpiryInDays(batch.expiryDate),
+                                batchNo = batch.batchNo,
+                                expiryDate = DateTimeUtil.convertDateFormat(batch.expiryDate),
+                                itemStockEntryID = batch.stockEntityId.toInt(),
+                                qty = batch.quantityInHand,
                                 isSelected = false,
                                 dispenseQuantity = 0
                             )
-                            batchList += prescriptionBatchDTO
                         }
                         prescriptionItemDTO.batchList = batchList
                         prescriptionItemList += prescriptionItemDTO
@@ -979,4 +1166,10 @@ class PatientRepo @Inject constructor(
             prescriptionDao.getPrescription(patientID, benVisitNo, prescriptionID)
         }
     }
-}
\ No newline at end of file
+
+    suspend fun getLatestPrescription(patientID: String, benVisitNo: Int): Prescription? {
+        return withContext(Dispatchers.IO) {
+            prescriptionDao.getLatestPrescriptionByPatientIdAndBenVisitNo(patientID, benVisitNo)
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/PatientVisitInfoSyncRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/PatientVisitInfoSyncRepo.kt
index 849cc947e..8144145eb 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/PatientVisitInfoSyncRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/PatientVisitInfoSyncRepo.kt
@@ -39,6 +39,14 @@ class PatientVisitInfoSyncRepo  @Inject constructor(
         patientVisitInfoSyncDao.updatePharmacistFlag(patientID, benVisitNo)
     }
 
+    suspend fun markPharmacistDispensedLocally(patientID: String, benVisitNo: Int) {
+        patientVisitInfoSyncDao.markPharmacistDispensedLocally(patientID, benVisitNo)
+    }
+
+    suspend fun updatePharmacistFlagToPending(patientID: String, benVisitNo: Int) {
+        patientVisitInfoSyncDao.updatePharmacistFlagToPending(patientID, benVisitNo)
+    }
+
     suspend fun updateOnlyDoctorDataSubmitted(nurseFlag : Int, doctorFlag : Int, labtechFlag : Int, patientID: String, benVisitNo: Int){
         patientVisitInfoSyncDao.updateOnlyDoctorDataSubmitted(nurseFlag, doctorFlag, labtechFlag, patientID, benVisitNo)
     }
@@ -155,4 +163,4 @@ class PatientVisitInfoSyncRepo  @Inject constructor(
     suspend fun updatePatientReferData(referDate: String?, referTo: String?, referralReason: String?, patientID: String, benVisitNo: Int) {
         patientVisitInfoSyncDao.updatePatientReferData(referDate, referTo, referralReason, patientID, benVisitNo);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/PncRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/PncRepo.kt
index b27787b11..6387aa3d6 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/PncRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/PncRepo.kt
@@ -1,19 +1,24 @@
 package org.piramalswasthya.cho.repositories
 
 import android.util.Log
-import androidx.lifecycle.LiveData
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.withContext
 import org.json.JSONException
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.room.dao.PncDao
-import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+//import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.model.PNCNetwork
 import org.piramalswasthya.cho.model.PNCVisitCache
+import org.piramalswasthya.cho.model.PatientWithDeliveryOutcomeAndPncCache
 import org.piramalswasthya.cho.network.AmritApiService
+import org.piramalswasthya.cho.network.VillageIdList
+import org.piramalswasthya.cho.network.getLongFromDate
 import timber.log.Timber
 import java.io.IOException
 import java.net.SocketTimeoutException
@@ -39,7 +44,17 @@ class PncRepo @Inject constructor(
     }
 
     suspend fun getLastVisitNumber(patientID: String): Int? {
-        return pncDao.getLastVisitNumber(patientID)
+        return withContext(Dispatchers.IO) {
+            pncDao.getAllPNCsByPatId(patientID)
+                .maxByOrNull { it.pncPeriod }
+                ?.pncPeriod
+        }
+    }
+
+    suspend fun savePnc(pncCache: PNCVisitCache): Long {
+        return withContext(Dispatchers.IO) {
+            pncDao.insert(pncCache)
+        }
     }
 
     suspend fun persistPncRecord(pncCache: PNCVisitCache) {
@@ -53,6 +68,21 @@ class PncRepo @Inject constructor(
         return pncDao.getAllPNCsByPatId(patientID)
     }
 
+    /**
+     * Get all patients who are eligible for PNC (have delivered and within 42 days or not completed all visits)
+     * Uses a single optimized query instead of N+1 pattern
+     */
+    fun getAllPNCMothers(): Flow<List<PatientWithDeliveryOutcomeAndPncCache>> {
+        return pncDao.getAllPNCMothersWithData()
+    }
+
+    /**
+     * Get count of PNC mothers
+     */
+    fun getPNCMothersCount(): Flow<Int> {
+        return pncDao.getPNCMothersCount()
+    }
+
     suspend fun processPncVisits(): Boolean {
         return withContext(Dispatchers.IO) {
 
@@ -143,6 +173,142 @@ class PncRepo @Inject constructor(
             return false
         }
     }
+
+    suspend fun pullPncVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            try {
+                val villageList = VillageIdList(
+                    RepositorySyncUtils.parseVillageIds(user.assignVillageIds ?: ""),
+                    preferenceDao.getLastPatientSyncTime()
+                )
+
+                val response = amritApiService.getAllPncVisits(villageList)
+                if (response.code() != 200) {
+                    Timber.w("Bad response from server for PNC getAll: $response")
+                    return@withContext false
+                }
+
+                val responseString = response.body()?.string()
+                if (responseString.isNullOrBlank()) {
+                    Timber.w("Empty response body for PNC getAll")
+                    return@withContext false
+                }
+
+                val jsonObj = JSONObject(responseString)
+                val responseStatusCode = jsonObj.optInt("statusCode", 200)
+                val errorMessage = jsonObj.optString("errorMessage")
+
+                when (responseStatusCode) {
+                    200 -> {
+                        val dataArray = RepositorySyncUtils.extractDataArray(jsonObj)
+
+                        val gson = Gson()
+                        var savedCount = 0
+                        for (i in 0 until dataArray.length()) {
+                            val networkModel = gson.fromJson(
+                                dataArray.getJSONObject(i).toString(),
+                                PNCNetwork::class.java
+                            )
+
+                            if (networkModel.benId == 0L) {
+                                Timber.w("Skipping PNC getAll item with invalid benId at index=$i")
+                                continue
+                            }
+
+                            val patient = patientDao.getPatientByAnyBeneficiaryId(networkModel.benId)
+                            if (patient == null) {
+                                Timber.w("No local patient found for PNC benId=${networkModel.benId}, skipping")
+                                continue
+                            }
+
+                            if (networkModel.pncPeriod <= 0) {
+                                Timber.w("Skipping PNC getAll item with invalid pncPeriod at index=$i")
+                                continue
+                            }
+
+                            val incoming = networkModel.toCacheModel(patient.patientID)
+                            val existing = pncDao.getSavedRecord(patient.patientID, networkModel.pncPeriod)
+                            val merged = if (existing != null) {
+                                incoming.copy(
+                                    id = existing.id,
+                                    createdDate = if (existing.createdDate > 0L) existing.createdDate else incoming.createdDate,
+                                    createdBy = if (existing.createdBy.isNotBlank()) existing.createdBy else incoming.createdBy
+                                )
+                            } else incoming
+
+                            pncDao.insert(merged)
+                            savedCount++
+                        }
+
+                        Timber.d("PNC getAll downsync completed, saved=$savedCount received=${dataArray.length()}")
+                        return@withContext true
+                    }
+
+                    5000 -> {
+                        Timber.d("No PNC records found on server")
+                        return@withContext true
+                    }
+
+                    5002 -> {
+                        if (userRepo.refreshTokenTmc(user.userName, user.password)) {
+                            throw SocketTimeoutException()
+                        }
+                    }
+
+                    else -> {
+                        Timber.w("PNC getAll failed: $errorMessage")
+                        throw IOException("PNC getAll failed with statusCode=$responseStatusCode")
+                    }
+                }
+                return@withContext false
+            } catch (e: SocketTimeoutException) {
+                Timber.d("Caught timeout for PNC getAll $e; retrying")
+                return@withContext pullPncVisitsFromServer()
+            } catch (e: JSONException) {
+                Timber.d("Caught JSON exception for PNC getAll $e")
+                return@withContext false
+            }
+        }
+    }
+
+    private fun PNCNetwork.toCacheModel(patientID: String): PNCVisitCache {
+        return PNCVisitCache(
+            id = id,
+            patientID = patientID,
+            pncPeriod = pncPeriod,
+            isActive = isActive,
+            pncDate = getLongFromDate(pncDate),
+            ifaTabsGiven = ifaTabsGiven,
+            calciumSupplementation = calciumSupplementation,
+            anyContraceptionMethod = anyContraceptionMethod,
+            contraceptionMethod = contraceptionMethod,
+            sterilisationDate = sterilisationDate?.let { getLongFromDate(it) },
+            otherPpcMethod = otherPpcMethod,
+            anyDangerSign = anyDangerSign,
+            motherDangerSign = motherDangerSign,
+            otherDangerSign = otherDangerSign,
+            maternalSymptoms = maternalSymptoms,
+            otherMaternalSymptoms = otherMaternalSymptoms,
+            pallor = pallor,
+            vaginalBleeding = vaginalBleeding,
+            referralFacility = referralFacility,
+            motherDeath = motherDeath,
+            deathDate = deathDate?.let { getLongFromDate(it) },
+            causeOfDeath = causeOfDeath,
+            otherDeathCause = otherDeathCause,
+            placeOfDeath = placeOfDeath,
+            otherPlaceOfDeath = otherPlaceOfDeath,
+            remarks = remarks,
+            processed = "P",
+            createdBy = createdBy,
+            createdDate = getLongFromDate(createdDate),
+            updatedBy = updatedBy,
+            updatedDate = getLongFromDate(updatedDate),
+            syncState = SyncState.SYNCED
+        )
+    }
 //
 //
 //    //PULL
@@ -241,4 +407,4 @@ class PncRepo @Inject constructor(
 //        }
 //    }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/ProcedureRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/ProcedureRepo.kt
index f0e6c9c52..676be9ab5 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/ProcedureRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/ProcedureRepo.kt
@@ -1,9 +1,13 @@
 package org.piramalswasthya.cho.repositories
 
+import androidx.room.withTransaction
 import com.google.gson.Gson
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
+import org.piramalswasthya.cho.database.room.InAppDb
+import org.piramalswasthya.cho.database.room.LabProcedureMasterSeed
+import org.piramalswasthya.cho.database.room.dao.HistoryDao
 import org.piramalswasthya.cho.database.room.dao.ProcedureDao
 import org.piramalswasthya.cho.database.room.dao.ProcedureMasterDao
 import org.piramalswasthya.cho.model.ComponentDetails
@@ -13,22 +17,31 @@ import org.piramalswasthya.cho.model.ComponentOptionsMaster
 import org.piramalswasthya.cho.model.MasterLabProceduresRequestModel
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.model.Procedure
+import org.piramalswasthya.cho.model.ProcedureDataDownsync
 import org.piramalswasthya.cho.model.ProcedureDataWithComponent
 import org.piramalswasthya.cho.model.ProcedureMaster
+import org.piramalswasthya.cho.model.ComponentDataDownsync
+import org.piramalswasthya.cho.model.ProcedureFieldApiItem
 import org.piramalswasthya.cho.model.ProcedureMasterDTO
 import org.piramalswasthya.cho.network.AmritApiService
 import org.piramalswasthya.cho.network.NetworkResponse
 import org.piramalswasthya.cho.network.NetworkResult
 import org.piramalswasthya.cho.network.networkResultInterceptor
 import org.piramalswasthya.cho.network.refreshTokenInterceptor
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.math.roundToInt
 import javax.inject.Inject
 
 
 class ProcedureRepo @Inject constructor(
     private val procedureDao: ProcedureDao,
     private val procedureMasterDao: ProcedureMasterDao,
+    private val historyDao: HistoryDao,
     private val apiService: AmritApiService,
-    private val userRepo: UserRepo
+    private val userRepo: UserRepo,
+    private val database: InAppDb
 ) {
     suspend fun getProceduresWithComponent(
         patientID: String,
@@ -39,6 +52,42 @@ class ProcedureRepo @Inject constructor(
         }
     }
 
+    suspend fun syncLabResultsToDownsyncTable(patientID: String, benVisitNo: Int) {
+        withContext(Dispatchers.IO) {
+            val procedures = procedureDao.getProceduresByPatientIdAndBenVisitNo(patientID, benVisitNo) ?: return@withContext
+            val createdDate = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(Date())
+            database.withTransaction {
+                procedureDao.deleteProcedureDownsyncByPatientIdAndVisitNo(patientID, benVisitNo)
+                procedures.forEach { procedure ->
+                    val downsync = ProcedureDataDownsync(
+                        id = 0,
+                        prescriptionID = procedure.prescriptionID.toInt(),
+                        procedureID = procedure.procedureID.toInt(),
+                        createdDate = createdDate,
+                        procedureName = procedure.procedureName,
+                        patientID = patientID,
+                        benVisitNo = benVisitNo
+                    )
+                    val downsyncId = procedureDao.insert(downsync)
+                    val components = procedureDao.getComponentDetails(procedure.id) ?: emptyList()
+                    components.forEach { component ->
+                        procedureDao.insert(
+                            ComponentDataDownsync(
+                                id = 0,
+                                procedureDataID = downsyncId,
+                                testResultValue = component.testResultValue,
+                                testResultUnit = component.measurementUnit,
+                                testComponentID = component.testComponentID.toInt(),
+                                componentName = component.testComponentName,
+                                remarks = component.remarks
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
     suspend fun pullLabProcedureMasterData(): Boolean {
         return try {
             getProcedureMasterData();
@@ -48,13 +97,134 @@ class ProcedureRepo @Inject constructor(
         }
     }
 
+    suspend fun ensureLabProcedureMasterSeed() {
+        withContext(Dispatchers.IO) {
+            val labProcedures = historyDao.getProceduresMap()
+                .filter { it.procedureType.equals("Laboratory", ignoreCase = true) }
+                .sortedBy { it.procedureID }
+            val fieldRows = fetchProcedureFieldsData() ?: return@withContext
+            if (fieldRows.isEmpty()) return@withContext
+            val fieldsByProcedureId = fieldRows.groupBy { it.procedureID }
+            val labProceduresById = labProcedures.associateBy { it.procedureID.toLong() }
+            val allProcedureIds = (labProceduresById.keys + fieldsByProcedureId.keys).sorted()
+
+            for (procIdLong in allProcedureIds) {
+                val proc = labProceduresById[procIdLong]
+                val fallbackField = fieldsByProcedureId[procIdLong]?.firstOrNull()
+                var procedureMaster = procedureMasterDao.getMasterProcedureById(procIdLong)
+                if (procedureMaster != null && procedureMaster.id != procIdLong) {
+                    // Legacy rows may have auto-generated id (1,2,3...). Replace with stable API id.
+                    procedureMasterDao.deleteMasterProcedureByRowId(procedureMaster.id)
+                    procedureMaster = null
+                }
+                val procedureRowId = if (procedureMaster == null) {
+                    procedureMasterDao.insert(
+                        ProcedureMaster(
+                            id = procIdLong,
+                            procedureID = procIdLong,
+                            procedureDesc = proc?.procedureDesc
+                                ?: fallbackField?.testComponentDesc
+                                ?: "Laboratory Procedure $procIdLong",
+                            procedureType = proc?.procedureType ?: "Laboratory",
+                            prescriptionID = LabProcedureMasterSeed.PRESCRIPTION_ID,
+                            procedureName = proc?.procedureName
+                                ?: fallbackField?.testComponentName
+                                ?: "Laboratory Procedure $procIdLong",
+                            isMandatory = false
+                        )
+                    )
+                } else {
+                    procedureMaster.id
+                }
+
+                val fieldsForProc = fieldsByProcedureId[procIdLong].orEmpty()
+                val existingComponents = procedureMasterDao.getComponentDetails(procedureRowId)
+
+                for (field in fieldsForProc) {
+                    val testComponentId = field.id
+                    val existingComp = existingComponents.find { it.testComponentID == testComponentId }
+                    val componentDetailsId = if (existingComp == null) {
+                        procedureMasterDao.insert(
+                            componentDetailsMasterFromField(field, procedureRowId)
+                        )
+                    } else {
+                        existingComp.id
+                    }
+
+                    val optionNames = if (field.inputType.equals("RadioButton", ignoreCase = true)) {
+                        LabProcedureMasterSeed.radioButtonDefaultOptions
+                    } else {
+                        emptyList()
+                    }
+                    val existingOptions =
+                        procedureMasterDao.getComponentOptions(componentDetailsId)?.mapNotNull { it.name }
+                            .orEmpty()
+                    for (optName in optionNames) {
+                        if (optName !in existingOptions) {
+                            procedureMasterDao.insert(
+                                ComponentOptionsMaster(componentDetailsId = componentDetailsId, name = optName)
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun componentDetailsMasterFromField(
+        field: ProcedureFieldApiItem,
+        procedureMasterRowId: Long
+    ): ComponentDetailsMaster {
+        val nMin = field.rangeMin?.roundToInt()
+        val nMax = field.rangeMax?.roundToInt()
+        return ComponentDetailsMaster(
+            testComponentID = field.id,
+            procedureID = procedureMasterRowId,
+            rangeNormalMin = nMin,
+            rangeNormalMax = nMax,
+            rangeMin = null,
+            rangeMax = null,
+            isDecimal = field.inputType.equals("TextBox", ignoreCase = true),
+            inputType = field.inputType,
+            measurementUnit = field.measurementNit,
+            testComponentName = field.testComponentName,
+            testComponentDesc = field.testComponentDesc
+        )
+    }
+
+    suspend fun fetchProcedureFieldsData(attempt: Int = 0): List<ProcedureFieldApiItem>? {
+        if (attempt > 2) return null
+        return try {
+            val response = apiService.getProcedureFields()
+            val responseBody = response.body()?.string() ?: return null
+            val json = JSONObject(responseBody)
+            when (json.optInt("statusCode", -1)) {
+                200 -> {
+                    val dataArray = json.getJSONArray("data")
+                    Gson().fromJson(
+                        dataArray.toString(),
+                        Array<ProcedureFieldApiItem>::class.java
+                    ).toList()
+                }
+                5002 -> {
+                    val user = userRepo.getLoggedInUser() ?: return null
+                    userRepo.refreshTokenTmc(user.userName, user.password)
+                    fetchProcedureFieldsData(attempt + 1)
+                }
+                else -> null
+            }
+        } catch (_: Exception) {
+            null
+        }
+    }
+
 
     private suspend fun getProcedureMasterData(): NetworkResult<NetworkResponse> {
         return networkResultInterceptor {
-                val procedureMasterDataRequest = MasterLabProceduresRequestModel(
-                    providerServiceMapID = userRepo.getLoggedInUser()?.serviceMapId
+            val procedureMasterDataRequest = MasterLabProceduresRequestModel(
+                providerServiceMapID = userRepo.getLoggedInUser()?.serviceMapId
 
-                )
+            )
 
             val response = apiService.getMasterLabProceduresDate(procedureMasterDataRequest)
             val responseBody = response.body()?.string()
@@ -69,6 +239,7 @@ class ProcedureRepo @Inject constructor(
 
                     procedureDTO.forEach { dto ->
                         val procedure = ProcedureMaster(
+                            id = dto.procedureID,
                             procedureID = dto.procedureID,
                             procedureDesc = dto.procedureDesc,
                             procedureType = dto.procedureType,
@@ -76,11 +247,11 @@ class ProcedureRepo @Inject constructor(
                             prescriptionID = dto.prescriptionID,
                             isMandatory = dto.isMandatory
                         )
-                        val procedureId = procedureMasterDao.insert(procedure)
+                        procedureMasterDao.insert(procedure)
                         dto.compListDetails.forEach { componentDetailDTO ->
                             val componentDetails = ComponentDetailsMaster(
                                 testComponentID = componentDetailDTO.testComponentID,
-                                procedureID = procedureId,
+                                procedureID = dto.procedureID,
                                 rangeNormalMin = componentDetailDTO.range_normal_min,
                                 rangeNormalMax = componentDetailDTO.range_normal_max,
                                 rangeMax = componentDetailDTO.range_max,
@@ -116,21 +287,38 @@ class ProcedureRepo @Inject constructor(
     }
 
     suspend fun addProcedure(procedureID: Long, benVisitInfo: PatientDisplayWithVisitInfo) {
-        var procedureMaster = procedureMasterDao.getMasterProcedureById(procedureID)
-        procedureMaster?.let {
-            val procedure = Procedure(
-                patientID = benVisitInfo.patient.patientID,
-                benVisitNo = benVisitInfo.benVisitNo!!,
-                procedureID = procedureMaster.procedureID,
-                procedureDesc = procedureMaster.procedureDesc,
-                procedureType = procedureMaster.procedureType,
-                procedureName = procedureMaster.procedureName,
-                prescriptionID = procedureMaster.prescriptionID,
-                isMandatory = procedureMaster.isMandatory
-            )
-            val procedureId = procedureDao.insert(procedure)
-            val componentDetailsMasterList = procedureMasterDao.getComponentDetails(procedureId)
-            componentDetailsMasterList.forEach { componentDetailsMaster ->
+        addProcedureFromMaster(procedureID, benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+    }
+
+    suspend fun copyProceduresFromMasterForVisit(patientID: String, benVisitNo: Int, newTestIds: String?) {
+        if (newTestIds.isNullOrBlank()) return
+        withContext(Dispatchers.IO) {
+            ensureLabProcedureMasterSeed()
+            val existingProcedures = procedureDao.getProceduresByPatientIdAndBenVisitNo(patientID, benVisitNo)
+            val existingProcedureIds = existingProcedures?.map { it.procedureID }?.toSet() ?: emptySet()
+            newTestIds.split(",").mapNotNull { it.trim().toLongOrNull() }.forEach { procedureID ->
+                if (procedureID !in existingProcedureIds) {
+                    addProcedureFromMaster(procedureID, patientID, benVisitNo)
+                }
+            }
+        }
+    }
+
+    private suspend fun addProcedureFromMaster(procedureID: Long, patientID: String, benVisitNo: Int) {
+        val procedureMaster = procedureMasterDao.getMasterProcedureById(procedureID) ?: return
+        val procedure = Procedure(
+            patientID = patientID,
+            benVisitNo = benVisitNo,
+            procedureID = procedureMaster.procedureID,
+            procedureDesc = procedureMaster.procedureDesc,
+            procedureType = procedureMaster.procedureType,
+            procedureName = procedureMaster.procedureName,
+            prescriptionID = procedureMaster.prescriptionID,
+            isMandatory = procedureMaster.isMandatory
+        )
+        val procedureId = procedureDao.insert(procedure)
+        val componentDetailsMasterList = procedureMasterDao.getComponentDetails(procedureMaster.id)
+        componentDetailsMasterList.forEach { componentDetailsMaster ->
             val component = ComponentDetails(
                 procedureID = procedureId,
                 testComponentID = componentDetailsMaster.testComponentID,
@@ -146,18 +334,16 @@ class ProcedureRepo @Inject constructor(
                 testResultValue = null,
                 remarks = null
             )
-                val componentId = procedureDao.insert(component)
-                val componentOptionsMaster = procedureMasterDao.getComponentOptions(componentId)
-                componentOptionsMaster?.forEach { componentOptionsMaster ->
-                        val componentOption = ComponentOption(
-                            componentDetailsId = componentOptionsMaster.componentDetailsId,
-                            name = componentOptionsMaster.name
-                        )
-                        procedureDao.insert(componentOption)
-                }
+            val componentId = procedureDao.insert(component)
+            val componentOptionsMaster = procedureMasterDao.getComponentOptions(componentDetailsMaster.id)
+            componentOptionsMaster?.forEach { option ->
+                val componentOption = ComponentOption(
+                    componentDetailsId = componentId,
+                    name = option.name
+                )
+                procedureDao.insert(componentOption)
             }
         }
-
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/PsychosocialCaregiverSupportRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/PsychosocialCaregiverSupportRepo.kt
new file mode 100644
index 000000000..63c7af5e2
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/PsychosocialCaregiverSupportRepo.kt
@@ -0,0 +1,123 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.PsychosocialCaregiverSupportDao
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupportNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import timber.log.Timber
+import org.json.JSONArray
+
+class PsychosocialCaregiverSupportRepo @Inject constructor(
+    private val psychosocialCaregiverSupportDao: PsychosocialCaregiverSupportDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: PsychosocialCaregiverSupport) {
+        if (assessment.assessmentId == 0L) {
+            assessment.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientId, visitNo)
+            }
+            psychosocialCaregiverSupportDao.insert(assessment)
+        } else {
+            psychosocialCaregiverSupportDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(
+        patientID: String
+    ): PsychosocialCaregiverSupport? {
+        return psychosocialCaregiverSupportDao
+            .getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): PsychosocialCaregiverSupport? {
+        return psychosocialCaregiverSupportDao
+            .getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processPsychosocialCaregiverVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = psychosocialCaregiverSupportDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postPsychosocialCaregiverForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    psychosocialCaregiverSupportDao.update(assessment)
+                },
+                logLabel = "Psychosocial Caregiver Support Assessment records"
+            )
+        }
+    }
+
+    suspend fun pullPsychosocialCaregiverSupportVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+            if (user == null) {
+                Timber.w("No user logged in. Skipping pull for Psychosocial Caregiver Support records")
+                return@withContext false
+            }
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getPsychosocialCaregiverVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(
+                                jsonObj.toString(),
+                                PsychosocialCaregiverSupportNetwork::class.java
+                            )
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessmentByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Psychosocial Caregiver Support records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/RegistrarMasterDataRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/RegistrarMasterDataRepo.kt
index 0437710f8..52637bf35 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/RegistrarMasterDataRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/RegistrarMasterDataRepo.kt
@@ -5,7 +5,7 @@ import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import org.piramalswasthya.cho.database.converters.MasterDataListConverter
 import org.piramalswasthya.cho.database.room.dao.RegistrarMasterDataDao
-import org.piramalswasthya.cho.moddel.OccupationMaster
+import org.piramalswasthya.cho.model.OccupationMaster
 import org.piramalswasthya.cho.model.AgeUnit
 import org.piramalswasthya.cho.model.CommunityMaster
 import org.piramalswasthya.cho.model.GenderMaster
@@ -27,6 +27,54 @@ class RegistrarMasterDataRepo @Inject constructor(
     private val apiService: AmritApiService
 
 ) {
+    /**
+     * Downloads all registrar master data in a single HTTP request and saves
+     * every type to the local database using batch inserts.
+     * Replaces the 13 individual save*ToCache() calls that each made their own
+     * network request to the same endpoint.
+     */
+    suspend fun saveAllMasterDataToCache() {
+        val data = registrarMasterService() ?: return
+        withContext(Dispatchers.IO) {
+            registrarMasterDataDao.insertAllGenders(
+                MasterDataListConverter.toGenderList(data.optJSONArray("genderMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllAgeUnits(
+                MasterDataListConverter.toAgeUnitList(data.optJSONArray("ageUnit")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllMaritalStatuses(
+                MasterDataListConverter.toMaritalStatusList(data.optJSONArray("maritalStatusMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllCommunities(
+                MasterDataListConverter.toCommunityMasterList(data.optJSONArray("communityMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllReligionMasters(
+                MasterDataListConverter.toReligionMasterList(data.optJSONArray("religionMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllIncomeStatuses(
+                MasterDataListConverter.toIncomeStatusList(data.optJSONArray("incomeMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllLiteracyStatuses(
+                MasterDataListConverter.toLiteracyStatusList(data.optJSONArray("literacyStatus")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllGovIdMasters(
+                MasterDataListConverter.toGovIdEntityList(data.optJSONArray("govIdEntityMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllOtherGovIdEntityMasters(
+                MasterDataListConverter.toOtherGovIdEntityList(data.optJSONArray("otherGovIdEntityMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllOccupationMasters(
+                MasterDataListConverter.toOccupationMasterList(data.optJSONArray("occupationMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllQualificationMasters(
+                MasterDataListConverter.toQualificationMasterList(data.optJSONArray("qualificationMaster")?.toString() ?: "[]")
+            )
+            registrarMasterDataDao.insertAllRelationshipMasters(
+                MasterDataListConverter.toRelationshipMasterList(data.optJSONArray("relationshipMaster")?.toString() ?: "[]")
+            )
+        }
+    }
+
     private suspend fun registrarMasterService(): JSONObject? {
         val response = apiService.getRegistrarMasterData(TmcLocationDetailsRequest(1,1))
         val statusCode = response.code()
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/RepositorySyncUtils.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/RepositorySyncUtils.kt
new file mode 100644
index 000000000..8d94f55a0
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/RepositorySyncUtils.kt
@@ -0,0 +1,20 @@
+package org.piramalswasthya.cho.repositories
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+object RepositorySyncUtils {
+    fun parseVillageIds(villageIds: String): List<Int> {
+        if (villageIds.trim().isEmpty()) return emptyList()
+        return villageIds.split(",")
+            .mapNotNull { it.trim().toIntOrNull() }
+    }
+
+    fun extractDataArray(root: JSONObject): JSONArray {
+        return when (val dataNode = root.opt("data")) {
+            is JSONArray -> dataNode
+            is JSONObject -> dataNode.optJSONArray("data")
+            else -> null
+        } ?: JSONArray()
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/ThroatDiagnosisRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/ThroatDiagnosisRepo.kt
new file mode 100644
index 000000000..0543b9dca
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/ThroatDiagnosisRepo.kt
@@ -0,0 +1,113 @@
+package org.piramalswasthya.cho.repositories
+
+import org.piramalswasthya.cho.database.room.dao.ThroatDiagnosisAssessmentDao
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
+import javax.inject.Inject
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.ThroatDiagnosisNetwork
+import org.piramalswasthya.cho.model.toCacheModel
+import org.piramalswasthya.cho.model.toNetworkModel
+import org.piramalswasthya.cho.network.AmritApiService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import com.google.gson.Gson
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import timber.log.Timber
+import org.json.JSONArray
+
+class ThroatDiagnosisRepo @Inject constructor(
+    private val throatDiagnosisAssessmentDao: ThroatDiagnosisAssessmentDao,
+    private val patientDao: PatientDao,
+    private val amritApiService: AmritApiService,
+    private val userRepo: UserRepo,
+    private val prefDao: PreferenceDao,
+    private val cphcDetailsRepo: CphcDetailsRepository,
+) {
+    suspend fun saveAssessment(assessment: ThroatDiagnosisAssessment) {
+        if (assessment.assessmentId == 0L) {
+            assessment.benVisitNo?.let { visitNo ->
+                cphcDetailsRepo.clearAssessmentsForVisit(assessment.patientId, visitNo)
+            }
+            throatDiagnosisAssessmentDao.insert(assessment)
+        } else {
+            throatDiagnosisAssessmentDao.update(assessment)
+        }
+    }
+
+    suspend fun getAssessmentByPatientId(patientID: String): ThroatDiagnosisAssessment? {
+        return throatDiagnosisAssessmentDao.getAssessmentByPatientId(patientID)
+    }
+
+    suspend fun getAssessmentByPatientIdAndVisitNo(
+        patientID: String,
+        benVisitNo: Int
+    ): ThroatDiagnosisAssessment? {
+        return throatDiagnosisAssessmentDao.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+    }
+    suspend fun processThroatVisits(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val unsyncedList = throatDiagnosisAssessmentDao.getUnsyncedAssessments()
+            AmritSyncRepositoryHelper.pushUnsynced(
+                unsyncedList = unsyncedList,
+                mapToPayload = { assessment ->
+                    val patient = patientDao.getPatient(assessment.patientId)
+                    val benId = patient?.beneficiaryID
+                    val benRegId = patient?.beneficiaryRegID
+                    if (benId == null || benRegId == null) null else {
+                        assessment.toNetworkModel(
+                            beneficiaryID = benId.toString(),
+                            beneficiaryRegID = benRegId.toString()
+                        )
+                    }
+                },
+                post = { payload -> amritApiService.postThroatForm(payload) },
+                markSynced = { assessment ->
+                    assessment.syncState = SyncState.SYNCED.ordinal
+                    throatDiagnosisAssessmentDao.update(assessment)
+                },
+                logLabel = "Throat Diagnosis records"
+            )
+        }
+    }
+
+    suspend fun pullThroatVisitsFromServer(): Boolean {
+        return withContext(Dispatchers.IO) {
+            val user = userRepo.getLoggedInUser()
+                ?: throw IllegalStateException("No user logged in!!")
+            val gson = Gson()
+            AmritSyncRepositoryHelper.pullWithRetry(
+                villageIds = user.assignVillageIds ?: "",
+                lastSyncDate = prefDao.getLastPatientSyncTime(),
+                fetch = { villageList -> amritApiService.getThroatVisits(villageList) },
+                refreshToken = { userRepo.refreshTokenTmc(user.userName, user.password) },
+                onDataArray = { dataArray ->
+                    AmritSyncRepositoryHelper.upsertByBeneficiaryRegId(
+                        dataArray = dataArray,
+                        parseNetwork = { jsonObj ->
+                            gson.fromJson(jsonObj.toString(), ThroatDiagnosisNetwork::class.java)
+                        },
+                        beneficiaryRegId = { it.beneficiaryRegID.toLongOrNull() },
+                        resolvePatientId = { benRegId ->
+                            patientDao.getPatientByBenRegId(benRegId)?.patientID
+                        },
+                        isExisting = { patientId, networkObj ->
+                            getAssessmentByPatientIdAndVisitNo(
+                                patientId,
+                                networkObj.benVisitNo ?: 0
+                            ) != null
+                        },
+                        insertNew = { patientId, networkObj ->
+                            saveAssessment(
+                                networkObj.toCacheModel(patientId).copy(
+                                    syncState = SyncState.SYNCED.ordinal
+                                )
+                            )
+                        }
+                    )
+                },
+                logLabel = "Throat records"
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/UserRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/UserRepo.kt
index aec82a02e..c08617b42 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/UserRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/UserRepo.kt
@@ -14,6 +14,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.json.JSONArray
+import org.json.JSONException
 import org.json.JSONObject
 import org.piramalswasthya.cho.crypt.CryptoUtil
 import org.piramalswasthya.cho.database.room.dao.BlockMasterDao
@@ -71,7 +73,7 @@ class UserRepo @Inject constructor(
             userDao.getLoggedInUser()?.asDomainModel()
         }
     }
-     fun getLoggedInUserAsFlow(): Flow<Int?> {
+    fun getLoggedInUserAsFlow(): Flow<Int?> {
         return userDao.getLoggedInUserAsFlow().map { it?.asDomainModel()?.userId }
     }
     suspend fun isUserLoggedIn(): Int {
@@ -80,19 +82,19 @@ class UserRepo @Inject constructor(
         }
     }
 
-     suspend fun setOutreachProgram(loginType: String?,
-                                      selectedOption: String?,
-                                      loginTimeStamp: String?,
-                                      logoutTimeStamp: String?,
-                                      lat: Double?,
-                                      long: Double?,
-                                      logoutType: String?,
-                                    userImage: String?,
-                                    isOutOfReach:Boolean?
-     ) {
-         var user = userDao.getLoggedInUser()
-         var userName = user?.userName
-         var userId = user?.userId
+    suspend fun setOutreachProgram(loginType: String?,
+                                   selectedOption: String?,
+                                   loginTimeStamp: String?,
+                                   logoutTimeStamp: String?,
+                                   lat: Double?,
+                                   long: Double?,
+                                   logoutType: String?,
+                                   userImage: String?,
+                                   isOutOfReach:Boolean?
+    ) {
+        var user = userDao.getLoggedInUser()
+        var userName = user?.userName
+        var userId = user?.userId
         val selectedOutreachProgram = SelectedOutreachProgram(
             userId = userId,
             userName = userName,
@@ -220,19 +222,22 @@ class UserRepo @Inject constructor(
 
                 for (i in 0 until vanSpDetailsArray.length()) {
                     val vanSp = vanSpDetailsArray.getJSONObject(i)
-                    val vanId = vanSp.getInt("vanID")
-                    user?.vanId = vanId
-                    val servicePointId = vanSp.getInt("servicePointID")
-                    user?.servicePointId = servicePointId
-                    val servicePointName = vanSp.getString("servicePointName")
-                    user?.servicePointName = servicePointName
+                    val serviceProviderMapId = vanSp.getInt("providerServiceMapID")
+                    user?.serviceMapId = serviceProviderMapId
+//                    val vanId = vanSp.getInt("vanID")
+//                    user?.vanId = vanId
+//                    val servicePointId = vanSp.getInt("servicePointID")
+//                    user?.servicePointId = servicePointId
+//                    val servicePointName = vanSp.getString("servicePointName")
+//                    user?.servicePointName = servicePointName
                     if (!vanSp.has("facilityID")) {
                         Toast.makeText(context, "Facility ID not found", Toast.LENGTH_LONG).show()
                         delay(3000)
+                        continue
                     }
                     val facilityId = vanSp.getInt("facilityID")
                     user?.facilityID = facilityId
-                    user?.parkingPlaceId = vanSp.getInt("parkingPlaceID")
+//                    user?.parkingPlaceId = vanSp.getInt("parkingPlaceID")
 
                 }
                 true
@@ -282,7 +287,7 @@ class UserRepo @Inject constructor(
             }
         }
 
-        }
+    }
 
 
     private suspend fun getTokenTmc(userName: String, password: String, context: Context) {
@@ -317,7 +322,21 @@ class UserRepo @Inject constructor(
                     val privilegesArray = data.getJSONArray("previlegeObj")
                     val privilegesObject = privilegesArray.getJSONObject(0)
                     val rolesObjectArray = privilegesObject.getJSONArray("roles")
-                    preferenceDao.setWorkingLocationID(rolesObjectArray.getJSONObject(0).getInt("workingLocationID"))
+                    val workingLocationId = if (rolesObjectArray.length() > 0) {
+                        val firstRole = rolesObjectArray.getJSONObject(0)
+                        when {
+                            firstRole.has("workingLocationID") -> firstRole.optInt("workingLocationID", -1)
+                            firstRole.has("workingLocationId") -> firstRole.optInt("workingLocationId", -1)
+                            else -> -1
+                        }
+                    } else {
+                        -1
+                    }
+                    if (workingLocationId != -1) {
+                        preferenceDao.setWorkingLocationID(workingLocationId)
+                    } else {
+                        Timber.w("getTokenTmc: workingLocationID missing in role payload")
+                    }
                     val rolesArray = extractRoles(privilegesObject);
                     val name = data.getString("fullName")
                     user = UserNetwork(userId, userName, password, name, rolesArray)
@@ -326,12 +345,13 @@ class UserRepo @Inject constructor(
                     val serviceMapId =
                         privilegesObject.getInt("providerServiceMapID")
                     user?.serviceMapId = serviceMapId
+                    applyFacilityDataFromLoginResponse(data)
                     TokenInsertTmcInterceptor.setToken(token)
                     preferenceDao.registerPrimaryApiToken(token)
-                    preferenceDao.registerUser(user!!)
                     getUserVanSpDetails(context)
                     getLocDetailsBasedOnSpIDAndPsmID()
                     getUserMasterVillage()
+                    preferenceDao.registerUser(user!!)
                 } else {
                     val errorMessage = responseBody.getString("errorMessage")
                     GlobalScope.launch(Dispatchers.Main) {
@@ -350,7 +370,7 @@ class UserRepo @Inject constructor(
         return withContext(Dispatchers.IO) {
             val response = tmcNetworkApiService.getLocDetailsBasedOnSpIDAndPsmID(
                 LocationRequest(
-                    user!!.vanId,
+                    user!!.facilityID,
                     user!!.serviceMapId.toString(),
                     user!!.userId
                 )
@@ -369,17 +389,35 @@ class UserRepo @Inject constructor(
             if (responseStatusCode == 200) {
                 val data = responseBody.getJSONObject("data")
                 val otherLoc = data.getJSONObject("otherLoc")
-                val stateId = otherLoc.getString("stateID")
-                val districtList = otherLoc.getJSONArray("districtList")
-                val districtObject = districtList.getJSONObject(0)
-                val districtId = districtObject.getString("districtID")
-                val districtName = districtObject.getString("districtName")
-                val blockId = districtObject.getString("blockId")
-                val blockName = districtObject.getString("blockName")
-                val villageList = districtObject.getJSONArray("villageList")
+                val stateId = otherLoc.optString("stateID", "")
+                val districtList = otherLoc.optJSONArray("districtList")
+                if (districtList == null || districtList.length() == 0) {
+                    Timber.w("getLocDetailsBasedOnSpIDAndPsmID: districtList empty, skipping location seed")
+                    return@withContext
+                }
+                val districtObject = districtList.optJSONObject(0)
+                if (districtObject == null) {
+                    Timber.w("getLocDetailsBasedOnSpIDAndPsmID: district object missing, skipping location seed")
+                    return@withContext
+                }
+                val districtId = districtObject.optString("districtID", "")
+                val districtName = districtObject.optString("districtName", "")
+                val blockId = districtObject.optString("blockId", "")
+                val blockName = districtObject.optString("blockName", "")
+                val villageList = districtObject.optJSONArray("villageList") ?: JSONArray()
+
+                if (districtId.isBlank() || blockId.isBlank() || stateId.isBlank()) {
+                    Timber.w(
+                        "getLocDetailsBasedOnSpIDAndPsmID: incomplete location payload stateId=%s districtId=%s blockId=%s, skipping DB seed",
+                        stateId,
+                        districtId,
+                        blockId
+                    )
+                    return@withContext
+                }
 
                 val itemType = object : TypeToken<List<VillageLocationData>>() {}.type
-                var villageLocationDataList : List<VillageLocationData> = Gson().fromJson(villageList.toString(), itemType)
+                var villageLocationDataList : List<VillageLocationData> = Gson().fromJson(villageList.toString(), itemType) ?: emptyList()
                 villageLocationDataList = villageLocationDataList.toSet().toList()
 
                 val stateMaster = data.getJSONArray("stateMaster")
@@ -389,10 +427,10 @@ class UserRepo @Inject constructor(
                     val jsonObject = stateMaster.getJSONObject(i)
                     val id = jsonObject.getInt("stateID").toString()
                     val stateName = jsonObject.getString("stateName")
-                    val lgdStateId = jsonObject.getString("govtLGDStateID")
+                    val lgdStateId = jsonObject.optString("govtLGDStateID", "")
                     if (id == stateId) {
-                         stateMasterName = stateName
-                        govtLGDStateID = lgdStateId.toInt()
+                        stateMasterName = stateName
+                        govtLGDStateID = lgdStateId.toIntOrNull()
                     }
                 }
                 if(stateMasterDao.getStateById(stateId.toInt()) == null ){
@@ -436,6 +474,43 @@ class UserRepo @Inject constructor(
         }
     }
 
+    private fun applyFacilityDataFromLoginResponse(data: JSONObject) {
+        if (!data.has("facilityData")) return
+        try {
+            val facilityData = data.getJSONObject("facilityData")
+            val facilityUser = facilityData.optJSONObject("user")
+            val facilityLocation = facilityData.optJSONObject("location")
+            if (facilityUser != null) {
+                user?.employeeId = when {
+                    facilityUser.has("employeeId") -> facilityUser.getString("employeeId")
+                    facilityUser.has("employeeID") -> facilityUser.getString("employeeID")
+                    else -> null
+                }?.nullIfEmpty()
+            }
+            if (facilityLocation != null) {
+                user?.locationType = when {
+                    facilityLocation.has("locationType") -> facilityLocation.getString("locationType")
+                    else -> null
+                }?.nullIfEmpty()
+            }
+            val facilities = facilityData.optJSONArray("facilities") ?: return
+            if (facilities.length() == 0) return
+            val facility = facilities.getJSONObject(0)
+            val facilityId = when {
+                facility.has("facilityId") -> facility.getInt("facilityId")
+                facility.has("facilityID") -> facility.getInt("facilityID")
+                else -> -1
+            }
+            if (facilityId != -1) {
+                user?.facilityID = facilityId
+            }
+            user?.facilityType = facility.optString("facilityType", "").nullIfEmpty()
+            user?.facilityName = facility.optString("facilityName", "").nullIfEmpty()
+        } catch (e: JSONException) {
+            Timber.w(e, "applyFacilityDataFromLoginResponse: failed to parse facilityData")
+        }
+    }
+
     private fun extractRoles(privilegesObject : JSONObject) : String{
 //        return "Lab Technician,MO,Pharmacist,Registrar,Staff Nurse"
 //        return "Lab Technician,MO,Pharmacist"
@@ -449,7 +524,7 @@ class UserRepo @Inject constructor(
         return roles.substring(0, roles.length - 1)
     }
 
-     private fun encrypt(password: String): String {
+    private fun encrypt(password: String): String {
         val util = CryptoUtil()
         return util.encrypt(password)
     }
@@ -542,38 +617,38 @@ class UserRepo @Inject constructor(
         user.masterVillageName = masterVillageName
         userDao.update(user)
     }
-     suspend fun setUserMasterVillage(user:UserCache, userMasterVillage: UserMasterVillage) {
-         val response = tmcNetworkApiService.setUserMasterVillage(userMasterVillage)
-         val statusCode = response.code()
-         if (statusCode == 200) {
-             val responseString = response.body()?.string()
-             val responseJson = JSONObject(responseString!!)
-             val responseStatusCode = responseJson.getInt("statusCode")
-             if (responseStatusCode == 200) {
-                 val data = responseJson.getJSONObject("data")
-                 val masterVillageName = data.getString("villageName")
-                 user.masterVillageName = masterVillageName
-                 val masterVillageId = data.getInt("districtBranchID")
-                 user.masterVillageID = masterVillageId
-                 val masterLocAddress = data.getString("address")
-                 user.masterLocationAddress = masterLocAddress
-                 val loginDistance = data.getInt("loginDistance")
-                 user.loginDistance = loginDistance
-                 val blockId = data.getInt("blockID")
-                 user.masterBlockID = blockId
-                 val masterLatitude = data.getDouble("latitude")
-                 user.masterLatitude = masterLatitude
-                 val masterLongitude = data.getDouble("longitude")
-                 user.masterLongitude = masterLongitude
-
-                 val use = user
-                 use.masterVillageName
-
-                 userDao.update(user)
-
-             }
-         }
-     }
+    suspend fun setUserMasterVillage(user:UserCache, userMasterVillage: UserMasterVillage) {
+        val response = tmcNetworkApiService.setUserMasterVillage(userMasterVillage)
+        val statusCode = response.code()
+        if (statusCode == 200) {
+            val responseString = response.body()?.string()
+            val responseJson = JSONObject(responseString!!)
+            val responseStatusCode = responseJson.getInt("statusCode")
+            if (responseStatusCode == 200) {
+                val data = responseJson.getJSONObject("data")
+                val masterVillageName = data.getString("villageName")
+                user.masterVillageName = masterVillageName
+                val masterVillageId = data.getInt("districtBranchID")
+                user.masterVillageID = masterVillageId
+                val masterLocAddress = data.getString("address")
+                user.masterLocationAddress = masterLocAddress
+                val loginDistance = data.getInt("loginDistance")
+                user.loginDistance = loginDistance
+                val blockId = data.getInt("blockID")
+                user.masterBlockID = blockId
+                val masterLatitude = data.getDouble("latitude")
+                user.masterLatitude = masterLatitude
+                val masterLongitude = data.getDouble("longitude")
+                user.masterLongitude = masterLongitude
+
+                val use = user
+                use.masterVillageName
+
+                userDao.update(user)
+
+            }
+        }
+    }
     suspend fun processUnsyncedAuditData(): Boolean{
         val loginAuditDataListUnsynced: List<SelectedOutreachProgram> = userDao.getLoginAuditDataListUnsynced()
         if(loginAuditDataListUnsynced.isNotEmpty()){
@@ -586,8 +661,8 @@ class UserRepo @Inject constructor(
                 }
                 is NetworkResult.Error -> {
                     if(response.code == socketTimeoutException){
-                    throw SocketTimeoutException("caught exception")
-                }
+                        throw SocketTimeoutException("caught exception")
+                    }
                     return false
                 }
                 else ->{
@@ -598,4 +673,4 @@ class UserRepo @Inject constructor(
         return true
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/repositories/VisitReasonsAndCategoriesRepo.kt b/app/src/main/java/org/piramalswasthya/cho/repositories/VisitReasonsAndCategoriesRepo.kt
index b7581299f..67425eced 100644
--- a/app/src/main/java/org/piramalswasthya/cho/repositories/VisitReasonsAndCategoriesRepo.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/repositories/VisitReasonsAndCategoriesRepo.kt
@@ -125,6 +125,12 @@ class VisitReasonsAndCategoriesRepo @Inject constructor(
     suspend fun getVisitDbByPatientIDAndBenVisitNo(patientID: String, benVisitNo: Int) : VisitDB?{
         return visitReasonsAndCategoriesDao.getVisitDbByBenRegIdAndBenVisitNo(patientID, benVisitNo)
     }
+
+    suspend fun getLatestVisitDbByPatientIDAndBenVisitNo(patientID: String, benVisitNo: Int): VisitDB? {
+        return withContext(Dispatchers.IO) {
+            visitReasonsAndCategoriesDao.getLatestVisitDbByPatientIDAndBenVisitNo(patientID, benVisitNo)
+        }
+    }
      fun getVisitDbByPatientIDAndBenVisitNo(patientID: String) : LiveData<String?>{
         return visitReasonsAndCategoriesDao.getLatestVisitIdByPatientId(patientID)
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/BindingUtils.kt b/app/src/main/java/org/piramalswasthya/cho/ui/BindingUtils.kt
index 159a11b8a..90396ff7d 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/BindingUtils.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/BindingUtils.kt
@@ -21,6 +21,7 @@ import android.widget.RadioGroup.LayoutParams
 import androidx.annotation.RequiresApi
 import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
 import com.bumptech.glide.Glide
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.divider.MaterialDivider
@@ -31,7 +32,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.helpers.Konstants
+import org.piramalswasthya.cho.model.AbortionDomain
 import org.piramalswasthya.cho.model.AncFormState
+import org.piramalswasthya.cho.model.InfantRegDomain
 import org.piramalswasthya.cho.model.AncFormState.*
 //import org.piramalswasthya.cho.model.BenBasicDomain
 import org.piramalswasthya.cho.model.FormInputOld
@@ -87,6 +90,21 @@ fun Button.setVaccineState(syncState: VaccineState?) {
     }
 }
 
+@BindingAdapter("abortionActionText")
+fun Button.setAbortionActionText(item: AbortionDomain?) {
+    item ?: return
+    text = context.getString(
+        if (item.isAbortionFormFilled) Resource.string.view else Resource.string.add
+    )
+}
+
+@BindingAdapter("infantRegActionText")
+fun Button.setInfantRegActionText(item: InfantRegDomain?) {
+    item ?: return
+    text = context.getString(
+        if (item.shouldShowRegisterAction()) Resource.string.register else Resource.string.view
+    )
+}
 
 @BindingAdapter("scope", "recordCount")
 fun TextView.setRecordCount(scope: CoroutineScope, count: Flow<Int>?) {
@@ -290,21 +308,32 @@ private val rotate = RotateAnimation(
 
 @BindingAdapter("syncState")
 fun ImageView.setSyncState(syncState: SyncState?) {
+    clearAnimation()
     syncState?.let {
         visibility = View.VISIBLE
         val drawable = when (it) {
             SyncState.UNSYNCED -> Resource.drawable.ic_unsynced
             SyncState.SYNCING -> Resource.drawable.ic_syncing
             SyncState.SYNCED -> Resource.drawable.ic_synced
-            else -> {
-                Resource.drawable.ic_unsynced
-            }
+            else -> Resource.drawable.ic_unsynced
         }
         setImageResource(drawable)
+        imageTintList = android.content.res.ColorStateList.valueOf(
+            ContextCompat.getColor(
+                context,
+                when (it) {
+                    SyncState.SYNCED -> android.R.color.holo_green_dark
+                    SyncState.UNSYNCED -> android.R.color.holo_red_dark
+                    SyncState.SYNCING -> android.R.color.holo_orange_light
+                    else -> android.R.color.darker_gray
+                }
+            )
+        )
         isClickable = it == SyncState.UNSYNCED
         if (it == SyncState.SYNCING) startAnimation(rotate)
     } ?: run {
         visibility = View.INVISIBLE
+        isClickable = false
     }
 }
 
@@ -424,4 +453,3 @@ fun TextView.setAsteriskTextView(required: Boolean?, title: String?) {
     }
 }
 
-
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormFragment.kt
new file mode 100644
index 000000000..7e5baa57a
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormFragment.kt
@@ -0,0 +1,71 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentEarDiagnosisFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class EarDiagnosisFormFragment :
+    BaseAssessmentFormFragment<EarDiagnosisFormViewModel>() {
+
+    private var _binding: FragmentEarDiagnosisFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: EarDiagnosisFormViewModel by viewModels()
+
+    // ── View references ───────────────────────────────────────────────────────
+
+    override val inputFormRecyclerView: RecyclerView get() = binding.form.rvInputForm
+    override val contentLayout: View get() = binding.llContent
+    override val progressBar: View get() = binding.pbForm
+    override val benNameTextView: TextView get() = binding.tvBenName
+    override val ageGenderTextView: TextView get() = binding.tvAgeGender
+    override val submitButton: View get() = binding.btnSubmit
+    override val cancelButton: View get() = binding.btnCancel
+
+    // ── Form-specific values ──────────────────────────────────────────────────
+
+    override fun getFormTitle(): String = getString(R.string.title_ear_diagnosis)
+    override fun getSaveSuccessMessage(): String = getString(R.string.ear_diagnosis_saved)
+    override fun getFormFlow(): Flow<List<FormElement>> = viewModel.formList
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+    override fun onSaveForm() = viewModel.saveForm()
+    override fun getFragmentId(): Int = R.id.fragment_ear_diagnosis_form
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentEarDiagnosisFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()  // shows bottom_navigation
+        _binding = null
+    }
+
+    // Stamp Ear visit metadata onto MasterDb from arguments and navigate to the vitals screen.
+    override fun onSaveSuccess() {
+        WorkerUtils.earPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.ear,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormViewModel.kt
new file mode 100644
index 000000000..4e4772416
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/EarDiagnosisFormViewModel.kt
@@ -0,0 +1,83 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.content.Context
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.EarDiagnosisDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+import org.piramalswasthya.cho.repositories.EarDiagnosisRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class EarDiagnosisFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val earDiagnosisRepo: EarDiagnosisRepo
+) : BaseFormViewModel() {
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val dataset = EarDiagnosisDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: EarDiagnosisAssessment
+
+    init {
+        setupDatasetCallbacks()
+
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    earDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(
+                        patient.patient.patientID, benVisitNo
+                    )
+                } else {
+                    earDiagnosisRepo.getAssessmentByPatientId(patient.patient.patientID)
+                }
+
+                assessmentCache = existingRecord ?: EarDiagnosisAssessment(
+                    patientId = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                dataset.setUpPage(savedRecord = existingRecord)
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing EarDiagnosisFormViewModel")
+            }
+        }
+    }
+
+    private fun setupDatasetCallbacks() {
+        dataset.onShowAlert = { message ->
+            _showAlert.postValue(message)
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(dataset, formId, index, "Error updating ear diagnosis form")
+    }
+
+    fun saveForm() {
+        launchSave("Saving Ear Diagnosis failed") {
+            check(::assessmentCache.isInitialized) { "Assessment cache not initialized" }
+            dataset.mapValues(assessmentCache, 1)
+            earDiagnosisRepo.saveAssessment(assessmentCache)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormFragment.kt
new file mode 100644
index 000000000..a4ea01208
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormFragment.kt
@@ -0,0 +1,188 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentNoseDiagnosisFormBinding
+import org.piramalswasthya.cho.ui.commons.CphcFormNavigation
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import org.piramalswasthya.cho.ui.commons.NavigationAdapter
+import org.piramalswasthya.cho.work.WorkerUtils
+
+
+@AndroidEntryPoint
+class NoseDiagnosisFormFragment : Fragment(), NavigationAdapter {
+
+    private var _binding: FragmentNoseDiagnosisFormBinding? = null
+    private val binding get() = _binding!!
+
+    private val viewModel: NoseDiagnosisFormViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNoseDiagnosisFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            onBackPressedCallback
+        )
+
+        setupForm()
+        observeViewModel()
+
+        viewModel.benName.observe(viewLifecycleOwner) {
+            binding.tvBenName.text = it
+        }
+
+        viewModel.benAgeGender.observe(viewLifecycleOwner) {
+            binding.tvAgeGender.text = it
+        }
+
+        binding.btnSubmit.setOnClickListener { submitForm() }
+        binding.btnCancel.setOnClickListener { onCancelAction() }
+    }
+
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            onCancelAction()
+        }
+    }
+
+    private fun setupForm() {
+
+        val adapter = FormInputAdapter(
+            formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                viewModel.updateListOnValueChanged(formId, index)
+            },
+            isEnabled = true
+        )
+
+        binding.form.rvInputForm.layoutManager =
+            LinearLayoutManager(requireContext())
+
+        binding.form.rvInputForm.adapter = adapter
+
+        lifecycleScope.launch {
+            viewModel.formList.collect { list ->
+                if (list.isNotEmpty()) {
+                    adapter.submitList(list)
+                }
+            }
+        }
+
+        (activity as? AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.title_nose_diagnosis)
+
+        activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.GONE
+    }
+
+    private fun observeViewModel() {
+
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                BaseFormViewModel.State.IDLE -> Unit
+
+                BaseFormViewModel.State.SAVING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                }
+
+                BaseFormViewModel.State.SAVE_SUCCESS -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    WorkerUtils.nosePushWorker(requireContext())
+                    Toast.makeText(context, getString(R.string.nose_diagnosis_saved), Toast.LENGTH_LONG).show()
+                    // Prevent re-delivery of SAVE_SUCCESS when returning from Vitals via back/cancel.
+                    viewModel.resetState()
+                    findNavController().navigate(
+                        org.piramalswasthya.cho.R.id.customVitalsFragment,
+                        CphcFormNavigation.buildVitalsBundle(
+                            arguments = arguments,
+                            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.nose,
+                            reasonForVisit = org.piramalswasthya.cho.ui.commons.DropdownConst.nose,
+                        ),
+                    )
+                }
+
+                BaseFormViewModel.State.SAVE_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(context, getString(R.string.save_failed_retry), Toast.LENGTH_LONG).show()
+                }
+                else -> Unit
+            }
+        }
+
+        viewModel.showAlert.observe(viewLifecycleOwner) { message ->
+            message?.let {
+                AlertDialog.Builder(requireContext())
+                    .setTitle(getString(R.string.alert))
+                    .setMessage(it)
+                    .setPositiveButton(getString(R.string.ok_button)) { dialog, _ ->
+                        dialog.dismiss()
+                        viewModel.clearAlert()
+                    }
+                    .setCancelable(false)
+                    .show()
+            }
+        }
+    }
+
+    private fun submitForm() {
+        val adapter = binding.form.rvInputForm.adapter as? FormInputAdapter ?: return
+
+        val result = adapter.validateInput(resources)
+        if (result == -1) {
+            viewModel.saveForm()
+        } else {
+            binding.form.rvInputForm.scrollToPosition(result)
+        }
+    }
+
+    override fun onSubmitAction() {
+        submitForm()
+    }
+
+    override fun onCancelAction() {
+        if (!findNavController().navigateUp()) {
+            onBackPressedCallback.remove()
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+    }
+
+    override fun getFragmentId(): Int =
+        R.id.fragment_nose_diagnosis_form
+
+    override fun onDestroyView() {
+        activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.VISIBLE
+        super.onDestroyView()
+        _binding = null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormViewModel.kt
new file mode 100644
index 000000000..26f585767
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/NoseDiagnosisFormViewModel.kt
@@ -0,0 +1,100 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.NoseDiagnosisDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+import org.piramalswasthya.cho.repositories.NoseDiagnosisRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class NoseDiagnosisFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val noseDiagnosisRepo: NoseDiagnosisRepo
+) : BaseFormViewModel() {
+
+    /* -------------------- BEN DETAILS -------------------- */
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    /* -------------------- DATASET -------------------- */
+
+    private val dataset =
+        NoseDiagnosisDataset(context, preferenceDao.getCurrentLanguage())
+
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: NoseDiagnosisAssessment
+
+    init {
+        setupDatasetCallbacks()
+
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                if (benVisitNo == null) {
+                    Timber.e("Missing benVisitNo ($benVisitNo)")
+                    return@launch
+                }
+
+                val existingRecord = noseDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(
+                    patient.patient.patientID,
+                    benVisitNo
+                )
+
+                assessmentCache = existingRecord ?: NoseDiagnosisAssessment(
+                    patientId = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                dataset.setUpPage(savedRecord = existingRecord)
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing NoseDiagnosisFormViewModel")
+            }
+        }
+    }
+
+    private fun setupDatasetCallbacks() {
+        dataset.onShowAlert = { message ->
+            Timber.Forest.d("Dataset requested alert: $message")
+            _showAlert.postValue(message)
+        }
+    }
+
+    /* -------------------- FORM EVENTS -------------------- */
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        Timber.d("updateListOnValueChanged: formId=$formId, index=$index")
+        launchUpdateList(dataset, formId, index, "Error updating nose diagnosis form")
+    }
+
+    fun saveForm() {
+        launchSave("Saving Nose Diagnosis failed") {
+            check(::assessmentCache.isInitialized) { "Assessment cache not initialized" }
+            dataset.mapValues(assessmentCache, 1)
+            noseDiagnosisRepo.saveAssessment(assessmentCache)
+            Timber.d("Nose Diagnosis saved successfully")
+        }
+    }
+}
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormFragment.kt
new file mode 100644
index 000000000..9424dfe02
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormFragment.kt
@@ -0,0 +1,113 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentThroatDiagnosisFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.MasterDb
+import org.piramalswasthya.cho.model.VisitMasterDb
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.ui.commons.DropdownConst
+import org.piramalswasthya.cho.work.WorkerUtils
+import androidx.navigation.fragment.findNavController
+
+@AndroidEntryPoint
+class ThroatDiagnosisFormFragment :
+    BaseAssessmentFormFragment<ThroatDiagnosisFormViewModel>() {
+
+    private var _binding: FragmentThroatDiagnosisFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: ThroatDiagnosisFormViewModel by viewModels()
+
+    // ── View references ───────────────────────────────────────────────────────
+
+    override val inputFormRecyclerView: RecyclerView get() = binding.form.rvInputForm
+    override val contentLayout: View get() = binding.llContent
+    override val progressBar: View get() = binding.pbForm
+    override val benNameTextView: TextView get() = binding.tvBenName
+    override val ageGenderTextView: TextView get() = binding.tvAgeGender
+    override val submitButton: View get() = binding.btnSubmit
+    override val cancelButton: View get() = binding.btnCancel
+
+    // ── Form-specific values ──────────────────────────────────────────────────
+
+    override fun getFormTitle(): String = getString(R.string.title_throat_diagnosis)
+    override fun getSaveSuccessMessage(): String = getString(R.string.throat_diagnosis_saved)
+    override fun getFormFlow(): Flow<List<FormElement>> = viewModel.formList
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+    override fun onSaveForm() = viewModel.saveForm()
+    override fun getFragmentId(): Int = R.id.throatDiagnosisFormFragment
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentThroatDiagnosisFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observeMultiSelect()
+    }
+
+    // ── Throat-specific: multi-select dialog ──────────────────────────────────
+
+    private fun observeMultiSelect() {
+        viewModel.triggerMultiSelect.observe(viewLifecycleOwner) { data ->
+            data ?: return@observe
+            val selectedItemsList = mutableListOf<String>()
+            AlertDialog.Builder(requireContext())
+                .setTitle(data.title)
+                .setMultiChoiceItems(data.items, data.selectedItems) { _, which, isChecked ->
+                    data.selectedItems[which] = isChecked
+                }
+                .setPositiveButton(getString(android.R.string.ok)) { _, _ ->
+                    for (i in data.selectedItems.indices) {
+                        if (data.selectedItems[i]) selectedItemsList.add(data.items[i])
+                    }
+                    viewModel.updateMultiSelectValue(data.formId, selectedItemsList)
+                    val adapter = binding.form.rvInputForm.adapter as? FormInputAdapter
+                    adapter?.let { adp ->
+                        val position = adp.currentList.indexOfFirst { it.id == data.formId }
+                        if (position != -1) adp.notifyItemChanged(position)
+                    }
+                    viewModel.onMultiSelectDialogDismissed()
+                }
+                .setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
+                    dialog.dismiss()
+                    viewModel.onMultiSelectDialogDismissed()
+                }
+                .show()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    // Stamp Throat visit metadata onto MasterDb from arguments and navigate to vitals; replaces fresh MasterDb construction that lost chief-complaint data.
+    override fun onSaveSuccess() {
+        WorkerUtils.throatPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.throat,
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormViewModel.kt
new file mode 100644
index 000000000..625862630
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ENT/ThroatDiagnosisFormViewModel.kt
@@ -0,0 +1,146 @@
+package org.piramalswasthya.cho.ui.ENT
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.ThroatDiagnosisDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
+import org.piramalswasthya.cho.repositories.ThroatDiagnosisRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class ThroatDiagnosisFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val throatDiagnosisRepo: ThroatDiagnosisRepo
+) : BaseFormViewModel() {
+
+    /* -------------------- MULTI-SELECT -------------------- */
+
+    private val _triggerMultiSelect = MutableLiveData<MultiSelectData?>()
+    val triggerMultiSelect: LiveData<MultiSelectData?> get() = _triggerMultiSelect
+
+    data class MultiSelectData(
+        val formId: Int,
+        val title: String,
+        val items: Array<String>,
+        val selectedItems: BooleanArray
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is MultiSelectData) return false
+            return formId == other.formId &&
+                title == other.title &&
+                items.contentEquals(other.items) &&
+                selectedItems.contentEquals(other.selectedItems)
+        }
+
+        override fun hashCode(): Int {
+            var result = formId
+            result = 31 * result + title.hashCode()
+            result = 31 * result + items.contentHashCode()
+            result = 31 * result + selectedItems.contentHashCode()
+            return result
+        }
+    }
+
+    /* -------------------- BEN DETAILS -------------------- */
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    /* -------------------- DATASET -------------------- */
+
+    private val dataset =
+        ThroatDiagnosisDataset(context, preferenceDao.getCurrentLanguage())
+
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: ThroatDiagnosisAssessment
+
+    init {
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    throatDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(
+                        patient.patient.patientID,
+                        benVisitNo
+                    )
+                } else {
+                    throatDiagnosisRepo.getAssessmentByPatientId(patient.patient.patientID)
+                }
+
+                assessmentCache = existingRecord ?: ThroatDiagnosisAssessment(
+                    patientId = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                setupDatasetCallbacks()
+
+                dataset.setUpPage(savedRecord = existingRecord)
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing ThroatDiagnosisFormViewModel")
+            }
+        }
+    }
+
+    private fun setupDatasetCallbacks() {
+        dataset.onShowAlert = { message ->
+            _showAlert.postValue(message)
+        }
+
+        dataset.onTriggerMultiSelect = { formId, title, items, selectedItems ->
+            _triggerMultiSelect.value =
+                MultiSelectData(formId, title, items, selectedItems)
+        }
+    }
+
+    /* -------------------- FORM EVENTS -------------------- */
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(dataset, formId, index, "Error updating throat diagnosis form")
+    }
+
+    fun onMultiSelectClick(formId: Int) {
+        dataset.triggerMultiSelect(formId)
+    }
+
+    fun updateMultiSelectValue(formId: Int, selectedItems: List<String>) {
+        viewModelScope.launch {
+            try {
+                dataset.updateMultiSelectValue(formId, selectedItems)
+            } catch (e: Exception) {
+                Timber.e(e, "Error updating multi-select value")
+            }
+        }
+    }
+
+    fun onMultiSelectDialogDismissed() {
+        _triggerMultiSelect.value = null
+    }
+
+    fun saveForm() {
+        launchSave("Saving Throat Diagnosis failed") {
+            check(::assessmentCache.isInitialized) { "Assessment cache not initialized" }
+            dataset.mapValues(assessmentCache, 1)
+            throatDiagnosisRepo.saveAssessment(assessmentCache)
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_id/aadhaar_num_asha/AadhaarNumberAshaFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_id/aadhaar_num_asha/AadhaarNumberAshaFragment.kt
index ca67fa5cd..aeb7ad45e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_id/aadhaar_num_asha/AadhaarNumberAshaFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_id/aadhaar_num_asha/AadhaarNumberAshaFragment.kt
@@ -156,7 +156,7 @@ class AadhaarNumberAshaFragment : Fragment() {
                 viewModel.aadhaarNumber.value = binding.tietAadhaarNumber.text.toString()
                 parentViewModel.navigateToAadhaarConsent(true)
             }else{
-                Toast.makeText(requireContext(),"Please Enter Beneficiary Name",Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), getString(R.string.please_enter_beneficiary_name), Toast.LENGTH_SHORT).show()
             }
             // aadhaarDisclaimer.show()
         }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpFragment.kt
index 9b8457304..4b246c8b0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpFragment.kt
@@ -90,7 +90,7 @@ class AadhaarOtpFragment : Fragment() {
         }
 
         if (parentViewModel.abhaMode.value == AadhaarIdViewModel.Abha.SEARCH) {
-            binding.textView6.text = "Verify ABHA OTP"
+            binding.textView6.text = getString(R.string.verify_abha_otp)
         }
 
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpViewModel.kt
index c34ac6e02..73a6679d4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/aadhaar_otp/AadhaarOtpViewModel.kt
@@ -128,7 +128,11 @@ class AadhaarOtpViewModel @Inject constructor(
                         _name =
                             result.data.ABHAProfile.firstName + " " + result.data.ABHAProfile.lastName
                     }
-                    _phrAddress = result.data.ABHAProfile.phrAddress!![0]
+                    try {
+                        _phrAddress = result.data.ABHAProfile.phrAddress!![0]
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
                     _abhaNumber = result.data.ABHAProfile.ABHANumber
 
                     val gsonData = Gson().toJson(result.data)
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/create_abha_id/CreateAbhaFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/create_abha_id/CreateAbhaFragment.kt
index edd3d9448..410309a52 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/create_abha_id/CreateAbhaFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/abha_id_activity/create_abha_id/CreateAbhaFragment.kt
@@ -5,6 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
+import android.content.ContentValues
 import android.content.Intent
 import android.media.MediaScannerConnection
 import android.net.Uri
@@ -27,6 +28,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
+import android.provider.MediaStore
 import androidx.work.Operation
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
@@ -109,9 +111,9 @@ class CreateAbhaFragment : Fragment() {
 
     private val beneficiaryDisclaimer by lazy {
         AlertDialog.Builder(requireContext())
-            .setTitle("beneficiary abha mapping.")
-            .setMessage("linking abha to beneficiary")
-            .setPositiveButton("Ok") { dialog, _ -> dialog.dismiss() }
+            .setTitle(getString(R.string.beneficiary_abha_mapping))
+            .setMessage(getString(R.string.linking_abha_to_beneficiary))
+            .setPositiveButton(getString(R.string.ok_button)) { dialog, _ -> dialog.dismiss() }
             .create()
     }
 
@@ -253,27 +255,58 @@ class CreateAbhaFragment : Fragment() {
     }
 
     private fun showFileNotification(fileStr: ResponseBody) {
-        val fileName =
-            "${benId}_${System.currentTimeMillis()}.png"
+        val fileName = "${benId}_${System.currentTimeMillis()}.png"
         val notificationManager =
             requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel = NotificationChannel(
-                channelId, channelId,
+                channelId,
+                channelId,
                 NotificationManager.IMPORTANCE_HIGH
             )
             notificationManager.createNotificationChannel(channel)
         }
-        val directory =
-            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-        val file = File(directory, fileName)
-        FileOutputStream(file).use { stream -> stream.write(fileStr.bytes()) }
-        MediaScannerConnection.scanFile(
-            requireContext(),
-            arrayOf(file.toString()),
-            null,
-        ) { _, uri ->
-            run {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val resolver = requireContext().contentResolver
+            val contentValues = ContentValues().apply {
+                put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
+                put(MediaStore.MediaColumns.MIME_TYPE, "image/png")
+                put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
+                put(MediaStore.MediaColumns.IS_PENDING, 1)
+            }
+
+            val collection =
+                MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+            val itemUri = resolver.insert(collection, contentValues)
+
+            if (itemUri != null) {
+                resolver.openOutputStream(itemUri)?.use { stream ->
+                    stream.write(fileStr.bytes())
+                }
+                contentValues.clear()
+                contentValues.put(MediaStore.MediaColumns.IS_PENDING, 0)
+                resolver.update(itemUri, contentValues, null, null)
+
+                showDownload(fileName, itemUri, notificationManager)
+            } else {
+                Toast.makeText(
+                    requireContext(),
+                    getString(R.string.download_failed_retry),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        } else {
+            val directory =
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+            val file = File(directory, fileName)
+            FileOutputStream(file).use { stream -> stream.write(fileStr.bytes()) }
+            MediaScannerConnection.scanFile(
+                requireContext(),
+                arrayOf(file.toString()),
+                null,
+            ) { _, uri ->
                 showDownload(fileName, uri, notificationManager)
             }
         }
@@ -363,7 +396,7 @@ class CreateAbhaFragment : Fragment() {
                 }
 
                 is Operation.State.FAILURE -> {
-                    Toast.makeText(context, "Failed to download , Please retry", Toast.LENGTH_SHORT)
+                    Toast.makeText(context, getString(R.string.download_failed_retry), Toast.LENGTH_SHORT)
                         .show()
                 }
             }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseAssessmentFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseAssessmentFormFragment.kt
new file mode 100644
index 000000000..622655741
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseAssessmentFormFragment.kt
@@ -0,0 +1,224 @@
+package org.piramalswasthya.cho.ui.commons
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.model.FormElement
+
+/**
+ * Base [Fragment] for single-page assessment / diagnosis forms.
+ *
+ * Concrete subclasses must:
+ *  - provide view references via the abstract `val` properties (delegating to their
+ *    specific ViewBinding after inflation)
+ *  - implement the handful of abstract methods that carry form-specific values
+ *  - call `super.onDestroyView()` **before** nulling their `_binding`
+ *
+ * @param VM  A [BaseFormViewModel] subclass that drives this form.
+ */
+abstract class BaseAssessmentFormFragment<VM : BaseFormViewModel> : Fragment(), NavigationAdapter {
+
+    // ── Required ViewModel ────────────────────────────────────────────────────
+
+    protected abstract val viewModel: VM
+
+    // ── View references (delegated to concrete binding in subclass) ───────────
+
+    protected abstract val inputFormRecyclerView: RecyclerView
+    protected abstract val contentLayout: View
+    protected abstract val progressBar: View
+    protected abstract val benNameTextView: TextView
+    protected abstract val ageGenderTextView: TextView
+    protected abstract val submitButton: View
+    protected abstract val cancelButton: View
+
+    // ── Form-specific overrides ───────────────────────────────────────────────
+
+    /** ActionBar title for this form. */
+    protected abstract fun getFormTitle(): String
+
+    /** Toast text shown on SAVE_SUCCESS. */
+    protected abstract fun getSaveSuccessMessage(): String
+
+    /** StateFlow / SharedFlow of [FormElement] lists supplied by the ViewModel. */
+    protected abstract fun getFormFlow(): Flow<List<FormElement>>
+
+    /** Called when a form value changes; delegates to ViewModel. */
+    protected abstract fun onUpdateFormValue(formId: Int, index: Int)
+
+    /** Triggers the ViewModel save. */
+    protected abstract fun onSaveForm()
+
+    // ── Back-press ────────────────────────────────────────────────────────────
+
+    protected val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() = onCancelAction()
+    }
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    @Suppress("DEPRECATION")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requireActivity().onBackPressedDispatcher
+            .addCallback(viewLifecycleOwner, onBackPressedCallback)
+
+        setupFormAdapter()
+        observeState()
+        observeAlert()
+
+        viewModel.benName.observe(viewLifecycleOwner) { benNameTextView.text = it }
+        viewModel.benAgeGender.observe(viewLifecycleOwner) { ageGenderTextView.text = it }
+
+        submitButton.setOnClickListener { submitForm() }
+        cancelButton.setOnClickListener { onCancelAction() }
+    }
+
+    // ── Form adapter ──────────────────────────────────────────────────────────
+
+    private fun setupFormAdapter() {
+        val adapter = FormInputAdapter(
+            formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                onUpdateFormValue(formId, index)
+            },
+            isEnabled = true
+        )
+
+        inputFormRecyclerView.layoutManager = LinearLayoutManager(requireContext())
+        inputFormRecyclerView.adapter = adapter
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            getFormFlow().collect { list ->
+                if (list.isNotEmpty()) {
+                    adapter.submitList(list.toMutableList()) {
+                        //This are required to reflected without requiring manual scroll.
+                        inputFormRecyclerView.post { adapter.notifyDataSetChanged() }
+                    }
+                }
+            }
+        }
+
+        (activity as? AppCompatActivity)?.supportActionBar?.title = getFormTitle()
+        activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.GONE
+    }
+
+    // ── State / alert observers ───────────────────────────────────────────────
+
+    private fun observeState() {
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                BaseFormViewModel.State.IDLE -> Unit
+
+                BaseFormViewModel.State.SAVING -> {
+                    contentLayout.visibility = View.GONE
+                    progressBar.visibility = View.VISIBLE
+                }
+
+                BaseFormViewModel.State.SAVE_SUCCESS -> {
+                    contentLayout.visibility = View.VISIBLE
+                    progressBar.visibility = View.GONE
+                    Toast.makeText(requireContext(), getSaveSuccessMessage(), Toast.LENGTH_LONG).show()
+                    viewModel.resetState() // Reset to IDLE so back-stack re-delivery does not retrigger onSaveSuccess().
+                    onSaveSuccess()
+                }
+
+                BaseFormViewModel.State.SAVE_FAILED -> {
+                    contentLayout.visibility = View.VISIBLE
+                    progressBar.visibility = View.GONE
+                    Toast.makeText(requireContext(), getString(R.string.form_save_failed), Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    /** Override in subclasses to customise post-save navigation. Default: pop back. */
+    protected open fun onSaveSuccess() {
+        findNavController().navigateUp()
+    }
+
+    protected fun navigateToCphcVitalsAfterSave(
+        subCategory: String,
+        reasonForVisit: String? = null,
+        category: String = CphcFormNavigation.OTHER_CPHC_CATEGORY,
+        requireMasterDb: Boolean = false,
+    ) {
+        findNavController().navigate(
+            R.id.customVitalsFragment,
+            CphcFormNavigation.buildVitalsBundle(
+                arguments = arguments,
+                category = category,
+                subCategory = subCategory,
+                reasonForVisit = reasonForVisit,
+                requireMasterDb = requireMasterDb,
+            ),
+        )
+    }
+
+    private fun observeAlert() {
+        viewModel.showAlert.observe(viewLifecycleOwner) { message ->
+            message?.let { showAlertDialog(it) }
+        }
+    }
+
+    private fun showAlertDialog(message: String) {
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.form_alert_title))
+            .setMessage(message)
+            .setPositiveButton("OK") { dialog, _ ->
+                dialog.dismiss()
+                viewModel.clearAlert()
+            }
+            .setCancelable(false)
+            .show()
+    }
+
+
+    protected fun submitForm() {
+        val adapter = inputFormRecyclerView.adapter as? FormInputAdapter ?: return
+        val result = adapter.validateInput(resources)
+        if (result == -1) {
+            onSaveForm()
+        } else {
+            val fieldName = adapter.currentList.getOrNull(result)?.title ?: getString(R.string.form_input_empty_error)
+            Toast.makeText(
+                requireContext(),
+                getString(R.string.form_fill_field_error, fieldName),
+                Toast.LENGTH_SHORT
+            ).show()
+            inputFormRecyclerView.scrollToPosition(result)
+        }
+    }
+
+    override fun onSubmitAction() = submitForm()
+
+    override fun onCancelAction() {
+        onBackPressedCallback.isEnabled = false
+        if (!findNavController().navigateUp()) {
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.VISIBLE
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseFormViewModel.kt
new file mode 100644
index 000000000..bf80f2b14
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/BaseFormViewModel.kt
@@ -0,0 +1,118 @@
+package org.piramalswasthya.cho.ui.commons
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.Dataset
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import timber.log.Timber
+
+/**
+ * Base ViewModel that holds UI-state boilerplate shared by all single-page
+ * assessment/diagnosis form screens (State enum, showAlert, form load/save
+ * state, beneficiary header LiveData).
+ *
+ * Subclasses should use the protected backing fields directly and call
+ * [clearAlert] through the public API exposed here.
+ */
+abstract class BaseFormViewModel : ViewModel() {
+
+    // ── Save / Load state ────────────────────────────────────────────────────
+
+    enum class State {
+        IDLE, SAVING, SAVE_SUCCESS, SAVE_FAILED
+    }
+
+    protected val _state = MutableLiveData(State.IDLE)
+    val state: LiveData<State> get() = _state
+
+    // ── Alert message ────────────────────────────────────────────────────────
+
+    protected val _showAlert = MutableLiveData<String?>()
+    val showAlert: LiveData<String?> get() = _showAlert
+
+    fun clearAlert() {
+        _showAlert.value = null
+    }
+
+    /** Resets [state] back to [State.IDLE]. Call after consuming [State.SAVE_SUCCESS]. */
+    fun resetState() {
+        _state.value = State.IDLE
+    }
+
+    // ── Beneficiary header info ──────────────────────────────────────────────
+
+    protected val _benName = MutableLiveData<String>()
+    val benName: LiveData<String> get() = _benName
+
+    protected val _benAgeGender = MutableLiveData<String>()
+    val benAgeGender: LiveData<String> get() = _benAgeGender
+
+    // ── Shared init helper ───────────────────────────────────────────────────
+
+    /**
+     * Loads the logged-in user and the patient for [patientID], populates
+     * [benName] / [benAgeGender], and returns the [PatientDisplay].
+     * Returns `null` (and logs an error) if either is missing.
+     */
+    protected suspend fun loadPatientDetails(
+        userRepo: UserRepo,
+        patientRepo: PatientRepo,
+        patientID: String?
+    ): PatientDisplay? {
+        val user = userRepo.getLoggedInUser()
+        if (user == null) {
+            Timber.e("No logged in user found")
+            return null
+        }
+
+        val patient = patientID?.let { patientRepo.getPatientDisplay(it) }
+        if (patient == null) {
+            Timber.e("Patient not found for ID: $patientID")
+            return null
+        }
+
+        _benName.value = "${patient.patient.firstName} ${patient.patient.lastName ?: ""}"
+        _benAgeGender.value =
+            "${patient.patient.age} ${patient.ageUnit?.name} | ${patient.gender?.genderName}"
+
+        return patient
+    }
+
+
+    // ── Shared coroutine helpers ─────────────────────────────────────────────
+
+    /**
+     * Launches a coroutine that calls [dataset].updateList and logs any error.
+     */
+    protected fun launchUpdateList(dataset: Dataset, formId: Int, index: Int, errorTag: String) {
+        viewModelScope.launch {
+            try {
+                dataset.updateList(formId, index)
+            } catch (e: Exception) {
+                Timber.e(e, errorTag)
+            }
+        }
+    }
+
+    /**
+     * Launches a save coroutine: sets SAVING state, runs [block], then
+     * posts SAVE_SUCCESS or SAVE_FAILED.
+     */
+    protected fun launchSave(errorTag: String, block: suspend () -> Unit) {
+        viewModelScope.launch {
+            try {
+                _state.postValue(State.SAVING)
+                block()
+                _state.postValue(State.SAVE_SUCCESS)
+            } catch (e: Exception) {
+                Timber.e(e, errorTag)
+                _state.postValue(State.SAVE_FAILED)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormNavigation.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormNavigation.kt
new file mode 100644
index 000000000..0a5339c20
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormNavigation.kt
@@ -0,0 +1,43 @@
+package org.piramalswasthya.cho.ui.commons
+
+import android.os.Bundle
+import org.piramalswasthya.cho.model.MasterDb
+import org.piramalswasthya.cho.model.VisitMasterDb
+
+object CphcFormNavigation {
+
+    const val OTHER_CPHC_CATEGORY = "Other CPHC Services"
+
+    fun buildVitalsBundle(
+        arguments: Bundle?,
+        subCategory: String,
+        reasonForVisit: String? = null,
+        category: String = OTHER_CPHC_CATEGORY,
+        requireMasterDb: Boolean = false,
+    ): Bundle {
+        val masterDb = (arguments?.getSerializable("MasterDb") as? MasterDb)
+            ?: if (requireMasterDb) {
+                error("MasterDb is required but was not provided")
+            } else {
+                MasterDb(
+                    patientId = arguments?.getString("patientID").orEmpty(),
+                    visitMasterDb = VisitMasterDb(),
+                )
+            }
+
+        masterDb.visitMasterDb?.apply {
+            this.category = category
+            this.subCategory = subCategory
+            this.reason = reasonForVisit
+                ?.takeIf { it.isNotBlank() }
+                ?: arguments?.getString("reasonForVisit")?.takeIf { it.isNotBlank() }
+                ?: this.reason?.takeIf { it.isNotBlank() }
+                ?: subCategory
+        }
+
+        return Bundle().apply {
+            putSerializable("MasterDb", masterDb)
+            arguments?.getInt("benVisitNo", -1)?.takeIf { it > 0 }?.let { putInt("benVisitNo", it) }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormTypeResolver.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormTypeResolver.kt
new file mode 100644
index 000000000..7ede47975
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/CphcFormTypeResolver.kt
@@ -0,0 +1,51 @@
+package org.piramalswasthya.cho.ui.commons
+
+enum class CphcFormType {
+    EAR,
+    NOSE,
+    THROAT,
+    ORAL,
+    OPHTHALMIC,
+    ELDERLY,
+    MENTAL,
+    PAIN,
+    PSYCHOSOCIAL,
+    UNKNOWN,
+}
+
+object CphcFormTypeResolver {
+
+    fun resolve(reasonForVisit: String?, subCategory: String?): CphcFormType {
+        val key = (reasonForVisit?.takeIf { it.isNotBlank() } ?: subCategory)
+            ?.trim()
+            ?.lowercase()
+            .orEmpty()
+        if (key.isEmpty()) return CphcFormType.UNKNOWN
+
+        return when (key) {
+            DropdownConst.ear.lowercase() -> CphcFormType.EAR
+            DropdownConst.nose.lowercase() -> CphcFormType.NOSE
+            DropdownConst.throat.lowercase() -> CphcFormType.THROAT
+            DropdownConst.dental.lowercase() -> CphcFormType.ORAL
+            DropdownConst.elderlyHealthAssessment.lowercase(),
+            DropdownConst.functionalDeclineOrDependency.lowercase() -> CphcFormType.ELDERLY
+            DropdownConst.persistentPain.lowercase(),
+            DropdownConst.distressingSymptoms.lowercase() -> CphcFormType.PAIN
+            DropdownConst.psychosocialCaregiverSupport.lowercase(),
+            DropdownConst.caregiverSupportCounselling.lowercase() -> CphcFormType.PSYCHOSOCIAL
+            DropdownConst.mentalHealth.lowercase(),
+            DropdownConst.mentalHealthScreening.lowercase(),
+            DropdownConst.emotionalBehaviouralConcerns.lowercase(),
+            DropdownConst.substanceUseConcerns.lowercase(),
+            DropdownConst.selfHarmSuicideThoughts.lowercase(),
+            DropdownConst.memoryLossConfusion.lowercase(),
+            DropdownConst.seizuresFitsLoc.lowercase() -> CphcFormType.MENTAL
+            DropdownConst.screening.lowercase(),
+            DropdownConst.REASON_SYMPTOMATIC.lowercase(),
+            DropdownConst.REASON_FIRST_AID_EYE_INJURY.lowercase(),
+            DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA.lowercase(),
+            DropdownConst.ophthalmic.lowercase() -> CphcFormType.OPHTHALMIC
+            else -> CphcFormType.UNKNOWN
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/DropdownConst.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/DropdownConst.kt
index 33c1f0f60..61674d008 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/DropdownConst.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/DropdownConst.kt
@@ -4,21 +4,197 @@ class DropdownConst {
     companion object {
 
         val careAndPreg: String = "Care in Pregnancy & Childbirth"
+        val pwr: String = "Pregnant Women Registration"
+        val pregnancyRegistration: String = "Pregnancy Registration"
         val anc: String = "ANC"
         val pnc: String = "PNC"
+        val deliveryOutcome: String = "Delivery Outcome"
 
         val fpAndOtherRep: String = "Family Planning, Contraceptives Services & other Reproductive Health Care Services"
         val fpAndCs: String = "Eligible couple tracking"
+        val ncd: String = "Non-Communicable Diseases (NCD)"
         val ncdScreening: String = "NCD screening"
 
         val neonatalAndInfant: String = "Neonatal & Infant Health"
         val immunization: String = "Immunization Services"
+        val ophthalmic: String = "Ophthalmic"
+        val screening: String = "Screening"
+        val ent: String = "ENT"
+        val oral: String = "Oral"
+        val ear: String = "Ear (E)"
+        val nose: String = "Nose (N)"
+        val throat: String = "Throat (T)"
+        val dental: String = "Dental"
+        val entReasons: List<String> = listOf(ear, nose, throat)
+        val oralReasons: List<String> = listOf(dental)
+        val oralChiefComplaints: Set<String> = setOf(
+            "Dental Decay",
+            "Gum diseases",
+            "Irregular arrangement of teeth and jaws",
+            "Abnormal growth, patch or ulcers",
+            "Cleft lip/ palate",
+            "Dental Fluorosis",
+            "Dental Emergencies"
+        )
+        val entChiefComplaints: Set<String> = setOf(
+            "Neck swelling",
+            "Dysphagia",
+            "Cleft lip",
+            "Cleft palate",
+            "Tonsillitis",
+            "Pharyngitis",
+            "Laryngitis",
+            "Sinusitis",
+            "Difficulty in hearing",
+            "Ear wax",
+            "Congenital Ear Malformation",
+            "Foreign body in ear",
+            "open mouth breathing",
+            "Nosebleed",
+            "Foreign body in nose"
+        )
+
+        val elderlyAndPalliative: String = "Elderly & Palliative"
+        val persistentPain: String = "Persistent pain"
+        val caregiverSupportCounselling: String = "Caregiver support / counselling"
+        val psychosocialCaregiverSupport: String = caregiverSupportCounselling
+        val functionalDeclineOrDependency: String = "Functional decline or dependency"
+        val distressingSymptoms: String = "Distressing symptoms"
+        val mentalHealth: String = "Mental Health"
+        val mentalHealthScreening: String = "Mental Health Screening"
+        val elderlyHealthAssessment: String = "General geriatric complaints"
+
+        val emotionalBehaviouralConcerns: String = "Emotional or behavioural concerns"
+        val substanceUseConcerns: String = "Substance use related concerns"
+        val selfHarmSuicideThoughts: String = "Thoughts of self-harm or suicide"
+        val memoryLossConfusion: String = "Memory loss or confusion"
+        val seizuresFitsLoc: String = "Seizures / fits or loss of consciousness"
+
+        val mentalHealthReasons: List<String> = listOf(
+            emotionalBehaviouralConcerns,
+            substanceUseConcerns,
+            selfHarmSuicideThoughts,
+            memoryLossConfusion,
+            seizuresFitsLoc
+        )
+
+        val elderlyAndPalliativeReasons: List<String> = listOf(
+            elderlyHealthAssessment,
+            functionalDeclineOrDependency,
+            persistentPain,
+            distressingSymptoms,
+            caregiverSupportCounselling
+        )
+
+        /** Sub categories available for all genders and age groups. */
+        val cphcSubCategoriesAllAges: List<String> = listOf(ent, ophthalmic, oral)
+
+        val visualAcuityList = listOf("6/6", "6/9", "6/12", "6/18", "6/24", "6/36", "6/60", "<6/60")
+        val visualImpairmentList = listOf("6/18", "6/24", "6/36", "6/60", "<6/60")
+        val nearVisualAcuityList = listOf("N6", "N8", "N10", "N12")
+        val nearVAReducedList = listOf("N8", "N10", "N12")
+
+        const val CHART_SNELLENS = "Snellen's distance chart"
+        const val CHART_NEAR_VISION = "Near vision chart"
+        val visualAcuityChartList = listOf(CHART_SNELLENS, CHART_NEAR_VISION)
+
+        const val REASON_SYMPTOMATIC = "Symptomatic"
+        const val REASON_FIRST_AID_INJURY_TRAUMA = "First aid for eye injury, trauma"
+        const val REASON_FIRST_AID_EYE_INJURY = REASON_FIRST_AID_INJURY_TRAUMA
+        val ophthalmicReasonForVisitList = listOf(
+            screening,
+            REASON_SYMPTOMATIC,
+            REASON_FIRST_AID_INJURY_TRAUMA
+        )
+
+        val reasonForVisitBySubCategory: Map<String, List<String>> = mapOf(
+            ncd to listOf(ncdScreening),
+            ncdScreening to listOf(ncdScreening),
+            ophthalmic to ophthalmicReasonForVisitList,
+            ent to entReasons,
+            oral to oralReasons,
+            elderlyAndPalliative to elderlyAndPalliativeReasons,
+            mentalHealth to mentalHealthReasons,
+        )
+
+        const val CONDITION_CATARACT = "Cataract"
+        const val CONDITION_GLAUCOMA = "Glaucoma"
+        const val CONDITION_DIABETIC_RETINOPATHY = "Diabetic retinopathy"
+        const val CONDITION_PRESBYOPIA = "Presbyopia"
+        const val CONDITION_TRACHOMA = "Trachoma"
+        const val CONDITION_CORNEAL_DISEASE = "Corneal disease"
+        const val CONDITION_CONJUNCTIVITIS = "Conjunctivitis/Acute red eye"
+        const val CONDITION_DRY_EYE = "Dry eye / xerophthalmia"
+        const val CONDITION_DRY_EYE_ALT = "Dry eye/ xerophthalmia"
+        const val CONDITION_EYE_ALLERGY = "Eye allergy"
+
+        val caseIdConditionsList = listOf(
+            CONDITION_CATARACT,
+            CONDITION_GLAUCOMA,
+            CONDITION_DIABETIC_RETINOPATHY,
+            CONDITION_PRESBYOPIA,
+            CONDITION_TRACHOMA,
+            CONDITION_CORNEAL_DISEASE,
+            CONDITION_CONJUNCTIVITIS,
+            CONDITION_DRY_EYE,
+            CONDITION_EYE_ALLERGY
+        )
+
+        const val CONDITION_EYE_INJURY_BLUNT_PENETRATING =
+            "Eye injuries from blunt trauma, penetrating injury to eye,"
+        const val CONDITION_EYE_INJURY_BLUNT_PENETRATING_ALT =
+            "Eye injuries from blunt trauma, penetrating injury to eye"
+        const val CONDITION_CHEMICAL_EXPOSURE = "Chemical exposure (acid/ alkali/other),"
+        const val CONDITION_CHEMICAL_EXPOSURE_ALT = "Chemical exposure (acid/ alkali/other)"
+        const val CONDITION_FOREIGN_BODY_EYE = "Foreign body lodged in the eye"
+
+        val ophthalmicChiefComplaints: Set<String> = setOf(
+            CONDITION_DIABETIC_RETINOPATHY,
+            CONDITION_GLAUCOMA,
+            CONDITION_CATARACT,
+            CONDITION_PRESBYOPIA,
+            CONDITION_TRACHOMA,
+            CONDITION_CORNEAL_DISEASE,
+            CONDITION_CONJUNCTIVITIS,
+            CONDITION_DRY_EYE,
+            CONDITION_DRY_EYE_ALT,
+            CONDITION_EYE_ALLERGY,
+            CONDITION_EYE_INJURY_BLUNT_PENETRATING,
+            CONDITION_EYE_INJURY_BLUNT_PENETRATING_ALT,
+            CONDITION_CHEMICAL_EXPOSURE,
+            CONDITION_CHEMICAL_EXPOSURE_ALT,
+            CONDITION_FOREIGN_BODY_EYE
+        )
+
+        const val INJURY_MECHANICAL_FOREIGN_BODY = "Mechanical foreign body"
+        const val INJURY_BLUNT_TRAUMA = "Blunt trauma"
+        const val INJURY_PENETRATING = "Penetrating injury suspected"
+        const val INJURY_CHEMICAL = "Chemical (acid/alkali/other)"
+        val injuryTypeList = listOf(
+            INJURY_MECHANICAL_FOREIGN_BODY,
+            INJURY_BLUNT_TRAUMA,
+            INJURY_PENETRATING,
+            INJURY_CHEMICAL
+        )
+
+        const val FOREIGN_BODY_NOT_ATTEMPTED = "Not attempted"
+        const val FOREIGN_BODY_ATTEMPTED_CONJUNCTIVAL_SAC = "Attempted from conjunctival sac"
+        const val FOREIGN_BODY_LODGED_IN_CORNEA = "Foreign body lodged in cornea"
+        val foreignBodyRemovalOptions = listOf(
+            FOREIGN_BODY_NOT_ATTEMPTED,
+            FOREIGN_BODY_ATTEMPTED_CONJUNCTIVAL_SAC,
+            FOREIGN_BODY_LODGED_IN_CORNEA
+        )
+
+        const val TRACHOMA_SUSPECTED_ACTIVE = "Suspected active trachoma"
+        const val TRACHOMA_SUSPECTED_TT = "Suspected TT/TI"
+        const val TRACHOMA_NONE = "No trachoma"
+        val trachomaStatusList = listOf(TRACHOMA_SUSPECTED_ACTIVE, TRACHOMA_SUSPECTED_TT, TRACHOMA_NONE)
 
-        val male_ncd: List<String> = listOf(ncdScreening)
-        val female_1_to_59: List<String> = listOf(careAndPreg, fpAndOtherRep)
-        val female_15_to_18: List<String> = listOf(careAndPreg, fpAndOtherRep, immunization)
-        val female_ncd: List<String> = listOf(careAndPreg, fpAndOtherRep, ncdScreening)
-        val age_0_to_1: List<String> = listOf(neonatalAndInfant)
+        const val CORNEAL_OPACITY = "Corneal opacity"
+        const val CORNEAL_ULCER = "Corneal ulcer suspected"
+        const val CORNEAL_OTHER = "Other corneal pathology"
+        val cornealDiseaseTypeList = listOf(CORNEAL_OPACITY, CORNEAL_ULCER, CORNEAL_OTHER)
 
         val consciousnessList = mutableListOf("Conscious", "Semi Conscious", "Unconscious")
         val dangerSignList = mutableListOf("Fast Breathing", "Chest Indrawing", "Stridor", "Grunt", "Respiratory Distress", "Cold and Calm Peripheral Pulses", "Convulsions", "Hypothermia", "Delirium", "Drowsy", "Uncontrolled Bleeding", "Hematemesis", "Refusal of Fits")
@@ -78,4 +254,4 @@ class DropdownConst {
         val mutualVisitUnitsVal = mutableListOf("Hour(s)", "Day(s)", "Week(s)", "Month(s)", "Year(s)")
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/OtherCPHCServicesViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/OtherCPHCServicesViewModel.kt
index ed041a7ab..c6c96dd57 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/OtherCPHCServicesViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/OtherCPHCServicesViewModel.kt
@@ -11,6 +11,7 @@ import org.piramalswasthya.cho.model.ChiefComplaintDB
 import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVitalsModel
 import org.piramalswasthya.cho.model.VisitDB
+import org.piramalswasthya.cho.repositories.CphcDetailsRepository
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
 import org.piramalswasthya.cho.repositories.VisitReasonsAndCategoriesRepo
 import org.piramalswasthya.cho.repositories.VitalsRepo
@@ -22,6 +23,7 @@ class OtherCPHCServicesViewModel @Inject constructor(
     private val visitReasonsAndCategoriesRepo: VisitReasonsAndCategoriesRepo,
     private val vitalsRepo: VitalsRepo,
     private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo,
+    private val cphcDetailsRepo: CphcDetailsRepository,
 
     ) : ViewModel() {
 
@@ -38,7 +40,12 @@ class OtherCPHCServicesViewModel @Inject constructor(
     ){
         viewModelScope.launch {
             try {
-                saveVisitDbToCatche(visitDB)
+                val benVisitNo = visitDB.benVisitNo ?: patientVisitInfoSync.benVisitNo
+                cphcDetailsRepo.replaceVisitDb(
+                    visitDB = visitDB,
+                    patientID = visitDB.patientID,
+                    benVisitNo = benVisitNo,
+                )
                 savePatientVitalInfoToCache(patientVitals)
                 savePatientVisitInfoSync(patientVisitInfoSync)
                 _isDataSaved.value = true
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordCustom.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordCustom.kt
index 3dac016d3..d5a859a83 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordCustom.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordCustom.kt
@@ -2,11 +2,19 @@ package org.piramalswasthya.cho.ui.commons.case_record
 
 
 import android.app.AlertDialog
-import android.content.Intent
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.Spanned
 import android.text.Editable
 import android.text.InputType
+import android.text.TextUtils
 import android.text.TextWatcher
+import android.text.style.StyleSpan
+import android.text.TextPaint
+import android.text.style.ClickableSpan
+import android.util.TypedValue
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,6 +22,8 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.ArrayAdapter
 import android.widget.AutoCompleteTextView
 import android.widget.Button
+import android.widget.LinearLayout
+import android.widget.ScrollView
 import android.widget.TableRow
 import android.widget.TextView
 import android.widget.Toast
@@ -26,11 +36,15 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import android.text.method.LinkMovementMethod
+import android.view.Gravity
 import com.google.android.material.card.MaterialCardView
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.adapter.CHOCaseRecordItemAdapter
 import org.piramalswasthya.cho.adapter.ChiefComplaintMultiAdapter
@@ -57,11 +71,15 @@ import org.piramalswasthya.cho.model.PrescriptionTemplateDB
 import org.piramalswasthya.cho.model.PrescriptionValues
 import org.piramalswasthya.cho.model.PrescriptionValuesForTemplate
 import org.piramalswasthya.cho.model.ProceduresMasterData
+import org.piramalswasthya.cho.model.ReferralFollowUpFields
+import org.piramalswasthya.cho.model.ReferralFollowUpModel
 import org.piramalswasthya.cho.model.UserDomain
 import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.model.VitalsMasterDb
 import org.piramalswasthya.cho.repositories.PrescriptionTemplateRepo
 import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.CphcFormType
+import org.piramalswasthya.cho.ui.commons.CphcFormTypeResolver
 import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.frequencyMap
 import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.instructionDropdownList
 import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.medicalReferDropdownVal
@@ -69,9 +87,9 @@ import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.medicationFreq
 import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.tabletDosageList
 import org.piramalswasthya.cho.ui.commons.DropdownConst.Companion.unitVal
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
 import org.piramalswasthya.cho.utils.Constants.pattern
 import org.piramalswasthya.cho.utils.HelperUtil
+import org.piramalswasthya.cho.utils.HelperUtil.disableDropdownField
 import org.piramalswasthya.cho.utils.HelperUtil.disableTextInputLayout
 import org.piramalswasthya.cho.utils.generateIntFromUuid
 import org.piramalswasthya.cho.utils.generateUuid
@@ -86,6 +104,10 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), NavigationAdapter {
+    companion object {
+        private const val DEFAULT_DURATION_UNIT = "Day(s)"
+    }
+
     private var _binding: CaseRecordCustomLayoutBinding? = null
     private val binding: CaseRecordCustomLayoutBinding
         get() = _binding!!
@@ -143,6 +165,11 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
     var isAddTemplateClicked = false
     private val benFlowMap = mutableMapOf<Int, BenFlow>()
     private var benFlowListCache: List<BenFlow> = emptyList()
+    private var patientVisitNosCache: List<Int> = emptyList()
+    private var effectivePharmacistFlagForVisibility: Int? = null
+    private var isAlreadyFilledReadOnlyForVisibility: Boolean = false
+    private var dispensedLockedPrescriptionCount: Int = 0
+    private var isFreshCaseEntryFromVisitDetails: Boolean = false
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -154,6 +181,95 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         return binding.root
     }
 
+    private fun setCaseEditorVisibility(isVisible: Boolean) {
+        val visibility = if (isVisible) View.VISIBLE else View.GONE
+        binding.plusButtonD.visibility = visibility
+        binding.plusButtonP.visibility = visibility
+        binding.useTempForFields.visibility = visibility
+        binding.tvAddTemplateTitle.visibility = visibility
+        binding.tempName.visibility = visibility
+        binding.saveTemplate.visibility = visibility
+        binding.deleteTemp.visibility = visibility
+        binding.externalI.visibility = visibility
+        binding.testName.visibility = visibility
+        binding.referReason.visibility = visibility
+        binding.referDropdown.visibility = visibility
+        binding.textReferHeading.visibility = visibility
+    }
+
+    private fun hideReferSummaryLabels() {
+        binding.referDateLabel.visibility = View.GONE
+        binding.referToLabel.visibility = View.GONE
+        binding.referalReasonLabel.visibility = View.GONE
+    }
+
+    private fun applyEditableCaseUi(btnSubmit: Button?, btnCancel: Button?, submitTextRes: Int) {
+        btnSubmit?.visibility = View.VISIBLE
+        btnSubmit?.text = getString(submitTextRes)
+        btnCancel?.visibility = View.VISIBLE
+        btnCancel?.text = getString(R.string.close)
+        setCaseEditorVisibility(true)
+    }
+
+    private fun applyReadOnlyCaseUi(btnSubmit: Button?, btnCancel: Button?) {
+        btnSubmit?.visibility = View.GONE
+        btnCancel?.visibility = View.VISIBLE
+        btnCancel?.text = getString(R.string.close)
+        setCaseEditorVisibility(false)
+        hideReferSummaryLabels()
+    }
+
+    private fun isDoctorWorkflowRole(): Boolean {
+        return preferenceDao.isDoctorSelected() ||
+                (preferenceDao.isUserCHO() && preferenceDao.isNurseSelected()) ||
+                preferenceDao.isRegistrarSelected()
+    }
+
+    private fun isDoctorExistingVisitFlow(): Boolean {
+        return (isDoctorWorkflowRole() && !isFreshCaseEntryFromVisitDetails) || viewRecordFragment == true
+    }
+
+    private fun resolveBenVisitInfo(): PatientDisplayWithVisitInfo {
+        val fromArguments = arguments?.getSerializable("benVisitInfo") as? PatientDisplayWithVisitInfo
+        if (fromArguments != null) return fromArguments
+        return requireNotNull(
+            requireActivity().intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
+        ) {
+            "benVisitInfo is required (fragment arguments or activity intent)"
+        }
+    }
+
+    private fun isOtherCphcCategory(category: String?): Boolean {
+        val c = category?.trim().orEmpty()
+        return c.equals(getString(R.string.other_cphc_category_key), ignoreCase = true)
+    }
+
+    private fun updateShowCphcDetailsButtonVisibility(visitInfo: PatientDisplayWithVisitInfo?) {
+        val visitCategory = visitInfo?.visitCategory
+        val masterDbCategory =
+            (arguments?.getSerializable("MasterDb") as? MasterDb)?.visitMasterDb?.category
+
+        // Fast local check first
+        if (isOtherCphcCategory(visitCategory) || isOtherCphcCategory(masterDbCategory)) {
+            binding.btnShowCphcDetails.visibility = View.VISIBLE
+            return
+        }
+
+        // Doctor-tab fallback: fetch visit category from Visit_DB for this patient+visit.
+        val patientID = visitInfo?.patient?.patientID
+        val benVisitNo = visitInfo?.benVisitNo
+        if (patientID.isNullOrBlank() || benVisitNo == null || benVisitNo <= 0) {
+            binding.btnShowCphcDetails.visibility = View.GONE
+            return
+        }
+
+        lifecycleScope.launch {
+            val dbCategory = viewModel.getVisitCategoryByPatientAndVisit(patientID, benVisitNo)
+            binding.btnShowCphcDetails.visibility =
+                if (isOtherCphcCategory(dbCategory)) View.VISIBLE else View.GONE
+        }
+    }
+
     private val onBackPressedCallback by lazy {
         object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
@@ -168,6 +284,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         familyM = binding.testName
         selectF = binding.selectF
         referDropdown = binding.referDropdownText
+        resetTestNameFieldToDefault(readOnly = false)
+        binding.btnShowCphcDetails.setOnClickListener { showPreviousCphcDetailsPopup() }
 
 
         binding.tvAddTemplateTitle.setOnClickListener {
@@ -192,13 +310,40 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         viewRecordFragment = arguments?.getBoolean("viewRecord")
         isFlowComplete = arguments?.getBoolean("isFlowComplete")
         isFollowupVisit = arguments?.getBoolean("isFollowupVisit")
+        var isClosedViewOnly = (viewRecordFragment == true && isFlowComplete == true)
+        isFreshCaseEntryFromVisitDetails =
+            // CHO-role and Register-role enter the fresh-case-entry flow.
+            viewRecordFragment != true &&
+                    (arguments?.getSerializable("MasterDb") as? MasterDb) != null
+
+        masterDb = arguments?.getSerializable("MasterDb") as? MasterDb
+        benVisitInfo = resolveBenVisitInfo()
+
+        // Use DB value for pharmacist_flag in edit path so completed (lab+pharmacist) cases get correct UI even if intent was stale
+        var effectivePharmacistFlag: Int? = null
 
         if (viewRecordFragment == true) {
+            updateShowCphcDetailsButtonVisibility(benVisitInfo)
+            // Pending pharmacist cycle is not a closed case, even if stale extras say flowComplete=true.
+            if ((benVisitInfo.pharmacist_flag ?: 0) == 1) {
+                isClosedViewOnly = false
+            }
+            // Lab reviewed + medicine dispensed (doctorFlag=3, pharmacist_flag=9) is editable review cycle.
+            if (benVisitInfo.nurseFlag == 9 &&
+                benVisitInfo.doctorFlag == 3 &&
+                (benVisitInfo.pharmacist_flag ?: 0) == 9 &&
+                isDoctorWorkflowRole()
+            ) {
+                isClosedViewOnly = false
+            }
+            effectivePharmacistFlag = benVisitInfo.pharmacist_flag
+            effectivePharmacistFlagForVisibility = effectivePharmacistFlag
             viewModel.getFormMaster()
             val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
             val btnCancel = activity?.findViewById<Button>(R.id.btnCancel)
             btnSubmit?.visibility = View.GONE
             btnCancel?.text = getString(R.string.close)
+            btnCancel?.visibility = View.VISIBLE
 
             if (isFlowComplete == true){
                 binding.patientList.visibility = View.VISIBLE
@@ -206,210 +351,234 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                 binding.patientList.visibility = View.GONE
             }
 
-            binding.plusButtonD.visibility = View.GONE
-            binding.plusButtonP.visibility = View.GONE
-            binding.tempName.visibility = View.GONE
-            binding.saveTemplate.visibility = View.GONE
-            binding.deleteTemp.visibility = View.GONE
-            binding.useTempForFields.visibility = View.GONE
+            setCaseEditorVisibility(false)
 
-            binding.tvAddTemplateTitle.visibility = View.GONE
-            binding.externalI.visibility = View.GONE
-            binding.testName.visibility = View.GONE
-            binding.referReason.visibility = View.GONE
-            binding.referDropdown.visibility = View.GONE
-            binding.textReferHeading.visibility = View.GONE
-
-            benVisitInfo = arguments?.getSerializable("benVisitInfo") as PatientDisplayWithVisitInfo
             getVisitResObserver(benVisitInfo)
-             if( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3 && preferenceDao.isDoctorSelected() ){
-                 btnSubmit?.visibility = View.VISIBLE
-                 binding.plusButtonD.visibility = View.VISIBLE
-                 binding.plusButtonP.visibility = View.VISIBLE
-                 binding.useTempForFields.visibility = View.VISIBLE
+            if (isClosedViewOnly) {
+                applyReadOnlyCaseUi(btnSubmit, btnCancel)
+            } else if( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3 && isDoctorWorkflowRole() && benVisitInfo.pharmacist_flag != 9 ){
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
 
-             } else if ( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 1 && preferenceDao.isDoctorSelected() )
-            {
-                 btnSubmit?.visibility = View.VISIBLE
-                binding.plusButtonD.visibility = View.VISIBLE
-                binding.plusButtonP.visibility = View.VISIBLE
-                binding.useTempForFields.visibility = View.VISIBLE
+            } else if ( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3 && isDoctorWorkflowRole() && benVisitInfo.pharmacist_flag == 9 ) {
+                // Lab done + medicine dispensed: doctor reviews results.
+                // Doctor can add new tests/medicines (starts new cycle) OR submit without changes (closes case with confirmation).
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.close_case_btn)
 
-            } else {
-                 btnSubmit?.visibility = View.GONE
-                 binding.plusButtonD.visibility = View.GONE
-                 binding.plusButtonP.visibility = View.GONE
-                 binding.useTempForFields.visibility = View.GONE
+            } else if ( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 1 && isDoctorWorkflowRole() && benVisitInfo.pharmacist_flag != 9 )
+            {
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
 
-             }
+            } else if ( benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 9 && isDoctorWorkflowRole() && benVisitInfo.pharmacist_flag == 1 ) {
+                // Medicine pending at pharmacist (not dispensed yet): allow doctor correction/update.
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
 
+            } else {
+                // Already filled (lab + pharmacist submitted): only Close button; no Submit/Cancel; no plus icons; no refer section
+                applyReadOnlyCaseUi(btnSubmit, btnCancel)
+            }
 
             lifecycleScope.launch {
+                testNameMap = viewModel.getTestNameTypeMap()
+                referNameMap = viewModel.getReferNameTypeMap()
+            }
 
-                if (isFollowupVisit == true){
-                    btnSubmit?.visibility = View.VISIBLE
-                    btnSubmit?.text = getString(R.string.update_btn)
-                    viewModel.benFlows.observe(viewLifecycleOwner) { benFlowList ->
-                        if (benFlowList.isNullOrEmpty()) return@observe
-
-                        val distinctList =
-                            benFlowList.distinctBy { it.benVisitNo }
-
-                        benFlowMap.clear()
-                        distinctList.forEach { benFlow ->
-                            benFlow.benVisitNo?.let { visitNo ->
-                                benFlowMap[visitNo] = benFlow
-                            }
-                        }
+        } else {
+            binding.patientList.visibility = View.VISIBLE
+            updateShowCphcDetailsButtonVisibility(benVisitInfo)
 
-                        benFlowListCache = benFlowMap.values.toList()
-
-                        val lastNonFollowUp = benFlowMap.values
-                            .sortedBy { it.benVisitNo }
-                            .lastOrNull { it.VisitReason != "Follow Up" }
-
-                        lastNonFollowUp?.let {
-
-                            val benVisitInfo = PatientDisplayWithVisitInfo(
-                                benVisitInfo.patient,
-                                genderName = null,
-                                villageName = null,
-                                ageUnit = null,
-                                maritalStatus = null,
-                                nurseDataSynced =null,
-                                doctorDataSynced = null,
-                                createNewBenFlow = null,
-                                prescriptionID = null,
-                                benVisitNo = it.benVisitNo,
-                                visitCategory = null,
-                                benFlowID = null,
-                                nurseFlag = null,
-                                doctorFlag = null,
-                                labtechFlag = null,
-                                pharmacist_flag = null,
-                                visitDate = null,
-                                referDate = null,
-                                referTo = null,
-                                referralReason = null
-                            )
+            getVisitResObserver(benVisitInfo)
 
-                            lifecycleScope.launch {
-                                convertToPrescriptionValuesFromPC(viewModel.getPrescriptionForVisitNumAndPatientId(benVisitInfo))
-                                convertToDiagnosisValues(viewModel.getProvisionalDiagnosisForVisitNumAndPatientId(benVisitInfo))
-                            }
-                        }
-                    }
-                } else {
-                    convertToPrescriptionValuesFromPC(viewModel.getPrescriptionForVisitNumAndPatientId(benVisitInfo))
-                    convertToDiagnosisValues(viewModel.getProvisionalDiagnosisForVisitNumAndPatientId(benVisitInfo))
-                    testNameMap = viewModel.getTestNameTypeMap()
-                    if (benVisitInfo.benVisitNo != null) {
-                        viewModel.getPreviousTest(benVisitInfo)
+            // Use latest pharmacist_flag from DB so completed (lab+pharmacist) cases get correct UI even if intent was stale
+            val benVisitNo = benVisitInfo.benVisitNo
+            val sync = if (benVisitNo != null) {
+                runBlocking(Dispatchers.IO) {
+                    try {
+                        viewModel.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                            benVisitInfo.patient.patientID,
+                            benVisitNo
+                        )
+                    } catch (e: Exception) {
+                        null
                     }
                 }
+            } else null
+            effectivePharmacistFlag = sync?.pharmacist_flag ?: benVisitInfo.pharmacist_flag ?: 0
+            effectivePharmacistFlagForVisibility = effectivePharmacistFlag
+
+            // CHO fresh-case entry (new chief complaint from visit details): always start editable.
+            if (isFreshCaseEntryFromVisitDetails) {
+                val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
+                val btnCancel = activity?.findViewById<Button>(R.id.btnCancel)
+                effectivePharmacistFlag = 0
+                effectivePharmacistFlagForVisibility = 0
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
+                binding.prescriptionExtra.visibility = View.VISIBLE
+                binding.diagnosisExtra.visibility = View.VISIBLE
+                binding.vitalsExtra.visibility = View.VISIBLE
+                binding.vitalsLayout.visibility = View.VISIBLE
             }
-            investigationBD = viewModel.previousTests.value
-            val resp = investigationBD?.previousTestIds?.split(",")?.map { it.toInt() }
-            val selectedRelationTypes = mapProcedureIdsToNames(procedureDropdown,resp)
-            val selectedRelationTypesString = selectedRelationTypes.joinToString(", ")
-            binding.selectF.text = selectedRelationTypesString
-
-            viewModel.previousTests.observe(viewLifecycleOwner) { record ->
-                val counselling = record?.counsellingProvidedList?.firstOrNull()
-                if (counselling.isNullOrEmpty()) {
-                    binding.routeDropDown.visibility = View.GONE
-                } else {
-                    binding.routeDropDown.visibility = View.VISIBLE
-                    binding.routeDropDownVal.setText(counselling)
-                    HelperUtil.disableDropdownField(binding.routeDropDownVal, binding.routeDropDown)
-                    disableTextInputLayout(binding.routeDropDown)
-                }
-                val externalInv = record?.externalInvestigations
-                if (externalInv.isNullOrEmpty()) {
-                    binding.externalI.visibility = View.GONE
-                } else {
-                    binding.externalI.visibility = View.VISIBLE
-                    binding.inputExternalI.setText(externalInv)
-                    binding.inputExternalI.isFocusable = false
-                    binding.inputExternalI.isFocusableInTouchMode = false
-                    binding.inputExternalI.isClickable = false
-                    binding.inputExternalI.isLongClickable = false
-                    disableTextInputLayout(binding.externalI)
+            // Existing-visit flow: show editable sections only when pharmacist has NOT yet dispensed.
+            else if (effectivePharmacistFlag == 0) {
+                val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
+                val btnCancel = activity?.findViewById<Button>(R.id.btnCancel)
+                applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
+                binding.prescriptionExtra.visibility = View.VISIBLE
+                binding.diagnosisExtra.visibility = View.VISIBLE
+                binding.vitalsExtra.visibility = View.VISIBLE
+                binding.vitalsLayout.visibility = View.VISIBLE
+            } else {
+                if (effectivePharmacistFlag == 1) {
+                    val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
+                    val btnCancel = activity?.findViewById<Button>(R.id.btnCancel)
+                    val isDoctorEditBeforeDispense = benVisitInfo.nurseFlag == 9 &&
+                            (benVisitInfo.doctorFlag == 3 || benVisitInfo.doctorFlag == 9)
+                    if (isDoctorEditBeforeDispense) {
+                        applyEditableCaseUi(btnSubmit, btnCancel, R.string.submit)
+                    } else {
+                        applyReadOnlyCaseUi(btnSubmit, btnCancel)
+                    }
+                } else if (effectivePharmacistFlag == 9) {
+                    val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
+                    val btnCancel = activity?.findViewById<Button>(R.id.btnCancel)
+                    val isLabReviewWithDispensedMedicine = benVisitInfo.nurseFlag == 9 &&
+                            benVisitInfo.doctorFlag == 3
+
+                    if (isLabReviewWithDispensedMedicine) {
+                        applyEditableCaseUi(btnSubmit, btnCancel, R.string.close_case_btn)
+                    } else {
+                        applyReadOnlyCaseUi(btnSubmit, btnCancel)
+                    }
                 }
             }
-
-        } else {
-            binding.patientList.visibility = View.VISIBLE
-            benVisitInfo =
-                requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
-
-            getVisitResObserver(benVisitInfo)
         }
 
-        if (benVisitInfo.referDate != null) {
-            binding.referDateLabel.visibility = View.VISIBLE
-            binding.referDate.setText(benVisitInfo.referDate)
+        // When already filled (lab + pharmacist submitted): only Close button; no Submit/Cancel; no plus icons; no refer section
+        // Doctor can edit when: nurseFlag=9 AND (doctorFlag=1 OR doctorFlag=3) AND pharmacist_flag != 9
+        // Special case: doctorFlag=3 AND pharmacist_flag=9 → doctor reviews lab+dispensed medicine and can add new or close
+        val isDoctorReviewingAfterLabAndDispense =
+            benVisitInfo.nurseFlag == 9 &&
+                    benVisitInfo.doctorFlag == 3 &&
+                    effectivePharmacistFlag == 9 &&
+                    !isClosedViewOnly
+        if (isDoctorReviewingAfterLabAndDispense) {
+            activity?.findViewById<Button>(R.id.btnSubmit)?.visibility = View.VISIBLE
+            activity?.findViewById<Button>(R.id.btnSubmit)?.text = getString(R.string.close_case_btn)
+        }
+        val isDoctorEditingPendingDispense = benVisitInfo.nurseFlag == 9 &&
+                benVisitInfo.doctorFlag == 9 && effectivePharmacistFlag == 1
+        val isDoctorCanEdit = (isDoctorWorkflowRole() ||
+                isDoctorReviewingAfterLabAndDispense ||
+                isDoctorEditingPendingDispense) &&
+                benVisitInfo.nurseFlag == 9 &&
+                (benVisitInfo.doctorFlag == 1 || benVisitInfo.doctorFlag == 3 || benVisitInfo.doctorFlag == 9) &&
+                (effectivePharmacistFlag != 9 || isDoctorReviewingAfterLabAndDispense)
+        val isViewingHistoricalVisit = viewRecordFragment == true && isFlowComplete == true
+        val isAlreadyFilledReadOnly = isClosedViewOnly ||
+                isViewingHistoricalVisit ||
+                (viewRecordFragment == true && !isDoctorCanEdit) ||
+                (!isFreshCaseEntryFromVisitDetails && effectivePharmacistFlag == 9 && !isDoctorReviewingAfterLabAndDispense)
+        isAlreadyFilledReadOnlyForVisibility = isAlreadyFilledReadOnly
+        if (isAlreadyFilledReadOnly) {
+            applyReadOnlyCaseUi(
+                activity?.findViewById(R.id.btnSubmit),
+                activity?.findViewById(R.id.btnCancel)
+            )
         }
-        if (benVisitInfo.referTo != null) {
-            binding.referToLabel.visibility = View.VISIBLE
-            binding.referTo.setText(benVisitInfo.referTo)
-            disableTextInputLayout(binding.referToLabel)
+
+        // Provisional/Final Diagnosis and Medicine fields: always show; filled = disabled, fresh = editable (handled in adapters)
+        if (isDoctorExistingVisitFlow()) {
+            binding.tvProvisionalDignosisTitle.visibility = View.VISIBLE
+            binding.diagnosisExtra.visibility = View.VISIBLE
+            binding.prescriptionExtra.visibility = View.VISIBLE
         }
-        if (benVisitInfo.referralReason != null) {
-            binding.referalReasonLabel.visibility = View.VISIBLE
-            binding.referalReason.setText(benVisitInfo.referralReason!!.split(pattern)[0])
-            disableTextInputLayout(binding.referalReasonLabel)
+
+        // Refer details are shown only in the bottom refer section, never under diagnosis.
+        hideReferSummaryLabels()
+
+        if (isAlreadyFilledReadOnlyForVisibility) {
+            binding.testName.visibility = View.GONE
         }
 
-        if (preferenceDao.isDoctorSelected() || viewRecordFragment == true) {
+        if (isDoctorExistingVisitFlow()) {
             patientId = benVisitInfo.patient.patientID
             patId = benVisitInfo.patient.patientID
-            viewModel.getVitalsDB(patId)
+            viewModel.getVitalsDB(patId, benVisitInfo.benVisitNo)
 
-            viewModel.getChiefComplaintDB(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
-            if (benVisitInfo.benVisitNo != null) {
-                viewModel.getLabList(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+            benVisitInfo.benVisitNo?.let { visitNo ->
+                viewModel.getChiefComplaintDB(benVisitInfo.patient.patientID, visitNo)
+                viewModel.getLabList(benVisitInfo.patient.patientID, visitNo)
             }
+            // Remove existing observer to prevent duplicates
+            viewModel.labReportList.removeObservers(viewLifecycleOwner)
             viewModel.labReportList.observe(viewLifecycleOwner) { labReports ->
-                var nameVal = ""
-                var resultVal = ""
-                for (labReport in labReports) {
-                    val procedureType = labReport.procedure.procedureName
-                    procedureType?.let { viewModel.labReportProcedureTypes.add(it) }
+                while (tableLayout.childCount > 1) {
+                    tableLayout.removeViewAt(1)
                 }
+                viewModel.labReportProcedureTypes.clear()
+
+                if (labReports.isEmpty()) return@observe
+
+                val uniqueLatestReports = labReports
+                    .filter { it.procedure.procedureName != null }
+                    .groupBy { it.procedure.procedureName!! }
+                    .mapValues { (_, reports) ->
+                        reports.maxByOrNull { report ->
+                            report.procedure.createdDate?.let { dateStr ->
+                                try {
+                                    SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", java.util.Locale.getDefault()).parse(dateStr)?.time ?: 0L
+                                } catch (_: Exception) {
+                                    try {
+                                        SimpleDateFormat("yyyy-MM-dd", java.util.Locale.getDefault()).parse(dateStr)?.time ?: 0L
+                                    } catch (_: Exception) {
+                                        dateStr.hashCode().toLong()
+                                    }
+                                }
+                            } ?: 0L
+                        } ?: reports.first()
+                    }
+                    .values
+                    .toList()
 
-                if (labReports.size > 0) {
-                    binding.scrollview.visibility = View.VISIBLE
-                    binding.resultHeading.visibility = View.VISIBLE
-                    binding.dateOption.visibility = View.VISIBLE
-                }
-                for (labReport in labReports) {
-                    val procedureName = labReport.procedure.procedureName
-                    binding.inputDate.setText(labReport.procedure.createdDate)
-                    binding.inputDate.inputType = InputType.TYPE_NULL
-                    binding.inputDate.isFocusable = false
-                    binding.inputDate.isClickable = false
-                    for (component in labReport.components) {
+                uniqueLatestReports.map { it.procedure.procedureName }.filterNotNull().distinct()
+                    .forEach { viewModel.labReportProcedureTypes.add(it) }
+
+                binding.scrollview.visibility = View.VISIBLE
+                binding.resultHeading.visibility = View.VISIBLE
+                binding.dateOption.visibility = View.VISIBLE
 
+                uniqueLatestReports.maxByOrNull { it.procedure.createdDate ?: "" }?.procedure?.createdDate?.let {
+                    binding.inputDate.setText(it)
+                }
+                binding.inputDate.inputType = InputType.TYPE_NULL
+                binding.inputDate.isFocusable = false
+                binding.inputDate.isClickable = false
+
+                for (labReport in uniqueLatestReports) {
+                    val procedureName = labReport.procedure.procedureName ?: continue
+                    val components = labReport.components
+                    if (components.isEmpty()) {
                         val tableRowVal =
                             layoutInflater.inflate(R.layout.report_custom_layout, null) as TableRow
-                        val componentName = component.remarks
-                        val resultValue = component.testResultValue
-                        val resultUnit = component.testResultUnit
-                        nameVal = "$procedureName"
-
-                        resultVal = buildString {
-                            append(resultValue)
-                            resultUnit?.let { append(" $it") }
-                            append(" <br> <b>Remarks: </b> $componentName")
-                        }
-
-                        tableRowVal.findViewById<TextView>(R.id.numberTextView)
-                            .text = HtmlCompat.fromHtml(resultVal, HtmlCompat.FROM_HTML_MODE_LEGACY)
-
-//                        tableRowVal.findViewById<TextView>(R.id.nameTextView).setText(nameVal)
-                        tableRowVal.findViewById<TextView>(R.id.nameTextView).setText(nameVal)
+                        tableRowVal.findViewById<TextView>(R.id.nameTextView).text = procedureName
+                        tableRowVal.findViewById<TextView>(R.id.numberTextView).text = ""
                         tableLayout.addView(tableRowVal)
+                    } else {
+                        for ((index, component) in components.withIndex()) {
+                            val resultVal = buildString {
+                                append("<b>${TextUtils.htmlEncode(procedureName)}:</b> ")
+//                                component.componentName?.let { append("<b>${TextUtils.htmlEncode(it)}:</b> ") }
+                                append(TextUtils.htmlEncode(component.testResultValue.orEmpty()))
+                                component.testResultUnit?.let { append(" ${TextUtils.htmlEncode(it)}") }
+                                component.remarks?.let { append(" <br> <b>Remarks: </b> ${TextUtils.htmlEncode(it)}") }
+                            }
+                            val tableRowVal =
+                                layoutInflater.inflate(R.layout.report_custom_layout, null) as TableRow
+                            tableRowVal.findViewById<TextView>(R.id.nameTextView).text =
+                                if (index == 0) procedureName else ""
+                            tableRowVal.findViewById<TextView>(R.id.numberTextView).text =
+                                HtmlCompat.fromHtml(resultVal, HtmlCompat.FROM_HTML_MODE_LEGACY)
+                            tableLayout.addView(tableRowVal)
+                        }
                     }
                 }
             }
@@ -417,9 +586,9 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         }
 
         val adapter = CHOCaseRecordItemAdapter(CHOCaseRecordItemAdapter.BenClickListener { benVisitInfo ->
-            if (benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3 && preferenceDao.isDoctorSelected()) {
+            if (benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3 && isDoctorWorkflowRole()) {
                 navigatetoCaseCustomRecordSelf(false, benVisitInfo)
-            } else if (benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 1 && preferenceDao.isDoctorSelected()) {
+            } else if (benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 1 && isDoctorWorkflowRole()) {
                 navigatetoCaseCustomRecordSelf(false, benVisitInfo)
             } else {
                 navigatetoCaseCustomRecordSelf(true, benVisitInfo)
@@ -427,6 +596,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         })
         binding.patientList.adapter = adapter
 
+        // Remove existing observer to prevent duplicates
+        viewModel.benFlows.removeObservers(viewLifecycleOwner)
         viewModel.benFlows.observe(viewLifecycleOwner) { benFlowList ->
             if (!benFlowList.isNullOrEmpty()) {
                 adapter.updateBenFlows(benFlowList.distinctBy { it.benVisitNo })
@@ -459,8 +630,10 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             viewModel.getPatientDisplayListForDoctorByPatient(benVisitInfo.patient.patientID).collect {
                 if (it.isNotEmpty()) {
                     adapter.submitList(it)
+                    patientVisitNosCache = it.mapNotNull { visit -> visit.benVisitNo }.distinct().sortedDescending()
                 } else {
                     binding.patientList.visibility = View.GONE
+                    patientVisitNosCache = emptyList()
                 }
             }
         }
@@ -477,7 +650,9 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
         val chiefComplaintDB = mutableListOf<ChiefComplaintDB>()
 
-        if (preferenceDao.isDoctorSelected() || viewRecordFragment == true) {
+        if (isDoctorExistingVisitFlow()) {
+            // Remove existing observer to prevent duplicates
+            viewModel.chiefComplaintDB.removeObservers(viewLifecycleOwner)
             viewModel.chiefComplaintDB.observe(viewLifecycleOwner) { chiefComplaintList ->
                 // Clear the existing data in chiefComplaintDB
                 chiefComplaintDB.clear()
@@ -496,16 +671,27 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                     )
                     chiefComplaintDB.add(chiefC) // Add the item to the list
                 }
-                chAdapter.notifyDataSetChanged()
+                if (::chAdapter.isInitialized) {
+                    chAdapter.notifyDataSetChanged()
+                }
             }
-            if (chiefComplaintDB.size == 0) {
-                binding.chiefComplaintHeading.visibility = View.GONE
-            } else {
-                binding.chiefComplaintHeading.visibility = View.VISIBLE
+            // In doctor edit mode show section even when empty (new registration / no complaint)
+            val showChiefComplaintSection = chiefComplaintDB.isNotEmpty() ||
+                    (isDoctorWorkflowRole() && viewRecordFragment != true)
+            binding.chiefComplaintHeading.visibility = if (showChiefComplaintSection) View.VISIBLE else View.GONE
+            // Remove existing observer to prevent duplicates
+            viewModel.previousTests.removeObservers(viewLifecycleOwner)
+            viewModel.previousTests.observe(viewLifecycleOwner) { record ->
+                investigationBD = record
+                lifecycleScope.launch {
+                    if (referNameMap.isEmpty()) {
+                        referNameMap = viewModel.getReferNameTypeMap()
+                    }
+                    hideReferSummaryLabels()
+                    applySavedInvestigationToUi(record, readOnly = isVisitFieldsReadOnly())
+                }
             }
         } else {
-            masterDb = arguments?.getSerializable("MasterDb") as? MasterDb
-
             for (i in 0 until (masterDb?.visitMasterDb?.chiefComplaint?.size ?: 0)) {
                 val chiefComplaintItem = masterDb!!.visitMasterDb!!.chiefComplaint!![i]
                 val chiefC = ChiefComplaintDB(
@@ -526,14 +712,24 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         val layoutManagerC = LinearLayoutManager(requireContext())
         binding.chiefComplaintExtra.layoutManager = layoutManagerC
 
+        if (!isDoctorExistingVisitFlow()) {
+            val hasComplaints = chiefComplaintDB.isNotEmpty()
+            // Hide Chief Complaint section when no complaints exist (e.g., specialized-module visits without a CC).
+            binding.chiefComplaintHeading.visibility = if (hasComplaints) View.VISIBLE else View.GONE
+            binding.chiefComplaintExtra.visibility = if (hasComplaints) View.VISIBLE else View.GONE
+        }
 
+        // Remove existing observer to prevent duplicates
+        viewModel.formMedicineDosage.removeObservers(viewLifecycleOwner)
         viewModel.formMedicineDosage.observe(viewLifecycleOwner) { f ->
             formMListVal.clear()
             formMListVal.addAll(f)
 
             formForFilter.clear()
             formForFilter.addAll(f)
-            pAdapter.notifyDataSetChanged()
+            if (::pAdapter.isInitialized) {
+                pAdapter.notifyDataSetChanged()
+            }
         }
 
 
@@ -542,6 +738,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         val uniqueTemplateNames = LinkedHashSet<String>()
         binding.inputUseTempForFields.setAdapter(tempAdapter)
 
+        // Remove existing observer to prevent duplicates
+        viewModel.tempDB.removeObservers(viewLifecycleOwner)
         viewModel.tempDB.observe(viewLifecycleOwner) { vc ->
             uniqueTemplateNames.clear()
             vc.mapNotNullTo(uniqueTemplateNames) { it?.templateName }
@@ -556,12 +754,16 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
         binding.inputUseTempForFields.setOnItemClickListener { parent, _, position, _ ->
             itemListP.clear()
-            pAdapter.notifyDataSetChanged()
+            if (::pAdapter.isInitialized) {
+                pAdapter.notifyDataSetChanged()
+            }
             val selectedString = parent.getItemAtPosition(position) as String
             if (selectedString == "None") {
                 itemListP.clear()
                 itemListP.add(PrescriptionValues())
-                pAdapter.notifyDataSetChanged()
+                if (::pAdapter.isInitialized) {
+                    pAdapter.notifyDataSetChanged()
+                }
                 val inputMethodManager =
                     requireContext().getSystemService(InputMethodManager::class.java)
                 inputMethodManager.hideSoftInputFromWindow(
@@ -570,7 +772,9 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                 )
             } else {
                 itemListP.clear()
-                pAdapter.notifyDataSetChanged()
+                if (::pAdapter.isInitialized) {
+                    pAdapter.notifyDataSetChanged()
+                }
                 lifecycleScope.launch {
                     val selectedTemplates = viewModel.getTemplatesByTemplateName(selectedString)
                     convertToPrescriptionValues(selectedTemplates)
@@ -579,17 +783,32 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         }
 
 
+        // Declare counsellingTypesAdapter before the observer
+        val counsellingTypesAdapter =
+            ArrayAdapter<String>(requireContext(), android.R.layout.simple_dropdown_item_1line)
+        binding.routeDropDownVal.setAdapter(counsellingTypesAdapter)
+
+        // Remove existing observer to prevent duplicates
+        viewModel.counsellingProvided.removeObservers(viewLifecycleOwner)
         viewModel.counsellingProvided.observe(viewLifecycleOwner) { f ->
             counsellingTypes.clear()
             counsellingTypes.addAll(f)
-            pAdapter.notifyDataSetChanged()
+            counsellingTypesAdapter.clear()
+            counsellingTypesAdapter.addAll(f.map { it.name })
+            counsellingTypesAdapter.notifyDataSetChanged()
+            if (::pAdapter.isInitialized) {
+                pAdapter.notifyDataSetChanged()
+            }
         }
+        // Remove existing observer to prevent duplicates
+        viewModel.procedureDropdown.removeObservers(viewLifecycleOwner)
         viewModel.procedureDropdown.observe(viewLifecycleOwner) { f ->
             procedureDropdown.clear()
             procedureDropdown.addAll(f)
             familyM!!.setOnClickListener {
                 showDialogWithFamilyMembers(procedureDropdown, viewModel.labReportProcedureTypes)
             }
+            resetTestNameFieldToDefault(readOnly = isVisitFieldsReadOnly())
         }
         binding.saveTemplate.setOnClickListener {
             saveTemp(uniqueTemplateNames)
@@ -603,25 +822,22 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         val referAdapter =
             ArrayAdapter<String>(requireContext(), android.R.layout.simple_dropdown_item_1line)
         binding.referDropdownText.setAdapter(referAdapter)
+        // Remove existing observer to prevent duplicates
+        viewModel.higherHealthCare.removeObservers(viewLifecycleOwner)
         viewModel.higherHealthCare.observe(viewLifecycleOwner) { vc ->
             referAdapter.clear()
             referAdapter.addAll(vc.map { it.institutionName })
             referAdapter.notifyDataSetChanged()
         }
 
-        val counsellingTypesAdapter =
-            ArrayAdapter<String>(requireContext(), android.R.layout.simple_dropdown_item_1line)
-        binding.routeDropDownVal.setAdapter(counsellingTypesAdapter)
+        // counsellingTypesAdapter is already declared and set up above with the counsellingProvided observer
 
-        viewModel.counsellingProvided.observe(viewLifecycleOwner) { c ->
-            counsellingTypesAdapter.clear()
-            counsellingTypesAdapter.addAll(c.map { it.name })
-            counsellingTypesAdapter.notifyDataSetChanged()
-        }
+        // When doctor can edit (fresh card or post-lab, pharmacist not dispensed), show all fields in diagnosis/prescription
+        val isCaseRecordReadOnly = viewRecordFragment == true && !isDoctorCanEdit
 
         dAdapter = DiagnosisAdapter(
             requireContext(),
-            viewRecordFragment,
+            isCaseRecordReadOnly,
             isFollowupVisit,
             itemListD,
             object : RecyclerViewItemChangeListenerD {
@@ -644,11 +860,14 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             binding.plusButtonD.isEnabled = !isAnyItemEmptyD()
             binding.plusButtonD.isEnabled = false
         }
+        val isMedicineDispensedByPharmacist = effectivePharmacistFlag == 9
         pAdapter = PrescriptionAdapter(
 //            tempDBVal,
 //            tempList,
-            viewRecordFragment,
+            isCaseRecordReadOnly,
             isFollowupVisit,
+            isMedicineDispensedByPharmacist,
+            dispensedLockedPrescriptionCount,
             itemListP,
             formMListVal,
             frequencyListVal,
@@ -658,49 +877,126 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             object : RecyclerViewItemChangeListenersP {
                 override fun onItemChanged() {
                     binding.plusButtonP.isEnabled = !isAnyItemEmptyP()
+                    // Update button text when medicine changes
+                    updateSubmitButtonText()
+                }
+            },
+            fetchStockListener = { itemId, callback ->
+                viewLifecycleOwner.lifecycleScope.launch {
+                    val stock = viewModel.getAvailableStockForRule(itemId)
+                    callback(stock)
                 }
             }
         )
         binding.prescriptionExtra.adapter = pAdapter
+        pAdapter.setDispensedLockedItemCount(dispensedLockedPrescriptionCount)
         val layoutManager2 = LinearLayoutManager(requireContext())
         binding.prescriptionExtra.layoutManager = layoutManager2
         pAdapter.notifyItemInserted(itemListP.size - 1)
         binding.plusButtonP.isEnabled = !isAnyItemEmptyP()
+        // Set initial button text
+        updateSubmitButtonText()
         binding.plusButtonP.setOnClickListener {
             val newItem = PrescriptionValues()
             newItem.title = "Medicine - ${itemListP.size + 1}"
+            Timber.d("Plus button clicked: Creating new item with title='${newItem.title}', form='${newItem.form}', id=${newItem.id}, isDispensed=${newItem.isDispensed}")
             itemListP.add(newItem)
+            Timber.d("Item added to list. Total items: ${itemListP.size}")
 //            pAdapter.notifyItemInserted(itemListP.size -   1)
             view.clearFocus()
             pAdapter.notifyItemInserted(itemListP.size - 1)
             binding.plusButtonP.isEnabled = !isAnyItemEmptyP()
             binding.plusButtonP.isEnabled = false
+            // Update button text after adding medicine
+            updateSubmitButtonText()
         }
-        if (preferenceDao.isDoctorSelected() || viewRecordFragment == true) {
-            var bool = true
-            viewModel.vitalsDB.observe(viewLifecycleOwner) { vitalsDB ->
-                var vitalDb2 = VitalsMasterDb(
-                    height = vitalsDB.height,
-                    weight = vitalsDB.weight,
-                    bmi = vitalsDB.bmi,
-                    waistCircumference = vitalsDB.waistCircumference,
-                    temperature = vitalsDB.temperature,
-                    pulseRate = vitalsDB.pulseRate,
-                    spo2 = vitalsDB.spo2,
-                    bpSystolic = vitalsDB.bpSystolic,
-                    bpDiastolic = vitalsDB.bpDiastolic,
-                    respiratoryRate = vitalsDB.respiratoryRate,
-                    rbs = vitalsDB.rbs
-                )
-                bool = false
-                populateVitalsFieldsW(vitalDb2)
-            }
-            if (bool) {
-                populateVitalsFields()
+        setupVitalsDisplay()
+
+        if (isDoctorExistingVisitFlow()) {
+            lifecycleScope.launch {
+                if (referNameMap.isEmpty()) {
+                    referNameMap = viewModel.getReferNameTypeMap()
+                }
+                reloadSavedCaseRecordData()
             }
+        }
+    }
+
+    private fun isVisitFieldsReadOnly(): Boolean =
+        isAlreadyFilledReadOnlyForVisibility ||
+                (viewRecordFragment == true && isFlowComplete == true)
+
+    private suspend fun reloadSavedCaseRecordData() {
+        val visitNo = benVisitInfo.benVisitNo
+        val patientID = benVisitInfo.patient.patientID
+        patId = patientID
+
+        val savedDiagnosis = viewModel.getProvisionalDiagnosisForVisitNumAndPatientId(benVisitInfo)
+        val savedPrescription = viewModel.getPrescriptionForVisitNumAndPatientId(benVisitInfo)
+        val visitInfoForLoad = if (
+            isFollowupVisit == true &&
+            !isVisitFieldsReadOnly() &&
+            savedDiagnosis.isEmpty() &&
+            savedPrescription.isEmpty()
+        ) {
+            resolveLastNonFollowUpVisitInfo() ?: benVisitInfo
         } else {
-            populateVitalsFields()
+            benVisitInfo
         }
+
+        loadPrescriptionRowsForVisit(visitInfoForLoad)
+        convertToDiagnosisValues(
+            viewModel.getProvisionalDiagnosisForVisitNumAndPatientId(visitInfoForLoad)
+        )
+
+        if (visitNo != null && visitNo > 0) {
+            viewModel.getVitalsDB(patientID, visitNo)
+            viewModel.getChiefComplaintDB(patientID, visitNo)
+            viewModel.getLabList(patientID, visitNo)
+            viewModel.getPreviousTest(benVisitInfo)
+        }
+
+        if (::dAdapter.isInitialized) {
+            dAdapter.notifyDataSetChanged()
+            binding.plusButtonD.isEnabled = !isAnyItemEmptyD()
+        }
+        if (::pAdapter.isInitialized) {
+            pAdapter.setDispensedLockedItemCount(dispensedLockedPrescriptionCount)
+            pAdapter.notifyDataSetChanged()
+            binding.plusButtonP.isEnabled = !isAnyItemEmptyP()
+            updateSubmitButtonText()
+        }
+    }
+
+    private fun resolveLastNonFollowUpVisitInfo(): PatientDisplayWithVisitInfo? {
+        val lastNonFollowUp = (viewModel.benFlows.value ?: benFlowListCache)
+            .sortedBy { it.benVisitNo }
+            .lastOrNull { it.VisitReason != "Follow Up" }
+            ?: return null
+        val sourceVisitNo = lastNonFollowUp.benVisitNo ?: return null
+        if (sourceVisitNo == benVisitInfo.benVisitNo) return null
+        return PatientDisplayWithVisitInfo(
+            benVisitInfo.patient,
+            genderName = null,
+            villageName = null,
+            ageUnit = null,
+            maritalStatus = null,
+            nurseDataSynced = null,
+            doctorDataSynced = null,
+            createNewBenFlow = null,
+            prescriptionID = null,
+            benVisitNo = sourceVisitNo,
+            visitCategory = null,
+            benFlowID = null,
+            nurseFlag = null,
+            doctorFlag = null,
+            labtechFlag = null,
+            pharmacist_flag = null,
+            visitDate = null,
+            referDate = null,
+            referTo = null,
+            referralReason = null
+        )
     }
 
     private fun getVisitResObserver(benVisitInfo: PatientDisplayWithVisitInfo){
@@ -710,57 +1006,695 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
     }
 
     private fun navigatetoCaseCustomRecordSelf(isVisible: Boolean, it: PatientDisplayWithVisitInfo) {
+        // Refresh ben flow data in background, but do not block click navigation on observer timing.
         getVisitResObserver(it)
-        viewModel.benFlows.observe(viewLifecycleOwner) { benFlowList ->
-            if (benFlowList.isNullOrEmpty()) return@observe
-
-            val distinctList =
-                benFlowList.distinctBy { it.benVisitNo }
-
-            benFlowMap.clear()
-            distinctList.forEach { benFlow ->
-                benFlow.benVisitNo?.let { visitNo ->
-                    benFlowMap[visitNo] = benFlow
-                }
-            }
-
-            benFlowListCache = benFlowMap.values.toList()
 
-            val followupVisit =
-                benFlowListCache.lastOrNull()?.VisitReason == "Follow Up"
+        val visitNo = it.benVisitNo
+        val followupVisitFromCache = visitNo?.let { no ->
+            val visitReasonFromMap = benFlowMap[no]?.VisitReason
+            val visitReasonFromSnapshot = viewModel.benFlows.value
+                ?.firstOrNull { benFlow -> benFlow.benVisitNo == no }
+                ?.VisitReason
+            (visitReasonFromMap ?: visitReasonFromSnapshot) == "Follow Up"
+        } ?: false
+        val followupVisit = followupVisitFromCache || (it.visitCategory == "Follow Up")
 
             findNavController().navigate(
                 R.id.action_caseRecordCustom_self, Bundle().apply {
                     putBoolean("viewRecord", isVisible)
-                    putBoolean("isFlowComplete", false)
+                    putBoolean("isFlowComplete", isVisible)
                     putBoolean("isFollowupVisit", followupVisit)
                     putSerializable("benVisitInfo", it)
                 }
             )
         }
+
+    private suspend fun loadPrescriptionRowsForVisit(visitInfo: PatientDisplayWithVisitInfo) {
+        val visitNo = visitInfo.benVisitNo
+        if (visitNo == null || visitNo <= 0) {
+            dispensedLockedPrescriptionCount = 0
+            convertToPrescriptionValuesFromPC(emptyList(), isDispensed = false, append = false)
+            return
+        }
+        val patientID = visitInfo.patient.patientID
+        val editableRows = viewModel.getPrescriptionForVisitNumAndPatientId(visitInfo)
+        val latestVisitInfo = viewModel.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID, visitNo)
+        val pharmacistFlag = latestVisitInfo?.pharmacist_flag ?: visitInfo.pharmacist_flag ?: 0
+
+        if (pharmacistFlag == 9) {
+            val dispensedRows = viewModel.getDispensedPrescriptionsForVisitNumAndPatientId(patientID, visitNo)
+            if (dispensedRows.isNotEmpty()) {
+                convertToPrescriptionValuesFromPC(dispensedRows, isDispensed = true, append = false)
+                dispensedLockedPrescriptionCount = itemListP.size
+            } else {
+                // Fallback for older/local records where pharmacist table rows are not present yet:
+                // still render existing medicines as dispensed (view-only) and allow new rows via +.
+                convertToPrescriptionValuesFromPC(editableRows, isDispensed = true, append = false)
+                dispensedLockedPrescriptionCount = itemListP.size
+            }
+        } else {
+            val dispensedRows = viewModel.getDispensedPrescriptionsForVisitNumAndPatientId(patientID, visitNo)
+            if (dispensedRows.isNotEmpty()) {
+                // Pending pharmacist cycle: keep old dispensed history visible + current editable rows.
+                convertToPrescriptionValuesFromPC(dispensedRows, isDispensed = true, append = false)
+                dispensedLockedPrescriptionCount = itemListP.size
+                convertToPrescriptionValuesFromPC(editableRows, isDispensed = false, append = true)
+            } else {
+                dispensedLockedPrescriptionCount = 0
+                convertToPrescriptionValuesFromPC(editableRows, isDispensed = false, append = false)
+            }
+        }
+
+        if (::pAdapter.isInitialized) {
+            pAdapter.setDispensedLockedItemCount(dispensedLockedPrescriptionCount)
+        }
+    }
+
+    private fun shouldLoadCphcForm(resolvedType: CphcFormType, targetType: CphcFormType): Boolean {
+        return resolvedType == targetType
+    }
+
+    private fun shouldShowCphcSection(
+        resolvedType: CphcFormType,
+        sectionType: CphcFormType,
+        hasSavedData: Boolean,
+    ): Boolean {
+        return shouldLoadCphcForm(resolvedType, sectionType) ||
+            (resolvedType == CphcFormType.UNKNOWN && hasSavedData)
+    }
+
+    private suspend fun <T> loadCphcSectionIfNeeded(
+        formType: CphcFormType,
+        sectionType: CphcFormType,
+        loader: suspend () -> T?,
+    ): T? {
+        if (!shouldLoadCphcForm(formType, sectionType) && formType != CphcFormType.UNKNOWN) {
+            return null
+        }
+        val saved = loader()
+        return saved.takeIf { shouldShowCphcSection(formType, sectionType, saved != null) }
+    }
+
+    private suspend fun resolveEffectiveBenVisitNoForCphcPopup(patientId: String): Int? {
+        arguments?.getInt("benVisitNo", -1)?.takeIf { it > 0 }?.let { return it }
+
+        if (isFreshCaseEntryFromVisitDetails) {
+            val lastSync = viewModel.getLastVisitInfoSync(patientId)
+            return when {
+                lastSync == null -> 1
+                lastSync.nurseFlag == 1 -> lastSync.benVisitNo
+                else -> lastSync.benVisitNo + 1
+            }
+        }
+
+        return benVisitInfo.benVisitNo?.takeIf { it > 0 }
+    }
+
+    private suspend fun resolveCphcFormTypeForPopup(patientId: String, visitNo: Int): CphcFormType {
+        val fromDb = viewModel.resolveCphcFormTypeForVisit(patientId, visitNo)
+        if (fromDb != CphcFormType.UNKNOWN) return fromDb
+        val visitMaster = masterDb?.visitMasterDb
+        return CphcFormTypeResolver.resolve(visitMaster?.reason, visitMaster?.subCategory)
+    }
+
+    private suspend fun getChiefComplaintsForCphcPopup(
+        patientId: String,
+        visitNo: Int,
+    ): List<ChiefComplaintDB> {
+        val fromDb = viewModel.getChiefComplaintByPatientAndVisit(patientId, visitNo)
+        if (fromDb.isNotEmpty()) return fromDb
+
+        return masterDb?.visitMasterDb?.chiefComplaint.orEmpty().map { cc ->
+            ChiefComplaintDB(
+                id = generateUuid(),
+                chiefComplaintId = cc.id,
+                chiefComplaint = cc.chiefComplaint,
+                duration = cc.duration,
+                durationUnit = cc.durationUnit,
+                description = cc.description,
+                patientID = patientId,
+                benVisitNo = visitNo,
+                benFlowID = null,
+            )
+        }
     }
 
-    fun convertToPrescriptionValuesFromPC(prescriptionCaseRecords: List<PrescriptionCaseRecord?>) {
-            itemListP.clear()
-            for (prescriptionCaseRecord in prescriptionCaseRecords) {
-                val prescriptionValue = prescriptionCaseRecord?.let {
-                    PrescriptionValues(
-                        id = prescriptionCaseRecord.itemId,
-                        form = "",  // Set the appropriate value for form (not available in PrescriptionCaseRecord)
-                        frequency = prescriptionCaseRecord.frequency ?: "",
-                        duration = prescriptionCaseRecord.duration ?: "",
-                        instructions = prescriptionCaseRecord.instructions ?: "",
-                        unit = prescriptionCaseRecord.unit ?: ""
-                    )
+    private fun showPreviousCphcDetailsPopup() {
+        fun boolLabel(value: Boolean?): String = when (value) {
+            true -> getString(R.string.yes)
+            false -> getString(R.string.no)
+            null -> getString(R.string.no_data)
+        }
+        fun valueLabel(value: Any?): String = value?.toString()?.takeIf { it.isNotBlank() } ?: getString(R.string.no_data)
+
+        lifecycleScope.launch {
+            val popupPatientId = if (patId.isNotBlank()) patId else benVisitInfo.patient.patientID
+            val currentVisitNo = resolveEffectiveBenVisitNoForCphcPopup(popupPatientId)
+            val details = if (currentVisitNo == null || currentVisitNo <= 0) {
+                ""
+            } else {
+                buildString {
+                    val formType = resolveCphcFormTypeForPopup(popupPatientId, currentVisitNo)
+
+                    val chiefComplaints =
+                        getChiefComplaintsForCphcPopup(popupPatientId, currentVisitNo)
+                    val earDiagnosis = loadCphcSectionIfNeeded(formType, CphcFormType.EAR) {
+                        viewModel.getEarDiagnosisByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val noseDiagnosis = loadCphcSectionIfNeeded(formType, CphcFormType.NOSE) {
+                        viewModel.getNoseDiagnosisByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val throatDiagnosis = loadCphcSectionIfNeeded(formType, CphcFormType.THROAT) {
+                        viewModel.getThroatDiagnosisByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val oralHealth = loadCphcSectionIfNeeded(formType, CphcFormType.ORAL) {
+                        viewModel.getOralHealthByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val ophthalmicVisit = loadCphcSectionIfNeeded(formType, CphcFormType.OPHTHALMIC) {
+                        viewModel.getOphthalmicByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val elderlyAssessment = loadCphcSectionIfNeeded(formType, CphcFormType.ELDERLY) {
+                        viewModel.getElderlyByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val mentalScreening = loadCphcSectionIfNeeded(formType, CphcFormType.MENTAL) {
+                        viewModel.getMentalByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val painAssessment = loadCphcSectionIfNeeded(formType, CphcFormType.PAIN) {
+                        viewModel.getPainAssessmentByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val psychosocialSupport = loadCphcSectionIfNeeded(formType, CphcFormType.PSYCHOSOCIAL) {
+                        viewModel.getPsychosocialByPatientAndVisit(popupPatientId, currentVisitNo)
+                    }
+                    val hasAnyCphcData =
+                        chiefComplaints.isNotEmpty() ||
+                                earDiagnosis != null ||
+                                noseDiagnosis != null ||
+                                throatDiagnosis != null ||
+                                oralHealth != null ||
+                                ophthalmicVisit != null ||
+                                elderlyAssessment != null ||
+                                mentalScreening != null ||
+                                painAssessment != null ||
+                                psychosocialSupport != null
+                    if (!hasAnyCphcData) return@buildString
+
+                    append(getString(R.string.cphc_visit_current_format, currentVisitNo)).append("\n")
+
+                    if (chiefComplaints.isNotEmpty()) {
+                        append(getString(R.string.select_chief_complaint_without_astrict)).append(":\n")
+                        chiefComplaints.forEach { cc ->
+                            append("- ").append(cc.chiefComplaint ?: "")
+                            if (!cc.duration.isNullOrBlank()) {
+                                append(" (").append(cc.duration)
+                                if (!cc.durationUnit.isNullOrBlank()) {
+                                    append(" ").append(cc.durationUnit)
+                                }
+                                append(")")
+                            }
+                            append("\n")
+                        }
+                    }
+
+                    if (earDiagnosis != null) {
+                        append(getString(R.string.cphc_ear_diagnosis)).append(":\n")
+                        append("- ").append(getString(R.string.ear_difficulty_hearing)).append(": ").append(boolLabel(earDiagnosis.difficultyHearing)).append("\n")
+                        append("- ").append(getString(R.string.ear_whisper_test_response)).append(": ").append(earDiagnosis.whisperTestResponse ?: getString(R.string.no_data)).append("\n")
+                        append("- ").append(getString(R.string.ear_hearing_test_outcome)).append(": ").append(earDiagnosis.hearingTestOutcome ?: getString(R.string.no_data)).append("\n")
+                        append("- ").append(getString(R.string.ear_pain)).append(": ").append(boolLabel(earDiagnosis.earPain)).append("\n")
+                        append("- ").append(getString(R.string.ear_discharge_present)).append(": ").append(boolLabel(earDiagnosis.earDischargePresent)).append("\n")
+                        append("- ").append(getString(R.string.cphc_ear_foreign_body)).append(": ").append(earDiagnosis.foreignBodyInEar ?: getString(R.string.no_data)).append("\n")
+                        append("- ").append(getString(R.string.cphc_ear_condition_type)).append(": ").append(earDiagnosis.earConditionType ?: getString(R.string.no_data)).append("\n")
+                        append("- ").append(getString(R.string.ear_congenital_malformation)).append(": ").append(boolLabel(earDiagnosis.congenitalEarMalformation)).append("\n")
+                    }
+
+                    if (noseDiagnosis != null) {
+                        append(getString(R.string.cphc_nose_diagnosis))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_nose_difficulty_breathing)).append(": ").append(boolLabel(noseDiagnosis.difficultyBreathing)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_open_mouth_breathing)).append(": ").append(boolLabel(noseDiagnosis.openMouthBreathing)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_bleed)).append(": ").append(boolLabel(noseDiagnosis.noseBleed)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_systolic_bp)).append(": ").append(valueLabel(noseDiagnosis.systolicBp)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_diastolic_bp)).append(": ").append(valueLabel(noseDiagnosis.diastolicBp)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_foreign_body)).append(": ").append(valueLabel(noseDiagnosis.foreignBodyNose)).append("\n")
+                        append("- ").append(getString(R.string.cphc_nose_sinusitis)).append(": ").append(boolLabel(noseDiagnosis.sinusitis)).append("\n")
+                    }
+
+                    if (throatDiagnosis != null) {
+                        append(getString(R.string.cphc_throat_diagnosis))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_throat_symptoms)).append(": ").append(valueLabel(throatDiagnosis.symptoms?.joinToString(", "))).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_neck_swelling)).append(": ").append(boolLabel(throatDiagnosis.neckSwelling)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_difficulty_swallowing)).append(": ").append(boolLabel(throatDiagnosis.difficultySwallowing)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_tonsillitis)).append(": ").append(boolLabel(throatDiagnosis.tonsillitis)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_pharyngitis)).append(": ").append(boolLabel(throatDiagnosis.pharyngitis)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_laryngitis)).append(": ").append(boolLabel(throatDiagnosis.laryngitis)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_sinusitis)).append(": ").append(boolLabel(throatDiagnosis.sinusitis)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_cleft_lip)).append(": ").append(boolLabel(throatDiagnosis.cleftLip)).append("\n")
+                        append("- ").append(getString(R.string.cphc_throat_cleft_palate)).append(": ").append(boolLabel(throatDiagnosis.cleftPalate)).append("\n")
+                    }
+
+                    if (oralHealth != null) {
+                        append(getString(R.string.cphc_oral_health))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_oral_tooth_decay_present)).append(": ").append(boolLabel(oralHealth.toothDecayPresent)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_tooth_decay_symptoms)).append(": ").append(valueLabel(oralHealth.toothDecaySymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_gum_disease_present)).append(": ").append(boolLabel(oralHealth.gumDiseasePresent)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_gum_disease_symptoms)).append(": ").append(valueLabel(oralHealth.gumDiseaseSymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_irregular_teeth_jaws)).append(": ").append(boolLabel(oralHealth.irregularTeethJaws)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_abnormal_growth_ulcer)).append(": ").append(boolLabel(oralHealth.abnormalGrowthUlcer)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_cleft_lip_palate)).append(": ").append(boolLabel(oralHealth.cleftLipPalate)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_dental_fluorosis)).append(": ").append(boolLabel(oralHealth.dentalFluorosis)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oral_dental_emergency)).append(": ").append(valueLabel(oralHealth.dentalEmergency)).append("\n")
+                    }
+
+                    if (ophthalmicVisit != null) {
+                        append(getString(R.string.cphc_ophthalmic))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_oph_is_diabetic)).append(": ").append(boolLabel(ophthalmicVisit.isDiabetic)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_screening_performed)).append(": ").append(boolLabel(ophthalmicVisit.screeningPerformed)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_visual_acuity_chart_used)).append(": ").append(valueLabel(ophthalmicVisit.visualAcuityChartUsed)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_dist_va_right)).append(": ").append(valueLabel(ophthalmicVisit.distVARight)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_dist_va_left)).append(": ").append(valueLabel(ophthalmicVisit.distVALeft)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_near_va)).append(": ").append(valueLabel(ophthalmicVisit.nearVA)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_case_id_conditions)).append(": ").append(valueLabel(ophthalmicVisit.caseIdConditions)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_cataract_symptoms)).append(": ").append(boolLabel(ophthalmicVisit.cataractSymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_glaucoma_symptoms)).append(": ").append(boolLabel(ophthalmicVisit.glaucomaSymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_diabetic_retinopathy_symptoms)).append(": ").append(boolLabel(ophthalmicVisit.diabeticRetinopathySymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_presbyopia_symptoms)).append(": ").append(boolLabel(ophthalmicVisit.presbyopiaSymptoms)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_trachoma_status)).append(": ").append(valueLabel(ophthalmicVisit.trachomaStatus)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_corneal_disease_type)).append(": ").append(valueLabel(ophthalmicVisit.cornealDiseaseType)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_vitamin_a_deficiency)).append(": ").append(boolLabel(ophthalmicVisit.vitaminADeficiency)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_injury_type)).append(": ").append(valueLabel(ophthalmicVisit.injuryType)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_foreign_body_removal)).append(": ").append(valueLabel(ophthalmicVisit.foreignBodyRemoval)).append("\n")
+                        append("- ").append(getString(R.string.cphc_oph_chemical_exposure)).append(": ").append(boolLabel(ophthalmicVisit.chemicalExposure)).append("\n")
+                    }
+
+                    if (elderlyAssessment != null) {
+                        append(getString(R.string.cphc_elderly))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_elderly_geriatric_complaints)).append(": ").append(boolLabel(elderlyAssessment.geriatricComplaints)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_multiple_chronic_conditions)).append(": ").append(boolLabel(elderlyAssessment.multipleChronicConditions)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_recent_falls)).append(": ").append(boolLabel(elderlyAssessment.recentFalls)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_difficulty_walking_balance)).append(": ").append(boolLabel(elderlyAssessment.difficultyWalkingBalance)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_visual_hearing_difficulty)).append(": ").append(boolLabel(elderlyAssessment.visualHearingDifficulty)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_functional_decline)).append(": ").append(boolLabel(elderlyAssessment.functionalDecline)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_bathing)).append(": ").append(valueLabel(elderlyAssessment.bathing)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dressing)).append(": ").append(valueLabel(elderlyAssessment.dressing)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_toileting)).append(": ").append(valueLabel(elderlyAssessment.toileting)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_transferring)).append(": ").append(valueLabel(elderlyAssessment.transferring)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_continence)).append(": ").append(valueLabel(elderlyAssessment.continence)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_feeding)).append(": ").append(valueLabel(elderlyAssessment.feeding)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_total_score)).append(": ").append(valueLabel(elderlyAssessment.totalScore)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_functional_status)).append(": ").append(valueLabel(elderlyAssessment.functionalStatus)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_functional_decline_flag)).append(": ").append(boolLabel(elderlyAssessment.functionalDeclineFlag)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_memory_loss)).append(": ").append(boolLabel(elderlyAssessment.memoryLoss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_memory_loss)).append(": ").append(boolLabel(elderlyAssessment.dementiaMemoryLoss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_disorientation)).append(": ").append(boolLabel(elderlyAssessment.dementiaDisorientation)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_behavioural_changes)).append(": ").append(boolLabel(elderlyAssessment.dementiaBehaviouralChanges)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_self_care_decline)).append(": ").append(boolLabel(elderlyAssessment.dementiaSelfCareDecline)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_outcome)).append(": ").append(valueLabel(elderlyAssessment.dementiaScreeningOutcome)).append("\n")
+                        append("- ").append(getString(R.string.cphc_elderly_dementia_referral_required)).append(": ").append(boolLabel(elderlyAssessment.dementiaReferralRequired)).append("\n")
+                        appendNestedObjectFields(
+                            target = this,
+                            header = getString(R.string.cphc_referral),
+                            referral = elderlyAssessment.referralFollowUp,
+                            fallbackModel = elderlyAssessment,
+                            boolFormatter = ::boolLabel,
+                            valueFormatter = ::valueLabel
+                        )
+                    }
+
+                    if (mentalScreening != null) {
+                        append(getString(R.string.cphc_mental))
+                            .append(":\n")
+                        append("- ").append(getString(R.string.cphc_mental_emotional_behavioural_concerns)).append(": ").append(boolLabel(mentalScreening.emotionalBehaviouralConcerns)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_use_concerns)).append(": ").append(boolLabel(mentalScreening.substanceUseConcerns)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_self_harm_suicide_thoughts)).append(": ").append(boolLabel(mentalScreening.selfHarmSuicideThoughts)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_memory_loss_confusion)).append(": ").append(boolLabel(mentalScreening.memoryLossConfusion)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_seizures_fits_loc)).append(": ").append(boolLabel(mentalScreening.seizuresFitsLoc)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_is_postpartum)).append(": ").append(boolLabel(mentalScreening.isPostpartum)).append("\n")
+                        append("- ").append(getString(R.string.phq9_little_interest)).append(": ").append(valueLabel(mentalScreening.phq9LittleInterest)).append("\n")
+                        append("- ").append(getString(R.string.phq9_feeling_down)).append(": ").append(valueLabel(mentalScreening.phq9FeelingDown)).append("\n")
+                        append("- ").append(getString(R.string.phq9_sleep_trouble)).append(": ").append(valueLabel(mentalScreening.phq9SleepTrouble)).append("\n")
+                        append("- ").append(getString(R.string.phq9_feeling_tired)).append(": ").append(valueLabel(mentalScreening.phq9FeelingTired)).append("\n")
+                        append("- ").append(getString(R.string.phq9_appetite)).append(": ").append(valueLabel(mentalScreening.phq9Appetite)).append("\n")
+                        append("- ").append(getString(R.string.phq9_feeling_bad)).append(": ").append(valueLabel(mentalScreening.phq9FeelingBad)).append("\n")
+                        append("- ").append(getString(R.string.phq9_concentration)).append(": ").append(valueLabel(mentalScreening.phq9Concentration)).append("\n")
+                        append("- ").append(getString(R.string.phq9_moving_slowly)).append(": ").append(valueLabel(mentalScreening.phq9MovingSlowly)).append("\n")
+                        append("- ").append(getString(R.string.phq9_self_harm_thoughts)).append(": ").append(valueLabel(mentalScreening.phq9SelfHarmThoughts)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_phq9_total_score)).append(": ").append(valueLabel(mentalScreening.phq9TotalScore)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_phq9_depression_severity)).append(": ").append(valueLabel(mentalScreening.phq9DepressionSeverity)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_phq9_system_action)).append(": ").append(valueLabel(mentalScreening.phq9SystemAction)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_current_tobacco_use)).append(": ").append(boolLabel(mentalScreening.substanceCurrentTobaccoUse)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_tobacco_type)).append(": ").append(valueLabel(mentalScreening.substanceTobaccoType)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_tobacco_frequency)).append(": ").append(valueLabel(mentalScreening.substanceTobaccoFrequency)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_tobacco_outcome)).append(": ").append(valueLabel(mentalScreening.substanceTobaccoOutcome)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_use)).append(": ").append(boolLabel(mentalScreening.substanceAlcoholUse)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_tobacco_use)).append(": ").append(boolLabel(mentalScreening.substanceTobaccoUse)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_other_use)).append(": ").append(boolLabel(mentalScreening.substanceOtherUse)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_other_specify)).append(": ").append(valueLabel(mentalScreening.substanceOtherSpecify)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_frequency)).append(": ").append(valueLabel(mentalScreening.substanceFrequency)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_system_action)).append(": ").append(valueLabel(mentalScreening.substanceSystemAction)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_brief_intervention_given)).append(": ").append(boolLabel(mentalScreening.briefInterventionGiven)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_current_thoughts)).append(": ").append(boolLabel(mentalScreening.suicideCurrentThoughts)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_plan)).append(": ").append(boolLabel(mentalScreening.suicidePlan)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_previous_attempt)).append(": ").append(boolLabel(mentalScreening.suicidePreviousAttempt)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_hopelessness)).append(": ").append(boolLabel(mentalScreening.suicideHopelessness)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_immediate_assess)).append(": ").append(boolLabel(mentalScreening.suicideImmediateAssess)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_suicide_risk_level)).append(": ").append(valueLabel(mentalScreening.suicideRiskLevel)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_dementia_progressive_memory_loss)).append(": ").append(boolLabel(mentalScreening.dementiaProgressiveMemoryLoss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_dementia_forgetting_recent)).append(": ").append(boolLabel(mentalScreening.dementiaForgettingRecent)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_dementia_disorientation)).append(": ").append(boolLabel(mentalScreening.dementiaDisorientation)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_dementia_daily_activities)).append(": ").append(boolLabel(mentalScreening.dementiaDailyActivities)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_dementia_behavioural_changes)).append(": ").append(boolLabel(mentalScreening.dementiaBehaviouralChanges)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_epilepsy_recurrent_seizures)).append(": ").append(boolLabel(mentalScreening.epilepsyRecurrentSeizures)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_epilepsy_jerky_movements)).append(": ").append(boolLabel(mentalScreening.epilepsyJerkyMovements)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_epilepsy_tongue_bite)).append(": ").append(boolLabel(mentalScreening.epilepsyTongueBite)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_epilepsy_confusion_after)).append(": ").append(boolLabel(mentalScreening.epilepsyConfusionAfter)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_epilepsy_loc_duration)).append(": ").append(valueLabel(mentalScreening.epilepsyLocDuration)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_loss)).append(": ").append(boolLabel(mentalScreening.substance_alcohol_loss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_impact)).append(": ").append(boolLabel(mentalScreening.substanceAlcoholImpact)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_withdrawal)).append(": ").append(boolLabel(mentalScreening.substanceAlcoholWithdrawal)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_problematic)).append(": ").append(boolLabel(mentalScreening.substanceAlcoholProblematic)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_classification)).append(": ").append(valueLabel(mentalScreening.substanceAlcoholClassification)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_system_action)).append(": ").append(valueLabel(mentalScreening.substanceAlcoholSystemAction)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_substance_alcohol_frequency)).append(": ").append(valueLabel(mentalScreening.substance_alcohol_frequency)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_recurrent_episode_loss)).append(": ").append(boolLabel(mentalScreening.edRecurrentEpisodeloss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_recurrent_jerky_movements)).append(": ").append(boolLabel(mentalScreening.edRecurrentJerkyMovements)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_confusion_drowsiness)).append(": ").append(boolLabel(mentalScreening.edConfusionordrowsiness)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_progressive_memory_loss)).append(": ").append(boolLabel(mentalScreening.edProgressiveMemoryLoss)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_confusion_disorientation)).append(": ").append(boolLabel(mentalScreening.edConfusionDisorientation)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_functional_decline)).append(": ").append(boolLabel(mentalScreening.edFunctionalDecline)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_screening_outcome)).append(": ").append(valueLabel(mentalScreening.edScreeningOutcome)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_psychosocial_intervention_provided)).append(": ").append(boolLabel(mentalScreening.edPsychosocialInterventionProvided)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_intervention_type)).append(": ").append(valueLabel(mentalScreening.edInterventionType)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_session_date)).append(": ").append(valueLabel(mentalScreening.edSessionDate)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_duration_minutes)).append(": ").append(valueLabel(mentalScreening.edDurationMinutes)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_remarks)).append(": ").append(valueLabel(mentalScreening.edRemarks)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_referral_required)).append(": ").append(valueLabel(mentalScreening.edReferralRequired)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_ed_reason)).append(": ").append(valueLabel(mentalScreening.edReason)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_referral_required)).append(": ").append(boolLabel(mentalScreening.referralRequired)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_referral_level)).append(": ").append(valueLabel(mentalScreening.referralLevel)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_reason_for_referral)).append(": ").append(valueLabel(mentalScreening.reasonForReferral)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_referral_date)).append(": ").append(valueLabel(mentalScreening.referralDate)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_follow_up_required)).append(": ").append(boolLabel(mentalScreening.followUpRequired)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_follow_up_date)).append(": ").append(valueLabel(mentalScreening.followUpDate)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_improvement_noted)).append(": ").append(valueLabel(mentalScreening.improvementNoted)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_adherence_to_advice)).append(": ").append(valueLabel(mentalScreening.adherenceToAdvice)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_referral_escalation_required)).append(": ").append(boolLabel(mentalScreening.referralEscalationRequired)).append("\n")
+                        append("- ").append(getString(R.string.cphc_mental_case_closure_reason)).append(": ").append(valueLabel(mentalScreening.caseClosureReason)).append("\n")
+                    }
+
+                    if (painAssessment != null) {
+                        append(getString(R.string.pain_symptom_assessment_palliative)).append(":\n")
+                        append("- ").append(getString(R.string.pain_severity)).append(": ").append(valueLabel(painAssessment.painSeverity)).append("\n")
+                        append("- ").append(getString(R.string.pain_duration)).append(": ").append(valueLabel(painAssessment.painDuration)).append("\n")
+                        append("- ").append(getString(R.string.other_symptoms_present)).append(": ").append(boolLabel(painAssessment.symptomsPresent)).append("\n")
+                        append("- ").append(getString(R.string.other_symptoms_severity)).append(": ").append(valueLabel(painAssessment.otherSymptomsSeverity)).append("\n")
+                        append("- ").append(getString(R.string.immediate_relief_provided)).append(": ").append(boolLabel(painAssessment.immediateReliefProvided)).append("\n")
+                        append("- ").append(getString(R.string.persistent_pain_present)).append(": ").append(boolLabel(painAssessment.persistentPainPresent)).append("\n")
+                        append("- ").append(getString(R.string.distressing_symptoms_present)).append(": ").append(valueLabel(painAssessment.distressingSymptoms)).append("\n")
+                        append("- ").append(getString(R.string.bedridden_or_severely_dependent)).append(": ").append(boolLabel(painAssessment.bedriddenOrSeverelyDependent)).append("\n")
+                        append("- ").append(getString(R.string.life_limiting_illness_known)).append(": ").append(boolLabel(painAssessment.lifeLimitingIllnessKnown)).append("\n")
+                        append("- ").append(getString(R.string.caregiver_support_required)).append(": ").append(boolLabel(painAssessment.caregiverSupportRequired)).append("\n")
+                        append("- ").append(getString(R.string.palliative_care_eligible)).append(": ").append(boolLabel(painAssessment.palliativeCareEligible)).append("\n")
+                        append("- ").append(getString(R.string.symptom_assessment_basic_field_title)).append(": ").append(valueLabel(painAssessment.basicSymptomsSelected)).append("\n")
+                        append("- ").append(getString(R.string.basic_symptom_relief_provided)).append(": ").append(boolLabel(painAssessment.basicSymptomReliefProvided)).append("\n")
+                        append("- ").append(getString(R.string.basic_psychosocial_support_provided)).append(": ").append(boolLabel(painAssessment.basicPsychosocialSupportProvided)).append("\n")
+                        append("- ").append(getString(R.string.basic_caregiver_counselling_provided)).append(": ").append(boolLabel(painAssessment.basicCaregiverCounsellingProvided)).append("\n")
+                        append("- ").append(getString(R.string.basic_management_remarks)).append(": ").append(valueLabel(painAssessment.basicManagementRemarks)).append("\n")
+                        appendNestedObjectFields(
+                            target = this,
+                            header = getString(R.string.cphc_referral),
+                            referral = painAssessment.referralFollowUp,
+                            fallbackModel = painAssessment,
+                            boolFormatter = ::boolLabel,
+                            valueFormatter = ::valueLabel
+                        )
+                    }
+
+                    if (psychosocialSupport != null) {
+                        append(getString(R.string.title_psychosocial_caregiver_support)).append(":\n")
+                        append("- ").append(getString(R.string.psychosocial_counselling_provided)).append(": ").append(boolLabel(psychosocialSupport.psychosocialCounsellingProvided)).append("\n")
+                        append("- ").append(getString(R.string.psychosocial_caregiver_counselling)).append(": ").append(boolLabel(psychosocialSupport.caregiverCounsellingProvided)).append("\n")
+                        append("- ").append(getString(R.string.psychosocial_caregiver_distress)).append(": ").append(boolLabel(psychosocialSupport.caregiverDistressIdentified)).append("\n")
+                        append("- ").append(getString(R.string.psychosocial_counselling_remarks)).append(": ").append(valueLabel(psychosocialSupport.counsellingRemarks)).append("\n")
+                        appendNestedObjectFields(
+                            target = this,
+                            header = getString(R.string.cphc_referral),
+                            referral = psychosocialSupport.referralFollowUp,
+                            fallbackModel = psychosocialSupport,
+                            boolFormatter = ::boolLabel,
+                            valueFormatter = ::valueLabel
+                        )
+                    }
+                }.trim()
+            }
+
+            val contentView = buildPreviousCphcDialogContent(details.ifBlank { getString(R.string.no_previous_cphc_details) })
+
+            AlertDialog.Builder(requireContext())
+                .setTitle(getString(R.string.cphc_details_title))
+                .setView(contentView)
+                .setPositiveButton(getString(R.string.ok), null)
+                .show()
+        }
+    }
+
+    private fun buildPreviousCphcDialogContent(detailsText: String): View {
+        val context = requireContext()
+        var showUnavailable = false
+        val content = TextView(context).apply {
+            text = buildStyledCphcDetails(detailsText, includeUnavailable = showUnavailable)
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f)
+            setLineSpacing(dpToPx(4f).toFloat(), 1f)
+            setTextColor(ContextCompat.getColor(context, android.R.color.black))
+            setPadding(dpToPx(20f), dpToPx(8f), dpToPx(20f), dpToPx(4f))
+        }
+
+        val scrollView = ScrollView(context).apply {
+            addView(content)
+        }
+
+        val unavailableCount = countUnavailableRows(detailsText)
+        if (unavailableCount <= 0) return scrollView
+
+        val toggleLink = TextView(context).apply {
+            layoutParams = LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            ).apply {
+                gravity = Gravity.END
+            }
+
+            gravity = Gravity.END
+
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+            setTextColor(ContextCompat.getColor(context, android.R.color.holo_blue_dark))
+            setPadding(dpToPx(20f), 0, dpToPx(20f), dpToPx(10f))
+            movementMethod = LinkMovementMethod.getInstance()
+            highlightColor = ContextCompat.getColor(context, android.R.color.transparent)
+
+            fun renderToggleText() {
+                val label = if (showUnavailable) {
+                    getString(R.string.cphc_hide_unavailable_details)
+                } else {
+                    getString(R.string.cphc_show_unavailable_details, unavailableCount)
                 }
-                if (prescriptionValue != null) {
-                    itemListP.add(prescriptionValue)
+                val clickable = object : ClickableSpan() {
+                    override fun onClick(widget: View) {
+                        showUnavailable = !showUnavailable
+                        content.text = buildStyledCphcDetails(detailsText, includeUnavailable = showUnavailable)
+                        renderToggleText()
+                    }
+
+                    override fun updateDrawState(ds: TextPaint) {
+                        super.updateDrawState(ds)
+                        ds.isUnderlineText = true
+                        ds.color = ContextCompat.getColor(context, android.R.color.holo_blue_dark)
+                    }
+                }
+                text = SpannableStringBuilder(label).apply {
+                    setSpan(clickable, 0, label.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                 }
             }
-            if (itemListP.isNotEmpty()) {
-                pAdapter.notifyDataSetChanged()
+
+            renderToggleText()
+        }
+
+        return LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+
+            addView(toggleLink)
+            addView(scrollView)
+        }
+    }
+
+    private fun buildStyledCphcDetails(detailsText: String, includeUnavailable: Boolean = false): CharSequence {
+        val styled = SpannableStringBuilder()
+        val lines = detailsText.lines()
+        val chiefComplaintsHeader = "${getString(R.string.select_chief_complaint_without_astrict)}:"
+        val reportedConcernsHeader = getString(R.string.cphc_reported_concerns)
+        val visitLinePrefix = getString(R.string.cphc_visit_current_format, 0).substringBefore("0")
+        val noDataLabel = getString(R.string.no_data)
+
+        lines.forEachIndexed { index, rawLine ->
+            val line = rawLine.trimEnd()
+            val isVisitLine = line.startsWith(visitLinePrefix)
+            val isSectionHeader = line.isNotBlank() && !line.startsWith("- ") && line.endsWith(":")
+            val isNestedItemLine = line.startsWith("-- ")
+            val isItemLine = line.startsWith("- ")
+            val itemValue = if ((isItemLine || isNestedItemLine) && line.contains(":")) line.substringAfter(":").trim() else ""
+            val shouldHideItem = (isItemLine || isNestedItemLine) && (itemValue.equals("N/A", ignoreCase = true) || itemValue.equals(noDataLabel, ignoreCase = true))
+
+            if (shouldHideItem && !includeUnavailable) {
+                return@forEachIndexed
+            }
+
+            val displaySectionHeader = if (line == chiefComplaintsHeader) {
+                reportedConcernsHeader
+            } else {
+                line
+            }
+
+            val displayLine = when {
+                isVisitLine -> line
+                isSectionHeader -> "\u2022 $displaySectionHeader"
+                isNestedItemLine -> "      \u25AA ${line.removePrefix("-- ").trimStart()}"
+                isItemLine -> "   \u25E6 ${line.removePrefix("- ").trimStart()}"
+                else -> line
+            }
+            val start = styled.length
+            styled.append(displayLine)
+
+            val isHeader = isVisitLine || isSectionHeader
+            if (isHeader) {
+                styled.setSpan(StyleSpan(Typeface.BOLD), start, styled.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
             }
+            if (isItemLine || isNestedItemLine) {
+                val colonIndex = displayLine.indexOf(':')
+                if (colonIndex >= 0 && colonIndex + 1 < displayLine.length) {
+                    val valueStartInLine = (colonIndex + 1).let { idx ->
+                        if (idx < displayLine.length && displayLine[idx] == ' ') idx + 1 else idx
+                    }
+                    if (valueStartInLine < displayLine.length) {
+                        styled.setSpan(
+                            StyleSpan(Typeface.BOLD),
+                            start + valueStartInLine,
+                            start + displayLine.length,
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                    }
+                }
+            }
+
+            if (index < lines.lastIndex) {
+                styled.append('\n')
+            }
+        }
+        while (styled.isNotEmpty() && styled.last() == '\n') {
+            styled.delete(styled.length - 1, styled.length)
+        }
+        return styled
+    }
+
+    private fun countUnavailableRows(detailsText: String): Int {
+        val noDataLabel = getString(R.string.no_data)
+        return detailsText.lines().count { line ->
+            val trimmed = line.trim()
+            val isItemLine = trimmed.startsWith("- ") || trimmed.startsWith("-- ")
+            if (!isItemLine || !trimmed.contains(":")) return@count false
+            val itemValue = trimmed.substringAfter(":").trim()
+            itemValue.equals("N/A", ignoreCase = true) || itemValue.equals(noDataLabel, ignoreCase = true)
+        }
+    }
+
+    private fun dpToPx(dp: Float): Int {
+        val density = resources.displayMetrics.density
+        return (dp * density).toInt()
+    }
+
+    private fun appendNestedObjectFields(
+        target: StringBuilder,
+        header: String,
+        referral: ReferralFollowUpFields?,
+        fallbackModel: ReferralFollowUpModel?,
+        boolFormatter: (Boolean?) -> String,
+        valueFormatter: (Any?) -> String
+    ) {
+        target.append("- ").append(header).append(":\n")
+        val source = referral ?: fallbackModel
+        if (source == null) {
+            target.append("-- ").append(getString(R.string.no_data)).append("\n")
+            return
+        }
+
+        target.append("-- ").append(getString(R.string.cphc_case_status)).append(": ").append(valueFormatter(source.caseStatus)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_date_of_death)).append(": ").append(valueFormatter(source.dateOfDeath)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_follow_up_required)).append(": ").append(boolFormatter(source.followUpRequired)).append("\n")
+        target.append("-- ").append(getString(R.string.follow_up_date_title)).append(": ").append(valueFormatter(source.followUpDate)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_referral_required)).append(": ").append(boolFormatter(source.referralRequired)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_referral_level)).append(": ").append(valueFormatter(source.referralLevel)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_reason_for_referral)).append(": ").append(valueFormatter(source.reasonForReferral)).append("\n")
+        target.append("-- ").append(getString(R.string.cphc_remarks)).append(": ").append(valueFormatter(source.remarks)).append("\n")
+    }
+
+    fun convertToPrescriptionValuesFromPC(
+        prescriptionCaseRecords: List<PrescriptionCaseRecord?>,
+        isDispensed: Boolean = false,
+        append: Boolean = false
+    ) {
+        if (!append) {
+            itemListP.clear()
+        }
+        var index = itemListP.size + 1
+        for (prescriptionCaseRecord in prescriptionCaseRecords) {
+            val prescriptionValue = prescriptionCaseRecord?.let {
+                PrescriptionValues(
+                    id = it.itemId,
+                    form = "",
+                    frequency = it.frequency ?: "",
+                    duration = it.duration ?: "",
+                    instructions = it.instructions ?: "",
+                    unit = it.unit ?: DEFAULT_DURATION_UNIT,
+                    isDispensed = isDispensed,
+                    title = "Medicine - $index"
+                )
+            }
+            if (prescriptionValue != null) {
+                itemListP.add(prescriptionValue)
+                index++
+            }
+        }
+        if (!append && itemListP.isEmpty()) {
+            itemListP.add(PrescriptionValues())
         }
+        if (::pAdapter.isInitialized) {
+            pAdapter.notifyDataSetChanged()
+            updateSubmitButtonText()
+            binding.plusButtonP.isEnabled = !isAnyItemEmptyP()
+        }
+    }
+
+    override fun onDestroyView() {
+        // Clean up all observers to prevent memory leaks
+        viewModel.benFlows.removeObservers(viewLifecycleOwner)
+        viewModel.labReportList.removeObservers(viewLifecycleOwner)
+        viewModel.chiefComplaintDB.removeObservers(viewLifecycleOwner)
+        viewModel.previousTests.removeObservers(viewLifecycleOwner)
+        viewModel.formMedicineDosage.removeObservers(viewLifecycleOwner)
+        viewModel.tempDB.removeObservers(viewLifecycleOwner)
+        viewModel.counsellingProvided.removeObservers(viewLifecycleOwner)
+        viewModel.procedureDropdown.removeObservers(viewLifecycleOwner)
+        viewModel.higherHealthCare.removeObservers(viewLifecycleOwner)
+        viewModel.vitalsDB.removeObservers(viewLifecycleOwner)
+        viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
+        viewModel.isDataDeleted.removeObservers(viewLifecycleOwner)
+
+        Timber.d("onDestroyView: All observers cleaned up")
+        super.onDestroyView()
+    }
+
     fun convertToDiagnosisValues(diagnosisCaseRecords: List<DiagnosisCaseRecord?>): List<DiagnosisValue> {
         itemListD.clear()
         val diagnosisValuesList = mutableListOf<DiagnosisValue>()
@@ -768,15 +1702,19 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         for (diagnosisCaseRecord in diagnosisCaseRecords) {
             val diagnosisValue = diagnosisCaseRecord?.let {
                 DiagnosisValue(
-                    id = -1,  // Set the appropriate value for id if needed
-                    diagnosis = diagnosisCaseRecord.diagnosis
+                    id = -1,
+                    diagnosis = diagnosisCaseRecord.diagnosis,
+                    isPreFilled = true
                 )
             }
             if (diagnosisValue != null) {
                 itemListD.add(diagnosisValue)
             }
         }
-        if (itemListD.isNotEmpty()) {
+        if (itemListD.isEmpty()) {
+            itemListD.add(DiagnosisValue())
+        }
+        if (itemListD.isNotEmpty() && ::dAdapter.isInitialized) {
             dAdapter.notifyDataSetChanged()
         }
 
@@ -784,7 +1722,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
     }
 
 
-        fun convertToPrescriptionValues(prescriptionTemplateDB: List<PrescriptionTemplateDB?>) {
+    fun convertToPrescriptionValues(prescriptionTemplateDB: List<PrescriptionTemplateDB?>) {
         for (templateDB in prescriptionTemplateDB) {
             val prescriptionValue = templateDB?.let {
                 it?.drugName?.let { it1 ->
@@ -794,7 +1732,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                         frequency = templateDB.frequency ?: "",
                         duration = templateDB.duration ?: "",
                         instructions = templateDB.instructions ?: "",
-                        unit = templateDB.unit ?: "",
+                        unit = templateDB.unit ?: DEFAULT_DURATION_UNIT,
                         title = "Medicine - ${itemListP.size + 1}"
                     )
                 }
@@ -824,51 +1762,103 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                         viewModeltemplate.callMarkDel(it)
                     }
                     viewModeltemplate.callDel()
-                    Toast.makeText(requireContext(), "Template deleted", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.template_deleted), Toast.LENGTH_SHORT).show()
 
                 }
             }
-            )
+        )
 
 
         if (!syncBottomSheet.isVisible)
             syncBottomSheet.show(childFragmentManager, resources.getString(R.string.sync))
     }
 
-    private fun populateVitalsFieldsW(vitals: VitalsMasterDb) {
-     //   hideNullFieldsW(vitals)
-        binding.inputHeight.setText(vitals?.height?:"")
-        binding.inputWeight.setText(vitals?.weight?:"")
-        binding.inputBmi.setText(vitals.bmi?:"")
-//        binding.inputWaistCircum.setText(vitals.waistCircumference.toString())
-        binding.inputTemperature.setText(vitals.temperature?:"")
-        binding.inputPulseRate.setText(vitals.pulseRate?:"")
-        binding.inputSpo2.setText(vitals.spo2?:"")
-        binding.bpCustomLayout.inputBpDiastolic.setText(vitals.bpDiastolic?:"0")
-        binding.bpCustomLayout.inputBpSystolic.setText(vitals.bpSystolic?:"0")
-        binding.inputRespiratoryPerMin.setText(vitals.respiratoryRate?:"")
-        binding.inputRBS.setText(vitals.rbs?:"")
-    }
-
-    private fun populateVitalsFields() {
-     //   hideNullFields()
-        // Check if the masterDb and vitalsMasterDb are not null
-        if (masterDb != null && masterDb?.vitalsMasterDb != null) {
-            val vitals = masterDb?.vitalsMasterDb
-            binding.inputHeight.setText(vitals?.height?:"")
-            binding.inputWeight.setText(vitals?.weight?:"")
-            binding.inputBmi.setText(vitals?.bmi?:"")
-//            binding.inputWaistCircum.setText(vitals?.waistCircumference?:")
-            binding.inputTemperature.setText(vitals?.temperature?:"")
-            binding.inputPulseRate.setText(vitals?.pulseRate?:"")
-            binding.inputSpo2.setText(vitals?.spo2?:"")
-            binding.bpCustomLayout.inputBpDiastolic.setText(vitals?.bpDiastolic?:"0")
-            binding.bpCustomLayout.inputBpSystolic.setText(vitals?.bpSystolic?:"0")
-            binding.inputRespiratoryPerMin.setText(vitals?.respiratoryRate?:"")
-            binding.inputRBS.setText(vitals?.rbs?:"")
+    private fun setupVitalsDisplay() {
+        val preferBundleVitals = isFreshCaseEntryFromVisitDetails
+        populateVitalsFieldsW(
+            buildVitalsFromSources(
+                fromDb = null,
+                fromMaster = masterDb?.vitalsMasterDb,
+                preferBundle = preferBundleVitals
+            )
+        )
+
+        if (!isDoctorExistingVisitFlow()) return
+
+        viewModel.vitalsDB.removeObservers(viewLifecycleOwner)
+        viewModel.vitalsDB.observe(viewLifecycleOwner) { vitalsDB ->
+            populateVitalsFieldsW(
+                buildVitalsFromSources(
+                    fromDb = vitalsDB,
+                    fromMaster = masterDb?.vitalsMasterDb,
+                    preferBundle = preferBundleVitals
+                )
+            )
         }
     }
 
+    private fun vitalsDisplayValue(value: String?): String {
+        if (value.isNullOrBlank() || value.equals("null", ignoreCase = true)) return ""
+        return value.trim()
+    }
+
+    private fun pickVitalValue(
+        dbValue: String?,
+        bundleValue: String?,
+        preferBundle: Boolean
+    ): String {
+        val db = vitalsDisplayValue(dbValue)
+        val bundle = vitalsDisplayValue(bundleValue)
+        return if (preferBundle) bundle.ifEmpty { db } else db.ifEmpty { bundle }
+    }
+
+    private fun buildVitalsFromSources(
+        fromDb: PatientVitalsModel?,
+        fromMaster: VitalsMasterDb?,
+        preferBundle: Boolean
+    ): VitalsMasterDb {
+        return VitalsMasterDb(
+            height = pickVitalValue(fromDb?.height, fromMaster?.height, preferBundle),
+            weight = pickVitalValue(fromDb?.weight, fromMaster?.weight, preferBundle),
+            bmi = pickVitalValue(fromDb?.bmi, fromMaster?.bmi, preferBundle),
+            waistCircumference = pickVitalValue(
+                fromDb?.waistCircumference,
+                fromMaster?.waistCircumference,
+                preferBundle
+            ),
+            temperature = pickVitalValue(fromDb?.temperature, fromMaster?.temperature, preferBundle),
+            pulseRate = pickVitalValue(fromDb?.pulseRate, fromMaster?.pulseRate, preferBundle),
+            spo2 = pickVitalValue(fromDb?.spo2, fromMaster?.spo2, preferBundle),
+            bpSystolic = pickVitalValue(fromDb?.bpSystolic, fromMaster?.bpSystolic, preferBundle),
+            bpDiastolic = pickVitalValue(fromDb?.bpDiastolic, fromMaster?.bpDiastolic, preferBundle),
+            respiratoryRate = pickVitalValue(
+                fromDb?.respiratoryRate,
+                fromMaster?.respiratoryRate,
+                preferBundle
+            ),
+            rbs = pickVitalValue(fromDb?.rbs, fromMaster?.rbs, preferBundle)
+        )
+    }
+
+    private fun populateVitalsFieldsW(vitals: VitalsMasterDb) {
+        binding.inputHeight.setText(vitals.height.orEmpty())
+        binding.inputWeight.setText(vitals.weight.orEmpty())
+        binding.inputBmi.setText(vitals.bmi.orEmpty())
+        binding.inputTemperature.setText(vitals.temperature.orEmpty())
+        binding.inputPulseRate.setText(vitals.pulseRate.orEmpty())
+        binding.inputSpo2.setText(vitals.spo2.orEmpty())
+        binding.bpCustomLayout.inputBpDiastolic.setText(
+            vitals.bpDiastolic.takeUnless { it.isNullOrBlank() } ?: "0"
+        )
+        binding.bpCustomLayout.inputBpSystolic.setText(
+            vitals.bpSystolic.takeUnless { it.isNullOrBlank() } ?: "0"
+        )
+        binding.inputRespiratoryPerMin.setText(vitals.respiratoryRate.orEmpty())
+        binding.inputRBS.setText(vitals.rbs.orEmpty())
+        binding.vitalsExtra.visibility = View.VISIBLE
+        binding.vitalsLayout.visibility = View.VISIBLE
+    }
+
     private fun hideNullFieldsW(vitalsDB: VitalsMasterDb) {
         val itemH = vitalsDB.height
         val itemW = vitalsDB.weight
@@ -923,18 +1913,18 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             binding.spo2EditTxt.visibility = View.VISIBLE
         }
         //Custtomr layout validation not required start
-/*
-        if (itemBs.isNullOrEmpty() || itemBs.equals("null")) {
-            binding.bpSystolicEditTxt.visibility = View.GONE
-        } else {
-            binding.bpSystolicEditTxt.visibility = View.VISIBLE
-        }*/
-
-       /* if (itemBd.isNullOrEmpty() || itemBd.equals("null")) {
-            binding.bpDiastolicEditTxt.visibility = View.GONE
-        } else {
-            binding.bpDiastolicEditTxt.visibility = View.VISIBLE
-        }*/
+        /*
+                if (itemBs.isNullOrEmpty() || itemBs.equals("null")) {
+                    binding.bpSystolicEditTxt.visibility = View.GONE
+                } else {
+                    binding.bpSystolicEditTxt.visibility = View.VISIBLE
+                }*/
+
+        /* if (itemBd.isNullOrEmpty() || itemBd.equals("null")) {
+             binding.bpDiastolicEditTxt.visibility = View.GONE
+         } else {
+             binding.bpDiastolicEditTxt.visibility = View.VISIBLE
+         }*/
         //Custtomr layout validation not required end
 
         if (itemRs.isNullOrEmpty() || itemRs.equals("null")) {
@@ -998,12 +1988,12 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             binding.spo2EditTxt.visibility = View.GONE
         }
         //Custtomr layout validation not required start
-      /*  if (itemBs.isNullOrEmpty() || itemBs.equals("null")) {
-            binding.bpSystolicEditTxt.visibility = View.GONE
-        }
-        if (itemBd.isNullOrEmpty() || itemBd.equals("null")) {
-            binding.bpDiastolicEditTxt.visibility = View.GONE
-        }*/
+        /*  if (itemBs.isNullOrEmpty() || itemBs.equals("null")) {
+              binding.bpSystolicEditTxt.visibility = View.GONE
+          }
+          if (itemBd.isNullOrEmpty() || itemBd.equals("null")) {
+              binding.bpDiastolicEditTxt.visibility = View.GONE
+          }*/
         //Custtomr layout validation not required end
 
         if (itemRs.isNullOrEmpty() || itemRs.equals("null")) {
@@ -1024,6 +2014,108 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         }
     }
 
+    private fun hideReferEditorSection() {
+        binding.textReferHeading.visibility = View.GONE
+        binding.referDropdown.visibility = View.GONE
+        binding.referReason.visibility = View.GONE
+    }
+
+    private fun applyReferEditorSection(record: InvestigationCaseRecord?, readOnly: Boolean) {
+        val referInstitutionName = record?.institutionId?.let { referNameMap[it] }
+            ?: benVisitInfo.referTo?.takeIf { it.isNotBlank() }
+        val referReasonText = record?.referReson
+            ?.split(pattern)
+            ?.firstOrNull()
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+            ?: benVisitInfo.referralReason
+                ?.split(pattern)
+                ?.firstOrNull()
+                ?.trim()
+                ?.takeIf { it.isNotEmpty() }
+        val hasReferData = !referInstitutionName.isNullOrBlank() || referReasonText != null
+        if (!hasReferData) {
+            if (readOnly) {
+                hideReferEditorSection()
+            }
+            return
+        }
+        binding.textReferHeading.visibility = View.VISIBLE
+        binding.referDropdown.visibility = View.VISIBLE
+        binding.referReason.visibility = View.VISIBLE
+        referInstitutionName?.let { binding.referDropdownText.setText(it, false) }
+        referReasonText?.let { binding.inputReferReason.setText(it) }
+        if (readOnly) {
+            disableDropdownField(binding.referDropdownText, binding.referDropdown)
+            binding.inputReferReason.isFocusable = false
+            binding.inputReferReason.isClickable = false
+            binding.inputReferReason.isCursorVisible = false
+            disableTextInputLayout(binding.referReason)
+        }
+    }
+
+    private fun applyCounsellingField(record: InvestigationCaseRecord?, readOnly: Boolean) {
+        val counsellingList = record?.counsellingProvidedList?.filter { it.isNotBlank() }
+            ?: record?.counsellingTypes?.trim()?.takeIf { it.isNotEmpty() }?.let { listOf(it) }
+        binding.routeDropDown.visibility = if (counsellingList.isNullOrEmpty()) {
+            if (readOnly) View.GONE else View.VISIBLE
+        } else {
+            binding.routeDropDownVal.setText(counsellingList.joinToString(", "), false)
+            if (readOnly) {
+                disableDropdownField(binding.routeDropDownVal, binding.routeDropDown)
+            }
+            View.VISIBLE
+        }
+    }
+
+    private fun applyExternalInvestigationField(record: InvestigationCaseRecord?, readOnly: Boolean) {
+        val externalVal = record?.externalInvestigations?.trim()?.takeIf { it.isNotEmpty() }
+        if (externalVal == null) {
+            if (readOnly) {
+                binding.externalI.visibility = View.GONE
+            }
+            return
+        }
+        binding.externalI.visibility = View.VISIBLE
+        binding.inputExternalI.setText(externalVal)
+        if (readOnly) {
+            binding.inputExternalI.isFocusable = false
+            binding.inputExternalI.isClickable = false
+            binding.inputExternalI.isCursorVisible = false
+            binding.inputExternalI.keyListener = null
+            disableTextInputLayout(binding.externalI)
+        }
+    }
+
+    /** Test name picker starts empty on each page open; saved tests remain in [investigationBD] for submit logic. */
+    private fun resetTestNameFieldToDefault(readOnly: Boolean) {
+        if (isAlreadyFilledReadOnlyForVisibility) {
+            binding.testName.visibility = View.GONE
+            return
+        }
+        if (readOnly) {
+            binding.testName.visibility = View.GONE
+            return
+        }
+        selectedTestName.clear()
+        binding.selectF.text = getString(R.string.select_test_name)
+        binding.selectF.setTextColor(
+            ContextCompat.getColor(binding.root.context, R.color.defaultInput)
+        )
+        binding.testName.visibility = View.VISIBLE
+        familyM?.isClickable = true
+        familyM?.isEnabled = true
+    }
+
+    /** Restore counselling, external investigation, and refer from saved investigation record. */
+    private fun applySavedInvestigationToUi(record: InvestigationCaseRecord?, readOnly: Boolean) {
+        resetTestNameFieldToDefault(readOnly)
+        if (record == null) return
+        applyCounsellingField(record, readOnly)
+        applyExternalInvestigationField(record, readOnly)
+        applyReferEditorSection(record, readOnly)
+    }
+
     fun mapProcedureIdsToNames(proceduresMasterData: List<ProceduresMasterData>,procedureIds: List<Int>?): List<String> {
         if (procedureIds != null) {
             return procedureIds.mapNotNull { id ->
@@ -1036,12 +2128,15 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         proceduresMasterData: List<ProceduresMasterData>,
         labReportProcedureTypes: List<String>
     ) {
+        // Remove existing observer to prevent duplicates
+        viewModel.previousTests.removeObservers(viewLifecycleOwner)
         viewModel.previousTests.observe(viewLifecycleOwner) {
             val selectedItems =
 //                BooleanArray(procedureDropdown.size) { false }
                 BooleanArray(procedureDropdown.size) { selectedTestName.contains(it) }
             investigationBD = viewModel.previousTests.value
-            val resp = investigationBD?.previousTestIds?.split(",")?.map { it.toInt() }
+            val resp = investigationBD?.previousTestIds?.split(",")
+                ?.mapNotNull { it.trim().takeIf { s -> s.isNotEmpty() }?.toIntOrNull() }
 //            if (resp != null) {
 //                val previousTestList = resp.toMutableList()
 //                for (index in selectedItems.indices) {
@@ -1056,7 +2151,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 //            }.toSet().toTypedArray()
 
             val builder = AlertDialog.Builder(requireContext())
-                .setTitle("Select Test Name")
+                .setTitle(getString(R.string.select_test_name))
                 .setCancelable(false)
                 .setMultiChoiceItems(
                     procedureDropdown.map { it.procedureName }.toTypedArray(),
@@ -1064,7 +2159,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                 ) { _, which, isChecked ->
                     if (isChecked) {
 //                        if (!disabledItems.contains(which)) {
-                            selectedTestName.add(which)
+                        selectedTestName.add(which)
 //                        } else {
 //                            Toast.makeText(
 //                                requireContext(),
@@ -1088,6 +2183,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                             R.color.black
                         )
                     )
+                    // Update button text based on selection
+                    updateSubmitButtonText()
                 }
                 .setNeutralButton("Clear all") { dialog, which ->
                     selectedTestName.clear()
@@ -1102,6 +2199,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                             R.color.defaultInput
                         )
                     )
+                    // Update button text after clearing
+                    updateSubmitButtonText()
                 }
 
             val alertDialog = builder.create()
@@ -1109,8 +2208,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                 if (resp != null) {
                     val previousTestList = resp.toMutableList()
                     for (index in selectedItems.indices) {
-                        if (previousTestList.contains(procedureDropdown!!.get(index).procedureID)) {
-                            alertDialog.listView.get(index).isEnabled = true
+                        if (previousTestList.contains(procedureDropdown[index].procedureID)) {
+                            alertDialog.listView[index].isEnabled = true
 //                            alertDialog.listView.get(index).setOnClickListener() {
 //                                alertDialog.listView.get(index).isEnabled = false
 //                            }
@@ -1133,13 +2232,84 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
     fun isAnyItemEmptyP(): Boolean {
         for (item in itemListP) {
-            if (item.form.isEmpty() || item.frequency.isEmpty() || item.duration.isEmpty()) {
+            // Skip validation for dispensed medicines (they are read-only)
+            if (item.isDispensed) {
+                continue
+            }
+            val hasForm = item.form.isNotEmpty() || item.id != null
+            if (!hasForm || item.frequency.isEmpty() || item.duration.isEmpty()) {
                 return true
             }
         }
         return false
     }
 
+    private fun parseTestIds(csv: String?): Set<Int> {
+        if (csv.isNullOrBlank()) return emptySet()
+        return csv.split(",")
+            .mapNotNull { it.trim().toIntOrNull() }
+            .toSet()
+    }
+
+    private fun isTestNameFieldBlank(): Boolean {
+        val text = binding.selectF.text?.toString().orEmpty()
+        return text.isBlank() || text == getString(R.string.select_test_name)
+    }
+
+    private fun getSelectedTestIds(): Set<Int> {
+        val selectedText = binding.selectF.text?.toString().orEmpty()
+        if (isTestNameFieldBlank()) return emptySet()
+        return selectedText.split(",")
+            .mapNotNull { testName ->
+                val trimmedName = testName.trim()
+                if (trimmedName.isBlank()) null else findKeyByValue(testNameMap, trimmedName)
+            }
+            .toSet()
+    }
+
+    private fun hasTestSelectionChanged(): Boolean {
+        val selectedIds = getSelectedTestIds()
+        val existingIds = parseTestIds(investigationBD?.previousTestIds) + parseTestIds(investigationBD?.newTestIds)
+        if (investigationBD == null) {
+            return selectedIds.isNotEmpty()
+        }
+        // Blank field on open means no UI change; existing saved tests are preserved on submit.
+        if (selectedIds.isEmpty()) return false
+        return selectedIds != existingIds
+    }
+
+    /**
+     * Updates the submit button text based on whether new tests or medicines are selected.
+     * - "Close Case" when no new test/medicine (just reviewing)
+     * - "Submit" when new test/medicine is selected (making changes)
+     */
+    private fun updateSubmitButtonText() {
+        val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit) ?: return
+
+        // Only update for lab review state (doctorFlag=3 and pharmacist_flag=9)
+        val isLabReviewState = benVisitInfo.nurseFlag == 9 &&
+                benVisitInfo.doctorFlag == 3 &&
+                isDoctorWorkflowRole()
+
+        if (!isLabReviewState) return
+
+        val currentPharmacistFlag = effectivePharmacistFlagForVisibility ?: benVisitInfo.pharmacist_flag ?: 0
+        if (currentPharmacistFlag != 9) return
+
+        val hasNewTest = hasTestSelectionChanged()
+
+        // Check if new medicine is selected
+        val newRowsStart = dispensedLockedPrescriptionCount.coerceAtMost(itemListP.size)
+        val hasNewMedicine = itemListP.drop(newRowsStart).any { it.id != null }
+
+        // Update button text
+        btnSubmit.text = if (hasNewTest || hasNewMedicine) {
+            getString(R.string.submit)
+        } else {
+            getString(R.string.close_case_btn)
+        }
+    }
+
     private fun <K, V> findKeyByValue(map: Map<K, V>, value: V): K? {
         return map.entries.find { it.value == value }?.key
     }
@@ -1222,12 +2392,22 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         }
 
 
-        val testName = binding.selectF.text.toString()
-        val testNamesList = testName.split(",").map { it.trim() }
-        val idString = testNamesList.joinToString(",") { testNameS ->
-            val id =
-                findKeyByValue(testNameMap, testNameS) // Replace with your function to get the ID
-            id?.toString() ?: ""
+        val selectedTestIds = getSelectedTestIds()
+        val existingTestIds = parseTestIds(investigationBD?.previousTestIds) + parseTestIds(investigationBD?.newTestIds)
+        val hasNewOrChangedTests = if (investigationBD == null) {
+            selectedTestIds.isNotEmpty()
+        } else {
+            selectedTestIds.isNotEmpty() && selectedTestIds != existingTestIds
+        }
+        val mergedPreviousTestIds = if (investigationBD != null) {
+            (existingTestIds + selectedTestIds).takeIf { it.isNotEmpty() }?.joinToString(",")
+        } else {
+            selectedTestIds.takeIf { it.isNotEmpty() }?.joinToString(",")
+        }
+        val newTestIds = if (hasNewOrChangedTests) {
+            selectedTestIds.joinToString(",")
+        } else {
+            null
         }
 
         val externalInvestigations = binding.inputExternalI.text.toString().nullIfEmpty()
@@ -1235,19 +2415,12 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         val counsellingTypesVal = binding.routeDropDownVal.text.toString().nullIfEmpty()
         val referVal = binding.referDropdownText.text.toString().nullIfEmpty()
         val referId = findKeyByValue(referNameMap, referVal)
-        val previousTestIdsTmp =
-            if (investigationBD != null && investigationBD?.previousTestIds != null) {
-                investigationBD?.previousTestIds?.trim()?.plus("," + idString.nullIfEmpty())
-                    ?.replace("null,", "")
-            } else {
-                idString.nullIfEmpty()
-            }
         val counsellingList = counsellingTypesVal?.let { arrayListOf(it) } ?: arrayListOf()
 
         val investigation = InvestigationCaseRecord(
             investigationCaseRecordId = generateUuid(),
-            previousTestIds = previousTestIdsTmp,
-            newTestIds = idString.nullIfEmpty(),
+            previousTestIds = mergedPreviousTestIds,
+            newTestIds = newTestIds,
             externalInvestigations = externalInvestigations,
             counsellingProvidedList = counsellingList,
             counsellingTypes = counsellingTypesVal,
@@ -1300,23 +2473,26 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             }
         }
 
-        if (idString.nullIfEmpty() == null) {
-            doctorFlag = 9
-        } else {
-            doctorFlag = 2
+        val hasLabInCase = selectedTestIds.isNotEmpty() || existingTestIds.isNotEmpty()
+        doctorFlag = when {
+            hasNewOrChangedTests -> 2
+            hasLabInCase -> 3
+            else -> 9
         }
         if (prescriptionList.size == 0) {
             pharmacistFlag = 0
         } else {
             pharmacistFlag = 1
         }
+        // Auto-close: nothing prescribed (no test + no medicine) → mark case as complete immediately
+        val effectivePharmacistFlag = if (doctorFlag == 9 && pharmacistFlag == 0) 9 else pharmacistFlag
         val patientVisitInfoSync = PatientVisitInfoSync(
             patientID = patId,
             benVisitNo = benVisitNo,
             createNewBenFlow = createNewBenflow,
             nurseFlag = 9,
             doctorFlag = doctorFlag,
-            pharmacist_flag = pharmacistFlag,
+            pharmacist_flag = effectivePharmacistFlag,
             visitDate = Date(),
         )
 
@@ -1358,12 +2534,22 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         }
 
 
-        val testName = binding.selectF.text.toString()
-        val testNamesList = testName.split(",").map { it.trim() }
-        val idString = testNamesList.joinToString(",") { testNameS ->
-            val id =
-                findKeyByValue(testNameMap, testNameS) // Replace with your function to get the ID
-            id?.toString() ?: ""
+        val selectedTestIds = getSelectedTestIds()
+        val existingTestIds = parseTestIds(investigationBD?.previousTestIds) + parseTestIds(investigationBD?.newTestIds)
+        val hasNewOrChangedTests = if (investigationBD == null) {
+            selectedTestIds.isNotEmpty()
+        } else {
+            selectedTestIds.isNotEmpty() && selectedTestIds != existingTestIds
+        }
+        val mergedPreviousTestIds = if (investigationBD != null) {
+            (existingTestIds + selectedTestIds).takeIf { it.isNotEmpty() }?.joinToString(",")
+        } else {
+            selectedTestIds.takeIf { it.isNotEmpty() }?.joinToString(",")
+        }
+        val newTestIds = if (hasNewOrChangedTests) {
+            selectedTestIds.joinToString(",")
+        } else {
+            null
         }
 
         val externalInvestigations = binding.inputExternalI.text.toString().nullIfEmpty()
@@ -1371,13 +2557,6 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
         val counsellingTypesVal = binding.routeDropDownVal.text.toString().nullIfEmpty()
         val referVal = binding.referDropdownText.text.toString().nullIfEmpty()
         val referId = findKeyByValue(referNameMap, referVal)
-        val previousTestIdsTmp =
-            if (investigationBD != null && investigationBD?.previousTestIds != null) {
-                investigationBD?.previousTestIds?.trim()?.plus("," + idString.nullIfEmpty())
-                    ?.replace("null,", "")
-            } else {
-                idString.nullIfEmpty()
-            }
 
 
         val counsellingList = counsellingTypesVal?.let { arrayListOf(it) } ?: arrayListOf()
@@ -1385,8 +2564,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
         val investigation = InvestigationCaseRecord(
             investigationCaseRecordId = generateUuid(),
-            previousTestIds = previousTestIdsTmp,
-            newTestIds = idString.nullIfEmpty(),
+            previousTestIds = mergedPreviousTestIds,
+            newTestIds = newTestIds,
             externalInvestigations = externalInvestigations,
             counsellingProvidedList = counsellingList,
             counsellingTypes = counsellingTypesVal,
@@ -1398,7 +2577,8 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
 
         val prescriptionList = mutableListOf<PrescriptionCaseRecord>();
-        for (i in 0 until itemListP.size) {
+        val prescriptionStartIndex = dispensedLockedPrescriptionCount.coerceAtMost(itemListP.size)
+        for (i in prescriptionStartIndex until itemListP.size) {
             val prescriptionData = itemListP[i]
             var formVal = prescriptionData.id
             var freqVal = prescriptionData.frequency.nullIfEmpty()
@@ -1417,17 +2597,18 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                     frequency = mappedFrequency,
                     duration = durVal,
                     instructions = instructions,
-                    unit = unitVal ?: "Day(s)",
+                    unit = unitVal ?: DEFAULT_DURATION_UNIT,
                     patientID = patId,
                     benVisitNo = benVisitNo
                 )
                 prescriptionList.add(pres);
             }
         }
-        if (idString.nullIfEmpty() == null) {
-            doctorFlag = 9
-        } else {
-            doctorFlag = 2
+        val hasLabInCase = selectedTestIds.isNotEmpty() || existingTestIds.isNotEmpty()
+        doctorFlag = when {
+            hasNewOrChangedTests -> 2
+            hasLabInCase -> 3
+            else -> 9
         }
 
         viewModel.saveDoctorData(
@@ -1492,7 +2673,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                                     drugId = formVal,
                                     frequency = freqVal,
                                     duration = durVal,
-                                    unit = unitVal ?: "Day(s)",
+                                    unit = unitVal ?: DEFAULT_DURATION_UNIT,
                                     instructions = instructions,
                                     deleteStatus = 0
                                 )
@@ -1532,9 +2713,7 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
     }
 
     override fun onCancelAction() {
-        if (preferenceDao.isDoctorSelected()) {
-            val intent = Intent(context, HomeActivity::class.java)
-            startActivity(intent)
+        if (isDoctorWorkflowRole()) {
             requireActivity().finish()
         } else {
             findNavController().navigateUp()
@@ -1542,22 +2721,118 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
     }
 
     fun navigateNext() {
-        if (preferenceDao.isDoctorSelected() || viewRecordFragment == true) {
+        val isDoctorLabReviewCase = ::benVisitInfo.isInitialized &&
+                benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 3
+        if (isDoctorExistingVisitFlow() || isDoctorLabReviewCase) {
+            val visitNo = benVisitInfo.benVisitNo
+            if (visitNo == null || visitNo <= 0) {
+                Toast.makeText(
+                    requireContext(),
+                    resources.getString(R.string.something_wend_wong),
+                    Toast.LENGTH_SHORT
+                ).show()
+                return
+            }
+
+            // Manual close scenario: lab was involved (doctorFlag=3) AND doctor is NOT adding a new test
+            // If doctor picks a new test → let the normal save flow handle it (new lab cycle)
+            // If doctor submits with no test → close case with confirmation dialog
+            val isLabReviewState = benVisitInfo.nurseFlag == 9 &&
+                    benVisitInfo.doctorFlag == 3 &&
+                    isDoctorWorkflowRole()
+
+            if (isLabReviewState) {
+                val currentPharmacistFlag = effectivePharmacistFlagForVisibility ?: benVisitInfo.pharmacist_flag ?: 0
+                val hasNewTest = hasTestSelectionChanged()
+
+                val hasNewMedicine = if (currentPharmacistFlag == 9) {
+                    val newRowsStart = dispensedLockedPrescriptionCount.coerceAtMost(itemListP.size)
+                    itemListP.drop(newRowsStart).any { it.id != null }
+                } else {
+                    itemListP.any { it.id != null }
+                }
+
+                if (currentPharmacistFlag != 1 && !hasNewTest && !hasNewMedicine) {
+                    // No new test selected → confirm closure
+                    // Set up observer BEFORE showing dialog to avoid race condition
+                    viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
+                    viewModel.isDataSaved.observe(viewLifecycleOwner) { saved ->
+                        if (saved == true) {
+                            WorkerUtils.clinicalPushWorker(requireContext())
+                            Toast.makeText(
+                                requireContext(),
+                                getString(R.string.case_closed_successfully),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            requireActivity().finish()
+                        }
+                    }
+
+                    // Also observe error messages from closure validation
+                    viewModel.errorMessage.removeObservers(viewLifecycleOwner)
+                    viewModel.errorMessage.observe(viewLifecycleOwner) { errorMsg ->
+                        if (!errorMsg.isNullOrBlank()) {
+                            Toast.makeText(
+                                requireContext(),
+                                errorMsg,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                    }
+
+                    AlertDialog.Builder(requireContext())
+                        .setTitle(getString(R.string.info))
+                        .setMessage(getString(R.string.case_close_confirmation))
+                        .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
+                            dialog.dismiss()
+                            // Fetch latest visit info from DB before closing to ensure flags are current
+                            lifecycleScope.launch {
+                                val latestVisitInfo = viewModel.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                                    benVisitInfo.patient.patientID,
+                                    visitNo
+                                )
+                                if (latestVisitInfo != null) {
+                                    // Update benVisitInfo with latest flags
+                                    val updatedBenVisitInfo = benVisitInfo.copy(
+                                        labtechFlag = latestVisitInfo.labtechFlag,
+                                        pharmacist_flag = latestVisitInfo.pharmacist_flag,
+                                        doctorFlag = latestVisitInfo.doctorFlag,
+                                        nurseFlag = latestVisitInfo.nurseFlag
+                                    )
+                                    viewModel.closeCaseManually(updatedBenVisitInfo)
+                                } else {
+                                    viewModel.closeCaseManually(benVisitInfo)
+                                }
+                            }
+                        }
+                        .setNegativeButton(getString(R.string.no)) { dialog, _ ->
+                            dialog.dismiss()
+                        }
+                        .setCancelable(false)
+                        .show()
+                    return
+                }
+                // Has new test → fall through to normal save flow (starts new lab cycle)
+            }
 
             val validate = dAdapter.setError()
             if (validate == -1) {
+                viewModel.isDataDeleted.removeObservers(viewLifecycleOwner)
                 viewModel.deleteOldDoctorData(
                     benVisitInfo.patient.patientID,
-                    benVisitInfo.benVisitNo!!
+                    visitNo
                 )
+                // Remove existing observer to prevent duplicates
+                viewModel.isDataDeleted.removeObservers(viewLifecycleOwner)
                 viewModel.isDataDeleted.observe(viewLifecycleOwner) { state ->
                     when (state!!) {
                         true -> {
-                            saveDoctorData(benVisitInfo.benVisitNo!!)
+                            saveDoctorData(visitNo)
+                            viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
                             viewModel.isDataSaved.observe(viewLifecycleOwner) {
                                 when (it!!) {
                                     true -> {
-                                        WorkerUtils.triggerAmritSyncWorker(requireContext())
+                                        WorkerUtils.clinicalPushWorker(requireContext())
                                         requireActivity().runOnUiThread {
                                             Toast.makeText(
                                                 requireContext(),
@@ -1565,26 +2840,15 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                                                 Toast.LENGTH_SHORT
                                             ).show()
                                         }
-                                        val intent = Intent(context, HomeActivity::class.java)
-                                        startActivity(intent)
                                         requireActivity().finish()
                                     }
 
-                                    else -> {
-
-//                                        requireActivity().runOnUiThread {
-//                                            Toast.makeText(requireContext(), resources.getString(R.string.something_wend_wong), Toast.LENGTH_SHORT).show()
-//                                        }
-                                    }
+                                    else -> {}
                                 }
                             }
                         }
 
-                        else -> {
-//                            requireActivity().runOnUiThread {
-//                                Toast.makeText(requireContext(), resources.getString(R.string.something_wend_wong), Toast.LENGTH_SHORT).show()
-//                            }
-                        }
+                        else -> {}
                     }
                 }
             } else {
@@ -1621,10 +2885,12 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
 
                     saveNurseAndDoctorData(benVisitNo, createNewBenflow, user)
 
+                    // Remove existing observer to prevent duplicates
+                    viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
                     viewModel.isDataSaved.observe(viewLifecycleOwner) { state ->
                         when (state!!) {
                             true -> {
-                                WorkerUtils.triggerAmritSyncWorker(requireContext())
+                                WorkerUtils.clinicalPushWorker(requireContext())
                                 requireActivity().runOnUiThread {
                                     Toast.makeText(
                                         requireContext(),
@@ -1632,16 +2898,10 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                                         Toast.LENGTH_SHORT
                                     ).show()
                                 }
-                                val intent = Intent(context, HomeActivity::class.java)
-                                startActivity(intent)
                                 requireActivity().finish()
                             }
 
-                            else -> {
-//                                requireActivity().runOnUiThread {
-//                                    Toast.makeText(requireContext(), resources.getString(R.string.something_wend_wong), Toast.LENGTH_SHORT).show()
-//                                }
-                            }
+                            else -> {}
                         }
 
                     }
@@ -1649,7 +2909,6 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
                 } else {
                     showToast()
                 }
-//                }
             }
         }
     }
@@ -1663,4 +2922,4 @@ class CaseRecordCustom : Fragment(R.layout.case_record_custom_layout), Navigatio
             ).show()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordViewModel.kt
index cf5ce1321..c495f4c25 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/case_record/CaseRecordViewModel.kt
@@ -24,31 +24,51 @@ import org.piramalswasthya.cho.model.BenFlow
 import org.piramalswasthya.cho.model.ChiefComplaintDB
 import org.piramalswasthya.cho.model.CounsellingProvided
 import org.piramalswasthya.cho.model.DiagnosisCaseRecord
+import org.piramalswasthya.cho.model.EarDiagnosisAssessment
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
 import org.piramalswasthya.cho.model.HigherHealthCenter
 import org.piramalswasthya.cho.model.InvestigationCaseRecord
 import org.piramalswasthya.cho.model.ItemMasterList
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+import org.piramalswasthya.cho.model.NoseDiagnosisAssessment
+import org.piramalswasthya.cho.model.OphthalmicVisit
+import org.piramalswasthya.cho.model.OralHealth
 import org.piramalswasthya.cho.model.PastIllnessHistory
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVitalsModel
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
 import org.piramalswasthya.cho.model.PrescriptionCaseRecord
 import org.piramalswasthya.cho.model.PrescriptionDTO
 import org.piramalswasthya.cho.model.PrescriptionTemplateDB
 import org.piramalswasthya.cho.model.ProcedureDTO
 import org.piramalswasthya.cho.model.ProcedureDataWithComponent
 import org.piramalswasthya.cho.model.ProceduresMasterData
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+import org.piramalswasthya.cho.model.ThroatDiagnosisAssessment
 import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.repositories.BenFlowRepo
 import org.piramalswasthya.cho.repositories.CaseRecordeRepo
 import org.piramalswasthya.cho.repositories.DoctorMasterDataMaleRepo
+import org.piramalswasthya.cho.repositories.EarDiagnosisRepo
+import org.piramalswasthya.cho.repositories.ElderlyHealthRepo
 import org.piramalswasthya.cho.repositories.MaleMasterDataRepository
+import org.piramalswasthya.cho.repositories.MentalHealthScreeningRepo
+import org.piramalswasthya.cho.repositories.NoseDiagnosisRepo
+import org.piramalswasthya.cho.repositories.OphthalmicRepository
+import org.piramalswasthya.cho.repositories.OralHealthRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
+import org.piramalswasthya.cho.repositories.PainAndSymptomAssessmentRepo
 import org.piramalswasthya.cho.repositories.PrescriptionTemplateRepo
 import org.piramalswasthya.cho.repositories.ProcedureRepo
+import org.piramalswasthya.cho.repositories.PsychosocialCaregiverSupportRepo
+import org.piramalswasthya.cho.repositories.ThroatDiagnosisRepo
 import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.repositories.VisitReasonsAndCategoriesRepo
 import org.piramalswasthya.cho.repositories.VitalsRepo
+import org.piramalswasthya.cho.ui.commons.CphcFormType
+import org.piramalswasthya.cho.ui.commons.CphcFormTypeResolver
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.Exception
@@ -60,6 +80,15 @@ class CaseRecordViewModel @Inject constructor(
     private val doctorMasterDataMaleRepo: DoctorMasterDataMaleRepo,
     private val visitReasonsAndCategoriesRepo: VisitReasonsAndCategoriesRepo,
     private val vitalsRepo: VitalsRepo,
+    private val earDiagnosisRepo: EarDiagnosisRepo,
+    private val noseDiagnosisRepo: NoseDiagnosisRepo,
+    private val throatDiagnosisRepo: ThroatDiagnosisRepo,
+    private val oralHealthRepo: OralHealthRepo,
+    private val ophthalmicRepository: OphthalmicRepository,
+    private val elderlyHealthRepo: ElderlyHealthRepo,
+    private val mentalHealthScreeningRepo: MentalHealthScreeningRepo,
+    private val painAndSymptomAssessmentRepo: PainAndSymptomAssessmentRepo,
+    private val psychosocialCaregiverSupportRepo: PsychosocialCaregiverSupportRepo,
     preferenceDao: PreferenceDao,
     private val procedureRepo: ProcedureRepo,
     private val visitRepo: VisitReasonsAndCategoriesRepo,
@@ -70,7 +99,8 @@ class CaseRecordViewModel @Inject constructor(
     private val investigationDao: InvestigationDao,
     private val userRepo: UserRepo,
     private val templateRepo: PrescriptionTemplateRepo,
-    private val benFlowRepo: BenFlowRepo
+    private val benFlowRepo: BenFlowRepo,
+    private val caseClosureManager: org.piramalswasthya.cho.helpers.CaseClosureManager
 ): ViewModel() {
     val userId  = userRepo.getLoggedInUserAsFlow()
     private val _isDataDeleted = MutableLiveData<Boolean>(false)
@@ -85,6 +115,14 @@ class CaseRecordViewModel @Inject constructor(
     val isDataSaved: MutableLiveData<Boolean>
         get() = _isDataSaved
 
+    private val _errorMessage = MutableLiveData<String?>()
+    val errorMessage: LiveData<String?>
+        get() = _errorMessage
+
+    private val _requiresClosureConfirmation = MutableLiveData<Boolean>(false)
+    val requiresClosureConfirmation: LiveData<Boolean>
+        get() = _requiresClosureConfirmation
+
     private val _isClickedSS=MutableLiveData<Boolean>(false)
 
     val isClickedSS: MutableLiveData<Boolean>
@@ -129,8 +167,8 @@ class CaseRecordViewModel @Inject constructor(
     val chiefComplaintDB: LiveData<List<ChiefComplaintDB>>
         get() = _chiefComplaintDB
 
-    private val _vitalsDB = MutableLiveData<PatientVitalsModel>()
-    val vitalsDB: LiveData<PatientVitalsModel>
+    private val _vitalsDB = MutableLiveData<PatientVitalsModel?>()
+    val vitalsDB: LiveData<PatientVitalsModel?>
         get() = _vitalsDB
 
 //    private val _visitReason = MutableLiveData<String?>()
@@ -170,6 +208,62 @@ class CaseRecordViewModel @Inject constructor(
     suspend fun getPrescriptionForVisitNumAndPatientId(benVisitInfo: PatientDisplayWithVisitInfo):List<PrescriptionCaseRecord?>{
             return caseRecordeRepo.getPrescriptionByPatientIDAndVisitNumber(benVisitInfo)
     }
+    
+    suspend fun getDispensedPrescriptionsForVisitNumAndPatientId(patientID: String, benVisitNo: Int): List<PrescriptionCaseRecord?> {
+        return try {
+            val latestVisitInfo = patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                patientID,
+                benVisitNo
+            )
+            // Get ALL prescriptions for this visit (there may be multiple if medicine was dispensed multiple times)
+            val prescriptions = prescriptionDao.getPrescriptionsByPatientIdAndBenVisitNo(patientID, benVisitNo)
+            if (prescriptions.isNullOrEmpty()) {
+                Timber.d("No dispensed prescriptions found for patientID=$patientID, benVisitNo=$benVisitNo")
+                emptyList()
+            } else {
+                val pharmacistFlag = latestVisitInfo?.pharmacist_flag ?: 0
+                // When pharmacist is pending, latest prescription represents current editable cycle (not dispensed yet).
+                // Older records in this visit are already dispensed and should stay visible as history.
+                val dispensedPrescriptionRows =
+                    (if (pharmacistFlag == 9) prescriptions else prescriptions.drop(1))
+                        .sortedBy { it.id }
+
+                if (dispensedPrescriptionRows.isEmpty()) {
+                    Timber.d("No dispensed history rows for patientID=$patientID, benVisitNo=$benVisitNo, pharmacist_flag=$pharmacistFlag")
+                    return emptyList()
+                }
+
+                Timber.d(
+                    "Found ${dispensedPrescriptionRows.size} dispensed prescription records for patientID=$patientID, benVisitNo=$benVisitNo, pharmacist_flag=$pharmacistFlag"
+                )
+                // Get prescribed drugs from ALL prescriptions (to handle multiple dispensing cycles)
+                val allDispensedDrugs = mutableListOf<PrescriptionCaseRecord>()
+                dispensedPrescriptionRows.forEach { prescription ->
+                    val prescribedDrugs = prescriptionDao.getPrescribedDrugs(prescription.id)
+                    prescribedDrugs?.forEach { drug ->
+                        allDispensedDrugs.add(
+                            PrescriptionCaseRecord(
+                                prescriptionCaseRecordId = "dispensed_${drug.id}",
+                                itemId = drug.drugID.toInt(),
+                                frequency = drug.frequency,
+                                duration = drug.duration,
+                                instructions = drug.instructions,
+                                unit = drug.durationUnit,
+                                patientID = patientID,
+                                benFlowID = prescription.benFlowID,
+                                benVisitNo = benVisitNo
+                            )
+                        )
+                    }
+                }
+                Timber.d("Total dispensed drugs across all prescriptions: ${allDispensedDrugs.size}")
+                allDispensedDrugs
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Error getting dispensed prescriptions")
+            emptyList()
+        }
+    }
     suspend fun getProvisionalDiagnosisForVisitNumAndPatientId(benVisitInfo: PatientDisplayWithVisitInfo):List<DiagnosisCaseRecord?>{
         return caseRecordeRepo.getDiagnosisByPatientIDAndVisitNumber(benVisitInfo)
     }
@@ -181,14 +275,16 @@ class CaseRecordViewModel @Inject constructor(
     fun getPatientDisplayListForDoctorByPatient(patientID: String) : Flow<List<PatientDisplayWithVisitInfo>> {
         return patientVisitInfoSyncRepo.getPatientDisplayListForDoctorByPatient(patientID)
     }
-      fun getVitalsDB(patientID:String) {
+    fun getVitalsDB(patientID: String, benVisitNo: Int? = null) {
         viewModelScope.launch {
             try {
-                _vitalsDB.value =
+                _vitalsDB.value = if (benVisitNo != null) {
+                    vitalsRepo.getPatientVitalsByPatientIDAndBenVisitNo(patientID, benVisitNo)
+                } else {
                     vitalsRepo.getVitalsDetailsByPatientIDAndBenVisitNoForFollowUp(patientID)
-
+                }
             } catch (e: java.lang.Exception) {
-                Timber.d("Error in Getting Higher Health Care $e")
+                Timber.d("Error loading vitals for case record $e")
             }
         }
     }
@@ -202,6 +298,174 @@ class CaseRecordViewModel @Inject constructor(
         }
     }
 
+    suspend fun getChiefComplaintByPatientAndVisit(patientID: String, benVisitNo: Int): List<ChiefComplaintDB> {
+        return try {
+            visitReasonsAndCategoriesRepo.getChiefComplaintDBByPatientId(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getChiefComplaintByPatientAndVisit $e")
+            emptyList()
+        }
+    }
+
+    suspend fun getVitalsByPatientAndVisit(patientID: String, benVisitNo: Int): PatientVitalsModel? {
+        return try {
+            vitalsRepo.getPatientVitalsByPatientIDAndBenVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getVitalsByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getEarDiagnosisByPatientAndVisit(patientID: String, benVisitNo: Int): EarDiagnosisAssessment? {
+        return try {
+            earDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getEarDiagnosisByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getLatestChiefComplaints(patientID: String): List<ChiefComplaintDB> {
+        return try {
+            visitReasonsAndCategoriesRepo.getChiefComplaintsByPatientAndBenForFollowUp(patientID)
+        } catch (e: Exception) {
+            Timber.d("Error in getLatestChiefComplaints $e")
+            emptyList()
+        }
+    }
+
+    suspend fun getLatestVitals(patientID: String): PatientVitalsModel? {
+        return try {
+            vitalsRepo.getVitalsDetailsByPatientIDAndBenVisitNoForFollowUp(patientID)
+        } catch (e: Exception) {
+            Timber.d("Error in getLatestVitals $e")
+            null
+        }
+    }
+
+    suspend fun getLatestEarDiagnosis(patientID: String): EarDiagnosisAssessment? {
+        return try {
+            earDiagnosisRepo.getAssessmentByPatientId(patientID)
+        } catch (e: Exception) {
+            Timber.d("Error in getLatestEarDiagnosis $e")
+            null
+        }
+    }
+
+    suspend fun getVisitCategoryByPatientAndVisit(patientID: String, benVisitNo: Int): String? {
+        return try {
+            visitReasonsAndCategoriesRepo
+                .getVisitDbByPatientIDAndBenVisitNo(patientID, benVisitNo)
+                ?.category
+        } catch (e: Exception) {
+            Timber.d("Error in getVisitCategoryByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getLatestVisitDbByPatientAndVisit(patientID: String, benVisitNo: Int): VisitDB? {
+        return try {
+            visitReasonsAndCategoriesRepo.getLatestVisitDbByPatientIDAndBenVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getLatestVisitDbByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun resolveCphcFormTypeForVisit(patientID: String, benVisitNo: Int): CphcFormType {
+        val latestVisit = getLatestVisitDbByPatientAndVisit(patientID, benVisitNo)
+        val resolved = CphcFormTypeResolver.resolve(
+            latestVisit?.reasonForVisit,
+            latestVisit?.subCategory
+        )
+        if (resolved != CphcFormType.UNKNOWN) return resolved
+
+        val existingTypes = buildList {
+            if (getEarDiagnosisByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.EAR)
+            if (getNoseDiagnosisByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.NOSE)
+            if (getThroatDiagnosisByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.THROAT)
+            if (getOralHealthByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.ORAL)
+            if (getOphthalmicByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.OPHTHALMIC)
+            if (getElderlyByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.ELDERLY)
+            if (getMentalByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.MENTAL)
+            if (getPainAssessmentByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.PAIN)
+            if (getPsychosocialByPatientAndVisit(patientID, benVisitNo) != null) add(CphcFormType.PSYCHOSOCIAL)
+        }
+        return existingTypes.singleOrNull() ?: CphcFormType.UNKNOWN
+    }
+
+    suspend fun getNoseDiagnosisByPatientAndVisit(patientID: String, benVisitNo: Int): NoseDiagnosisAssessment? {
+        return try {
+            noseDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getNoseDiagnosisByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getThroatDiagnosisByPatientAndVisit(patientID: String, benVisitNo: Int): ThroatDiagnosisAssessment? {
+        return try {
+            throatDiagnosisRepo.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getThroatDiagnosisByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getOralHealthByPatientAndVisit(patientID: String, benVisitNo: Int): OralHealth? {
+        return try {
+            oralHealthRepo.getByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getOralHealthByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getOphthalmicByPatientAndVisit(patientID: String, benVisitNo: Int): OphthalmicVisit? {
+        return try {
+            ophthalmicRepository.getOphthalmicVisit(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getOphthalmicByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getElderlyByPatientAndVisit(patientID: String, benVisitNo: Int): ElderlyHealthAssessment? {
+        return try {
+            elderlyHealthRepo.getAssessment(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getElderlyByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getMentalByPatientAndVisit(patientID: String, benVisitNo: Int): MentalHealthScreeningCache? {
+        return try {
+            mentalHealthScreeningRepo.getScreeningByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getMentalByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getPainAssessmentByPatientAndVisit(patientID: String, benVisitNo: Int): PainAndSymptomAssessment? {
+        return try {
+            painAndSymptomAssessmentRepo.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getPainAssessmentByPatientAndVisit $e")
+            null
+        }
+    }
+
+    suspend fun getPsychosocialByPatientAndVisit(patientID: String, benVisitNo: Int): PsychosocialCaregiverSupport? {
+        return try {
+            psychosocialCaregiverSupportRepo.getAssessmentByPatientIdAndVisitNo(patientID, benVisitNo)
+        } catch (e: Exception) {
+            Timber.d("Error in getPsychosocialByPatientAndVisit $e")
+            null
+        }
+    }
+
     private fun getHigherHealthCareDropdown(){
         try{
             _higherHealthCare  = doctorMasterDataMaleRepo.getHigherHealthCenter()
@@ -266,9 +530,10 @@ class CaseRecordViewModel @Inject constructor(
     }
 
     fun deleteOldDoctorData(patientID: String, benVisitNo: Int){
+        // Reset immediately so observer in UI never consumes stale "true" from a previous run.
+        _isDataDeleted.value = false
         viewModelScope.launch {
             try {
-                _isDataDeleted.value = false
                 prescriptionDao.deletePrescriptionByPatientIdAndBenVisitNo(patientID, benVisitNo)
                 investigationDao.deleteInvestigationCaseRecordByPatientIdAndBenVisitNo(patientID, benVisitNo)
                 caseRecordeDao.deleteDiagnosisByPatientIdAndBenVisitNo(patientID, benVisitNo)
@@ -287,6 +552,7 @@ class CaseRecordViewModel @Inject constructor(
             existingPatientVisitInfoSync.createNewBenFlow = patientVisitInfoSync.createNewBenFlow
             existingPatientVisitInfoSync.nurseFlag = 9
             existingPatientVisitInfoSync.doctorFlag = patientVisitInfoSync.doctorFlag
+            existingPatientVisitInfoSync.pharmacist_flag = patientVisitInfoSync.pharmacist_flag
             existingPatientVisitInfoSync.visitDate = patientVisitInfoSync.visitDate
             existingPatientVisitInfoSync.visitCategory = "General OPD"
             patientVisitInfoSyncRepo.insertPatientVisitInfoSync(existingPatientVisitInfoSync)
@@ -297,43 +563,140 @@ class CaseRecordViewModel @Inject constructor(
     }
 
     suspend fun updateDoctorDataSubmitted(benVisitInfo: PatientDisplayWithVisitInfo, doctorFlag: Int){
-//        val patientVisitInfoSync = PatientVisitInfoSync(
-//            patientID = benVisitInfo.patient.patientID,
-//            nurseDataSynced = benVisitInfo.nurseDataSynced,
-//            doctorDataSynced = SyncState.UNSYNCED,
-//            createNewBenFlow = benVisitInfo.createNewBenFlow,
-//            benVisitNo = benVisitInfo.benVisitNo!!,
-//            benFlowID = benVisitInfo.benFlowID,
-//            nurseFlag = 9,
-//            doctorFlag = doctorFlag,
-//            labtechFlag = benVisitInfo.labtechFlag,
-//            pharmacist_flag = benVisitInfo.pharmacist_flag,
-//        )
-        var labtechFlag = benVisitInfo.labtechFlag!!
-        if(benVisitInfo.doctorFlag == 3){
-            labtechFlag = 1
-        }
+        val latestVisitInfo = patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+            benVisitInfo.patient.patientID,
+            benVisitInfo.benVisitNo!!
+        )
+        val currentLabtechFlag = latestVisitInfo?.labtechFlag ?: benVisitInfo.labtechFlag ?: 0
         patientVisitInfoSyncRepo.updateOnlyDoctorDataSubmitted(
             nurseFlag = 9,
             doctorFlag = doctorFlag,
-            labtechFlag = labtechFlag,
+            labtechFlag = currentLabtechFlag,
             patientID = benVisitInfo.patient.patientID,
             benVisitNo = benVisitInfo.benVisitNo!!
         )
     }
 
+    fun closeCaseManually(benVisitInfo: PatientDisplayWithVisitInfo) {
+        _isDataSaved.value = false
+        _errorMessage.value = null
+        viewModelScope.launch {
+            try {
+                // Validate closure conditions using CaseClosureManager
+                val (canClose, errorMsg) = withContext(Dispatchers.IO) {
+                    caseClosureManager.canManuallyClose(benVisitInfo)
+                }
+                
+                if (!canClose) {
+                    _errorMessage.value = errorMsg
+                    _isDataSaved.value = false
+                    Timber.w("Cannot close case: $errorMsg")
+                    return@launch
+                }
+                
+                withContext(Dispatchers.IO) {
+                    patientVisitInfoSyncRepo.updateOnlyDoctorDataSubmitted(
+                        nurseFlag = 9,
+                        doctorFlag = 9,
+                        labtechFlag = benVisitInfo.labtechFlag ?: 0,
+                        patientID = benVisitInfo.patient.patientID,
+                        benVisitNo = benVisitInfo.benVisitNo!!
+                    )
+                }
+                _isDataSaved.value = true
+                Timber.d("Case closed successfully for ${benVisitInfo.patient.patientID}/${benVisitInfo.benVisitNo}")
+            } catch (e: Exception) {
+                _isDataSaved.value = false
+                _errorMessage.value = "Error closing case: ${e.message}"
+                Timber.e(e, "Error closing case")
+            }
+        }
+    }
+
+    /**
+     * Checks if manual closure confirmation dialog should be shown.
+     * Call this before attempting to close the case.
+     */
+    fun checkClosureRequirements(benVisitInfo: PatientDisplayWithVisitInfo) {
+        viewModelScope.launch {
+            try {
+                val requiresConfirmation = withContext(Dispatchers.IO) {
+                    caseClosureManager.requiresManualClosureConfirmation(benVisitInfo)
+                }
+                _requiresClosureConfirmation.value = requiresConfirmation
+            } catch (e: Exception) {
+                Timber.e(e, "Error checking closure requirements")
+                _requiresClosureConfirmation.value = false
+            }
+        }
+    }
+
     fun saveDoctorData(diagnosisList: List<DiagnosisCaseRecord>, investigation: InvestigationCaseRecord,
                        prescriptionList: List<PrescriptionCaseRecord>, benVisitInfo: PatientDisplayWithVisitInfo, doctorFlag: Int){
         viewModelScope.launch {
             try {
-                diagnosisList.forEach {
-                    saveDiagnosisToCache(it)
+                withContext(Dispatchers.IO) {
+                    diagnosisList.forEach {
+                        saveDiagnosisToCache(it)
+                    }
+                    saveInvestigationToCache(investigation)
+                    prescriptionList.forEach {
+                        savePrescriptionToCache(it)
+                    }
+                    updateDoctorDataSubmitted(benVisitInfo, doctorFlag)
+                    // When doctor has prescribed medicines (with or without test), move card to pharmacist module.
+                    // Called after updateDoctorDataSubmitted so pharmacist_flag and visitCategory are set last and
+                    // card shows in pharmacist list even when both test and prescription are selected together.
+                    if (prescriptionList.isNotEmpty()) {
+                        val visitInfoBeforePendingUpdate =
+                            patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                                benVisitInfo.patient.patientID,
+                                benVisitInfo.benVisitNo!!
+                            )
+                        val wasPendingPharmacist =
+                            (visitInfoBeforePendingUpdate?.pharmacist_flag
+                                ?: benVisitInfo.pharmacist_flag
+                                ?: 0) == 1
+                        patientVisitInfoSyncRepo.updatePharmacistFlagToPending(
+                            benVisitInfo.patient.patientID,
+                            benVisitInfo.benVisitNo!!
+                        )
+                        // Keep pharmacist module in sync with latest doctor edits for this visit.
+                        benFlowRepo.copyPrescriptionFromCaseRecordToPharmacistTable(
+                            benVisitInfo,
+                            replaceLatestPending = wasPendingPharmacist
+                        )
+                    }
+
+                    val latestVisitInfo =
+                        patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+                            benVisitInfo.patient.patientID,
+                            benVisitInfo.benVisitNo!!
+                        )
+                    val visitSnapshotForClosure = if (latestVisitInfo != null) {
+                        benVisitInfo.copy(
+                            nurseFlag = latestVisitInfo.nurseFlag,
+                            doctorFlag = latestVisitInfo.doctorFlag,
+                            labtechFlag = latestVisitInfo.labtechFlag,
+                            pharmacist_flag = latestVisitInfo.pharmacist_flag
+                        )
+                    } else {
+                        benVisitInfo
+                    }
+
+                    // Check if case should auto-close (nothing prescribed / only medicine already dispensed scenario)
+                    val shouldAutoClose = caseClosureManager.shouldAutoClose(visitSnapshotForClosure)
+                    if (shouldAutoClose) {
+                        Timber.d("Auto-closing case - nothing prescribed: ${benVisitInfo.patient.patientID}/${benVisitInfo.benVisitNo}")
+                        patientVisitInfoSyncRepo.updateOnlyDoctorDataSubmitted(
+                            nurseFlag = 9,
+                            doctorFlag = 9,
+                            labtechFlag = visitSnapshotForClosure.labtechFlag ?: 0,
+                            patientID = benVisitInfo.patient.patientID,
+                            benVisitNo = benVisitInfo.benVisitNo!!
+                        )
+                    }
                 }
-                saveInvestigationToCache(investigation)
-                prescriptionList.forEach {
-                    savePrescriptionToCache(it)
-                }
-                updateDoctorDataSubmitted(benVisitInfo, doctorFlag)
                 _isDataSaved.value = true
             } catch (e: Exception){
                 _isDataSaved.value = false
@@ -359,6 +722,24 @@ class CaseRecordViewModel @Inject constructor(
                     savePrescriptionToCache(it)
                 }
                 savePatientVisitInfoSync(patientVisitInfoSync)
+                // When medicines are prescribed, ensure card moves to pharmacist module (for test+medicine or medicine-only)
+                if (prescriptionList.isNotEmpty()) {
+                    patientVisitInfoSyncRepo.updatePharmacistFlagToPending(
+                        patientVisitInfoSync.patientID,
+                        patientVisitInfoSync.benVisitNo
+                    )
+                    // Fresh nurse+doctor flow also needs local pharmacist prescription rows,
+                    // otherwise pharmacist tab may not show the newly assigned medicines.
+                    runCatching {
+                        val patient = patientRepo.getPatient(patientVisitInfoSync.patientID)
+                        benFlowRepo.copyPrescriptionFromCaseRecordToPharmacistTable(
+                            benVisitInfo = PatientDisplayWithVisitInfo(patient, patientVisitInfoSync),
+                            replaceLatestPending = false
+                        )
+                    }.onFailure { e ->
+                        Timber.e(e, "Failed to copy prescription rows to pharmacist table for ${patientVisitInfoSync.patientID}/${patientVisitInfoSync.benVisitNo}")
+                    }
+                }
                 _isDataSaved.value = true
             } catch (e: Exception){
                 _isDataSaved.value = false
@@ -378,6 +759,10 @@ class CaseRecordViewModel @Inject constructor(
         return patientVisitInfoSyncRepo.getSinglePatientDoctorDataNotSubmitted(patientId);
     }
 
+    suspend fun getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID: String, benVisitNo: Int): PatientVisitInfoSync? {
+        return patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(patientID, benVisitNo)
+    }
+
    suspend fun getTestNameTypeMap(): Map<Int, String> {
         return try {
             maleMasterDataRepository.getProcedureTypeByNameMap()
@@ -407,6 +792,9 @@ class CaseRecordViewModel @Inject constructor(
         return templateRepo.getTemplateUsingTempName(selectedString)
     }
 
+    suspend fun getAvailableStockForRule(itemID: Int): Int {
+        return doctorMasterDataMaleRepo.getItemMasterQtyInHandById(itemID)
+    }
 //    fun getVisitReasonByBenFlowID(beneficiaryID: Long) {
 //        viewModelScope.launch {
 //            try {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacFragment.kt
index ecd5f41bd..e389389e4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacFragment.kt
@@ -3,7 +3,6 @@ package org.piramalswasthya.cho.ui.commons.cbac
 import android.app.AlertDialog
 import android.app.DatePickerDialog
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -23,7 +22,7 @@ import org.piramalswasthya.cho.databinding.FragmentCbacBinding
 import org.piramalswasthya.cho.model.CbacCache
 import org.piramalswasthya.cho.model.Gender
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.work.WorkerUtils
 import timber.log.Timber
 import java.text.SimpleDateFormat
@@ -128,7 +127,7 @@ class CbacFragment : Fragment() , NavigationAdapter  {
                 CbacViewModel.State.SAVE_SUCCESS -> {
                     Timber.d("CBAC form saved successfully!")
                     viewModel.resetState()
-                    WorkerUtils.triggerAmritSyncWorker(requireContext())
+                    WorkerUtils.enqueueUpsync(requireContext(), WorkerUtils.UpsyncScope.CBAC)
                     findNavController().navigateUp()
                 }
 
@@ -1061,8 +1060,6 @@ class CbacFragment : Fragment() , NavigationAdapter  {
     }
 
     fun navigateNext() {
-        val intent = Intent(context, HomeActivity::class.java)
-        startActivity(intent)
         requireActivity().finish()
     }
 
@@ -1088,4 +1085,4 @@ class CbacFragment : Fragment() , NavigationAdapter  {
 //        }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacViewModel.kt
index 23ea02bd8..f6c0616aa 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/cbac/CbacViewModel.kt
@@ -654,14 +654,6 @@ class CbacViewModel @Inject constructor(
             missingFieldString = resources.getString(R.string.cbac_validation_heart_disease)
             return false
         }
-        if (cbac.cbac_sufferingtb_pos == 0) {
-            missingFieldString = resources.getString(R.string.cbac_validation_plsst)
-            return false
-        }
-        if (cbac.cbac_antitbdrugs_pos == 0) {
-            missingFieldString = resources.getString(R.string.cbac_validation_plsatb)
-            return false
-        }
         if (cbac.cbac_tbhistory_pos == 0) {
             missingFieldString = resources.getString(R.string.cbac_validation_plshtb)
             return false
@@ -686,6 +678,14 @@ class CbacViewModel @Inject constructor(
             missingFieldString = resources.getString(R.string.cbac_validation_plsnsw)
             return false
         }
+        if (cbac.cbac_sufferingtb_pos == 0) {
+            missingFieldString = resources.getString(R.string.cbac_validation_plsst)
+            return false
+        }
+        if (cbac.cbac_antitbdrugs_pos == 0) {
+            missingFieldString = resources.getString(R.string.cbac_validation_plsatb)
+            return false
+        }
         if (cbac.cbac_uicers_pos == 0) {
             missingFieldString = resources.getString(R.string.cbac_validation_rul)
             return false
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormFragment.kt
index e94e2aec1..1cce1bbaf 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormFragment.kt
@@ -1,13 +1,14 @@
 package org.piramalswasthya.cho.ui.commons.eligible_couple.tracking.form
 
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
@@ -15,29 +16,37 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.yield
 import org.piramalswasthya.cho.adapter.FormInputAdapter
 import org.piramalswasthya.cho.databinding.FragmentNewFormBinding
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
 import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVitalsModel
 import org.piramalswasthya.cho.model.UserDomain
 import org.piramalswasthya.cho.model.VisitDB
+import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.OtherCPHCServicesViewModel
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+import org.piramalswasthya.cho.ui.home.rmncha.maternal_health.MaternalHealthNavHostFragment
 import org.piramalswasthya.cho.utils.generateUuid
 import org.piramalswasthya.cho.work.WorkerUtils
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
 
+    companion object {
+        private const val DATE_FORMAT_DD_MM_YYYY = "dd-MM-yyyy"
+    }
+
     private var _binding: FragmentNewFormBinding? = null
     private val binding: FragmentNewFormBinding
         get() = _binding!!
@@ -47,7 +56,10 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
     @Inject
     lateinit var userRepo: UserRepo
 
-    private lateinit var benVisitInfo: PatientDisplayWithVisitInfo
+    @Inject
+    lateinit var patientRepo: PatientRepo
+
+    private var benVisitInfo: PatientDisplayWithVisitInfo? = null
 
     val CPHCviewModel: OtherCPHCServicesViewModel by viewModels()
 
@@ -69,9 +81,38 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        loadBeneficiaryInfo()
+        setupFormAdapterAndVisibility()
+        observeBasicBeneficiaryInfo()
+        setupAntraTableObserver()
+        setupClickListeners()
+        observeViewModelState()
+        observeAlerts()
+        observeBeneficiarySyncTrigger()
+        
+        // Handle Back Press
+        val fromVisitDetails = arguments?.getBoolean("fromVisitDetails", false) ?: false
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : androidx.activity.OnBackPressedCallback(fromVisitDetails) {
+            override fun handleOnBackPressed() {
+                navigateBackToList()
+            }
+        })
+    }
 
-        benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
+    private fun loadBeneficiaryInfo() {
+        lifecycleScope.launch {
+            benVisitInfo = try {
+                // Try to get from intent (for navigation from visit details)
+                requireActivity().intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
+                    ?: throw ClassCastException("No benVisitInfo in intent")
+            } catch (e: Exception) {
+                // Load from database using patientID from ViewModel
+                patientRepo.getPatientDisplayListForNurseByPatient(viewModel.patientID)
+            }
+        }
+    }
 
+    private fun setupFormAdapterAndVisibility() {
         viewModel.recordExists.observe(viewLifecycleOwner) { notIt ->
             notIt?.let { recordExists ->
 //                binding.fabEdit.visibility = if(recordExists) View.VISIBLE else View.GONE
@@ -81,11 +122,11 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
                         hardCodedListUpdate(formId)
                     }, isEnabled = !recordExists
                 )
-                if(recordExists){
-                    val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
-                    btnSubmit?.visibility = View.GONE
-                }
-//                binding.btnSubmit.isEnabled = !recordExists
+                // Hide parent activity's bottom navigation to avoid duplicate buttons
+                activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.GONE
+
+                binding.btnSubmit.visibility = if(recordExists) View.GONE else View.VISIBLE
+                binding.btnSubmit.isEnabled = !recordExists
                 binding.form.rvInputForm.adapter = adapter
                 lifecycleScope.launch {
                     viewModel.formList.collect {
@@ -96,92 +137,271 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
                 }
             }
         }
+    }
+
+    private fun observeBasicBeneficiaryInfo() {
         viewModel.benName.observe(viewLifecycleOwner) {
             binding.tvBenName.text = it
         }
         viewModel.benAgeGender.observe(viewLifecycleOwner) {
             binding.tvAgeGender.text = it
         }
-//        binding.btnSubmit.setOnClickListener {
-//            submitEligibleTrackingForm()
-//        }
+        binding.tvCaseId.text = viewModel.patientID
+        binding.llCaseIdRow.visibility = View.VISIBLE
+    }
+
+    private fun setupAntraTableObserver() {
+        // Populate ANTRA table in view mode
+        viewModel.recordExists.observe(viewLifecycleOwner) { recordExists ->
+            if (recordExists == true) {
+                // In view mode, populate ANTRA table if patient has ANTRA injection history
+                viewModel.allEctRecords.observe(viewLifecycleOwner) { ectRecords ->
+                    populateAntraTable(ectRecords)
+                }
+            }
+        }
+    }
+
+    private fun setupClickListeners() {
+        // Wire up submit button from fragment layout
+        binding.btnSubmit.setOnClickListener {
+            submitEligibleTrackingForm()
+        }
+    }
 
+    private fun observeViewModelState() {
         viewModel.state.observe(viewLifecycleOwner) {
             when (it) {
+                EligibleCoupleTrackingFormViewModel.State.SAVING -> {
+                    binding.btnSubmit.isEnabled = false
+                    binding.pbForm.visibility = View.VISIBLE
+                }
                 EligibleCoupleTrackingFormViewModel.State.SAVE_SUCCESS -> {
+                    binding.btnSubmit.isEnabled = true
+                    binding.pbForm.visibility = View.GONE
+                    // Check for alerts - if no alert, will show toast and navigate
+                    // If alert exists, the alert observer will handle it
+                    checkForAlerts()
+                }
+                EligibleCoupleTrackingFormViewModel.State.SAVE_FAILED -> {
+                    binding.btnSubmit.isEnabled = true
+                    binding.pbForm.visibility = View.GONE
                     Toast.makeText(
                         requireContext(),
-                        resources.getString(R.string.tracking_form_filled_successfully),
+                        resources.getString(R.string.form_save_failed),
                         Toast.LENGTH_SHORT
                     ).show()
-                    saveNurseData()
-//                    navigateToNextScreen()
-//                    saveNurseData()
                 }
+                else -> {
+                    binding.btnSubmit.isEnabled = true
+                    binding.pbForm.visibility = View.GONE
+                }
+            }
+        }
+    }
 
-                else -> {}
+    private fun observeAlerts() {
+        // Observe alert LiveData
+        viewModel.showAlert.observe(viewLifecycleOwner) { alertType ->
+            when (alertType) {
+                EligibleCoupleTrackingFormViewModel.AlertType.ANTRA_INCENTIVE -> {
+                    showAntraIncentiveAlert()
+                }
+                EligibleCoupleTrackingFormViewModel.AlertType.STERILIZATION_INCENTIVE -> {
+                    showSterilizationIncentiveAlert()
+                }
+                EligibleCoupleTrackingFormViewModel.AlertType.NONE -> {
+                    //no ops for now
+                }
             }
         }
     }
 
-    private fun navigateToNextScreen() {
-        if (viewModel.isPregnant) {
-//            findNavController().navigate(
-//                EligibleCoupleTrackingFormFragmentDirections.actionEligibleCoupleTrackingFormFragmentToPregnancyRegistrationFormFragment(
-//                    benId = viewModel.benId
-//                )
-//            )
-            viewModel.resetState()
-        } else {
-            findNavController().navigateUp()
+    private fun observeBeneficiarySyncTrigger() {
+        viewModel.triggerBeneficiarySync.observe(viewLifecycleOwner) { shouldTrigger ->
+            if (shouldTrigger == true) {
+                WorkerUtils.triggerBeneficiarySync(requireContext())
+                viewModel.onBeneficiarySyncTriggered()
+            }
+        }
+    }
+
+    private fun checkForAlerts() {
+        if (viewModel.shouldOpenPregnantWomanRegistration) {
+            navigateToPregnantWomanRegistration()
+            return
+        }
+        // If no alert to show, proceed directly
+        if (viewModel.showAlert.value == EligibleCoupleTrackingFormViewModel.AlertType.NONE) {
+            // Show success message
             Toast.makeText(
                 requireContext(),
                 resources.getString(R.string.tracking_form_filled_successfully),
                 Toast.LENGTH_SHORT
             ).show()
+            // ECT data is already saved, so visit history will show it
+            saveNurseDataInBackground()
             viewModel.resetState()
+            navigateBackToList()
         }
+        // Alerts will be handled by the observer
     }
 
-    private fun saveNurseData(){
-        CoroutineScope(Dispatchers.Main).launch {
-            var benVisitNo = 0;
-            var createNewBenflow = false;
-            CPHCviewModel.getLastVisitInfoSync(benVisitInfo.patient.patientID).let {
-                if(it == null){
-                    benVisitNo = 1;
+    private fun navigateToPregnantWomanRegistration() {
+        if (!isAdded || isRemoving) return
+
+        Toast.makeText(
+            requireContext(),
+            resources.getString(R.string.tracking_form_filled_successfully),
+            Toast.LENGTH_SHORT
+        ).show()
+        WorkerUtils.triggerBeneficiarySync(requireContext())
+        saveNurseDataInBackground()
+        viewModel.resetState()
+
+        val bundle = Bundle().apply {
+            putString("patientID", viewModel.patientID)
+            putBoolean("fromECT", true)
+            putInt("destinationId", R.id.pregnancyRegistrationFormFragment)
+        }
+
+        try {
+            findNavController().navigate(
+                R.id.action_eligibleCoupleTrackingFormFragment_to_pregnancyRegistrationFormFragment,
+                bundle
+            )
+            return
+        } catch (directNavError: Exception) {
+            Timber.d(directNavError, "Direct PWR navigation unavailable, trying nav host fallback")
+        }
+
+        try {
+            findNavController().navigate(
+                R.id.action_eligibleCoupleTrackingFormFragment_to_maternalHealthNavHostFragment,
+                bundle
+            )
+            return
+        } catch (navHostError: Exception) {
+            Timber.d(navHostError, "Nav host PWR navigation unavailable, using fragment transaction")
+        }
+
+        val fragment = MaternalHealthNavHostFragment().apply {
+            arguments = bundle
+        }
+        requireActivity().supportFragmentManager.commit {
+            replace(R.id.fragment_container, fragment)
+            addToBackStack("PWR_FROM_ECT")
+        }
+    }
+
+    private fun navigateBackToList() {
+        if (!isAdded || isRemoving) return
+
+        val fromVisitDetails = arguments?.getBoolean("fromVisitDetails", false) ?: false
+        Timber.d("Navigating back. fromVisitDetails: $fromVisitDetails")
+        
+        if (fromVisitDetails) {
+            if (benVisitInfo == null) {
+                Toast.makeText(requireContext(), getString(R.string.loading_patient_data_please_wait), Toast.LENGTH_SHORT).show()
+                return
+            }
+            try {
+                // Toast.makeText(requireContext(), "Navigating to Visit Details", Toast.LENGTH_SHORT).show()
+                val bundle = Bundle().apply {
+                    putSerializable("benVisitInfo", benVisitInfo)
                 }
-                else if(it.nurseFlag == 1) {
-                    benVisitNo = it.benVisitNo
+//                findNavController().navigate(R.id.action_eligibleCoupleTrackingFormFragment_to_fhirVisitDetailsFragment, bundle)
+                return
+            } catch (e: Exception) {
+                Timber.e(e, "NavController navigate to Visit Details failed")
+                Toast.makeText(requireContext(), getString(R.string.nav_error, e.message.orEmpty()), Toast.LENGTH_LONG).show()
+            }
+        }
+
+        try {
+            // Try NavController if available
+            Timber.d("Navigating Up")
+            findNavController().navigateUp()
+        } catch (e: Exception) {
+            Timber.e(e, "NavController navigateUp failed, falling back to activity back press")
+            // Fallback to activity back press
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        }
+    }
+
+    private fun showAntraIncentiveAlert() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.incentive_alert_title))
+            .setMessage(getString(R.string.antra_incentive_alert))
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                dialog.dismiss()
+                viewModel.resetAlert()
+
+                if (viewModel.state.value == EligibleCoupleTrackingFormViewModel.State.SAVE_SUCCESS) {
+                    Toast.makeText(requireContext(), resources.getString(R.string.tracking_form_filled_successfully), Toast.LENGTH_SHORT).show()
+                    saveNurseDataInBackground()
+                    navigateBackToList()
                 }
-                else {
-                    benVisitNo = it.benVisitNo + 1
-                    createNewBenflow = true;
+            }
+            .setCancelable(false)
+            .show()
+    }
+
+    private fun showSterilizationIncentiveAlert() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.incentive_alert_title))
+            .setMessage(getString(R.string.sterilization_incentive_alert))
+            .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                dialog.dismiss()
+                viewModel.resetAlert()
+
+                if (viewModel.state.value == EligibleCoupleTrackingFormViewModel.State.SAVE_SUCCESS) {
+                    Toast.makeText(requireContext(), resources.getString(R.string.tracking_form_filled_successfully), Toast.LENGTH_SHORT).show()
+                    saveNurseDataInBackground()
+                    navigateBackToList()
                 }
             }
+            .setCancelable(false)
+            .show()
+    }
 
-            val user = userRepo.getLoggedInUser()
 
-            saveNurseData(benVisitNo, createNewBenflow, user)
+    private fun saveNurseDataInBackground(){
+        val currentBenVisitInfo = benVisitInfo
+        if (currentBenVisitInfo == null) {
+            Timber.e("benVisitInfo is null, cannot save nurse data")
+            WorkerUtils.triggerEligibleCoupleTrackingSync(requireContext())
+            return
+        }
 
-            CPHCviewModel.isDataSaved.observe(viewLifecycleOwner){
-                when(it!!){
-                    true ->{
-                        WorkerUtils.triggerAmritSyncWorker(requireContext())
-                        val intent = Intent(context, HomeActivity::class.java)
-                        startActivity(intent)
-                        requireActivity().finish()
+        lifecycleScope.launch {
+            try {
+                var benVisitNo = 0
+                var createNewBenflow = false
+                CPHCviewModel.getLastVisitInfoSync(currentBenVisitInfo.patient.patientID).let {
+                    if(it == null){
+                        benVisitNo = 1
                     }
-                    else ->{
-
+                    else if(it.nurseFlag == 1) {
+                        benVisitNo = it.benVisitNo
+                    }
+                    else {
+                        benVisitNo = it.benVisitNo + 1
+                        createNewBenflow = true
                     }
                 }
-            }
 
+                val user = userRepo.getLoggedInUser()
+                saveNurseData(benVisitNo, createNewBenflow, user, currentBenVisitInfo)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to save nurse data in background")
+            } finally {
+                WorkerUtils.triggerEligibleCoupleTrackingSync(requireContext())
+            }
         }
     }
 
-    fun saveNurseData(benVisitNo: Int, createNewBenflow: Boolean, user: UserDomain?){
+    private fun saveNurseData(benVisitNo: Int, createNewBenflow: Boolean, user: UserDomain?, benVisitInfo: PatientDisplayWithVisitInfo){
 
         val visitDB = VisitDB(
             visitId = generateUuid(),
@@ -202,7 +422,7 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
         val patientVisitInfoSync = PatientVisitInfoSync(
             patientID = benVisitInfo.patient.patientID,
             benVisitNo = benVisitNo,
-            createNewBenFlow = false,
+            createNewBenFlow = createNewBenflow,
             nurseDataSynced = SyncState.SYNCED,
             doctorDataSynced = SyncState.SYNCED,
             nurseFlag = 9,
@@ -211,7 +431,6 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
         )
 
         CPHCviewModel.saveNurseDataToDb(visitDB, patientVitals, patientVisitInfoSync)
-
     }
 
     private fun submitEligibleTrackingForm() {
@@ -234,27 +453,27 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
         }
     }
 
-
     private fun hardCodedListUpdate(formId: Int) {
         binding.form.rvInputForm.adapter?.apply {
             when (formId) {
                 1 -> {
                     notifyItemChanged(1)
                     notifyItemChanged(2)
-
                 }
-                4,5 -> {
+                4, 5, 9, 12 -> {
                     notifyDataSetChanged()
-                    //notifyItemChanged(viewModel.getIndexOfIsPregnant())
+                    if (formId == 9) {
+                        lifecycleScope.launch {
+                            yield()
+                        }
+                    }
                 }
-
             }
         }
     }
 
     override fun onStart() {
         super.onStart()
-
     }
 
     override fun getFragmentId(): Int {
@@ -265,14 +484,97 @@ class EligibleCoupleTrackingFormFragment : Fragment(), NavigationAdapter {
         navigateNext()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.VISIBLE
+        _binding = null
+    }
+
     override fun onCancelAction() {
-        findNavController().navigateUp()
+        navigateBackToList()
     }
 
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.ec_tracking_title)
+    }
+
+    private fun populateAntraTable(ectRecords: List<EligibleCoupleTrackingCache>?) {
+        val antraRecords = ectRecords?.filter {
+            it.methodOfContraception == "ANTRA Injection" && it.antraInjectionDate != null
+        }?.sortedBy { it.antraInjectionDate } ?: emptyList()
+
+        if (antraRecords.isEmpty()) {
+            binding.llAntraSection.visibility = View.GONE
+            return
+        }
+        binding.llAntraSection.visibility = View.VISIBLE
+        val tableLayout = binding.tableAntraHistory
+        val childCount = tableLayout.childCount
+        if (childCount > 1) {
+            tableLayout.removeViews(1, childCount - 1)
+        }
+        antraRecords.forEach { record ->
+            val tableRow = android.widget.TableRow(requireContext())
+            tableRow.layoutParams = android.widget.TableLayout.LayoutParams(
+                android.widget.TableLayout.LayoutParams.MATCH_PARENT,
+                android.widget.TableLayout.LayoutParams.WRAP_CONTENT
+            )
+            tableRow.setPadding(8, 8, 8, 8)
+            val doseTextView = android.widget.TextView(requireContext())
+            doseTextView.text = record.antraDose ?: ""
+            doseTextView.setPadding(8, 8, 8, 8)
+            doseTextView.gravity = android.view.Gravity.CENTER
+            doseTextView.layoutParams = android.widget.TableRow.LayoutParams(
+                0,
+                android.widget.TableRow.LayoutParams.WRAP_CONTENT,
+                1f
+            )
+            tableRow.addView(doseTextView)
+            val dateTextView = android.widget.TextView(requireContext())
+            dateTextView.text = record.antraInjectionDate?.let {
+                SimpleDateFormat(DATE_FORMAT_DD_MM_YYYY, Locale.getDefault()).format(Date(it))
+            } ?: ""
+            dateTextView.setPadding(8, 8, 8, 8)
+            dateTextView.gravity = android.view.Gravity.CENTER
+            dateTextView.layoutParams = android.widget.TableRow.LayoutParams(
+                0,
+                android.widget.TableRow.LayoutParams.WRAP_CONTENT,
+                1f
+            )
+            tableRow.addView(dateTextView)
+            val dueDateTextView = android.widget.TextView(requireContext())
+            dueDateTextView.text = record.antraInjectionDate?.let { injectionDate ->
+                val cal = java.util.Calendar.getInstance()
+                cal.timeInMillis = injectionDate
+
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 76)
+                val startDate = SimpleDateFormat(DATE_FORMAT_DD_MM_YYYY, Locale.getDefault()).format(cal.time)
+
+                cal.timeInMillis = injectionDate
+                cal.add(java.util.Calendar.DAY_OF_YEAR, 120)
+                val endDate = SimpleDateFormat(DATE_FORMAT_DD_MM_YYYY, Locale.getDefault()).format(cal.time)
+
+                "$startDate to $endDate"
+            } ?: ""
+            dueDateTextView.setPadding(8, 8, 8, 8)
+            dueDateTextView.gravity = android.view.Gravity.CENTER
+            dueDateTextView.layoutParams = android.widget.TableRow.LayoutParams(
+                0,
+                android.widget.TableRow.LayoutParams.WRAP_CONTENT,
+                1f
+            )
+            tableRow.addView(dueDateTextView)
+
+            tableLayout.addView(tableRow)
+        }
+    }
 
     override fun onDestroy() {
         super.onDestroy()
         _binding = null
     }
 
-}
\ No newline at end of file
+
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormViewModel.kt
index d71a69295..09b22695e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/eligible_couple/tracking/form/EligibleCoupleTrackingFormViewModel.kt
@@ -9,22 +9,17 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.coroutines.DispatcherProvider
 import org.piramalswasthya.cho.configuration.EligibleCoupleTrackingDataset
 import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
 import org.piramalswasthya.cho.repositories.EcrRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.UserRepo
-//import org.piramalswasthya.sakhi.configuration.EligibleCoupleTrackingDataset
-//import org.piramalswasthya.sakhi.database.room.SyncState
-//import org.piramalswasthya.sakhi.database.shared_preferences.PreferenceDao
-//import org.piramalswasthya.sakhi.model.EligibleCoupleTrackingCache
-//import org.piramalswasthya.sakhi.repositories.BenRepo
-//import org.piramalswasthya.sakhi.repositories.EcrRepo
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -36,8 +31,16 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
     private val ecrRepo: EcrRepo,
     private val patientRepo: PatientRepo,
     private val userRepo: UserRepo,
+    private val patientDao: PatientDao,
+    private val dispatcherProvider: DispatcherProvider,
 ) : ViewModel() {
 
+    companion object {
+        // Status of Woman IDs
+        const val STATUS_PREGNANT_WOMAN = 2
+        const val STATUS_PERMANENT_STERILIZATION = 6
+    }
+
     val patientID =
         EligibleCoupleTrackingFormFragmentArgs.fromSavedStateHandle(savedStateHandle).patientID
 
@@ -48,6 +51,11 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
         IDLE, SAVING, SAVE_SUCCESS, SAVE_FAILED
     }
 
+    // Alert types for incentives
+    enum class AlertType {
+        NONE, ANTRA_INCENTIVE, STERILIZATION_INCENTIVE
+    }
+
     private val _state = MutableLiveData(State.IDLE)
     val state: LiveData<State>
         get() = _state
@@ -63,18 +71,40 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
     val recordExists: LiveData<Boolean>
         get() = _recordExists
 
-    //    private lateinit var user: UserDomain
+    // Alert LiveData for showing incentive dialogs
+    private val _showAlert = MutableLiveData<AlertType>(AlertType.NONE)
+    val showAlert: LiveData<AlertType>
+        get() = _showAlert
+
+    // Flag to track if status was updated to sterilization
+    private val _statusUpdatedToSterilization = MutableLiveData(false)
+    val statusUpdatedToSterilization: LiveData<Boolean>
+        get() = _statusUpdatedToSterilization
+
+    private val _allEctRecords = MutableLiveData<List<EligibleCoupleTrackingCache>?>()
+    val allEctRecords: LiveData<List<EligibleCoupleTrackingCache>?>
+        get() = _allEctRecords
+
+    private val _triggerBeneficiarySync = MutableLiveData(false)
+    val triggerBeneficiarySync: LiveData<Boolean>
+        get() = _triggerBeneficiarySync
+
     private val dataset =
         EligibleCoupleTrackingDataset(context, preferenceDao.getCurrentLanguage())
     val formList = dataset.listFlow
 
     var isPregnant: Boolean = false
+    var shouldOpenPregnantWomanRegistration: Boolean = false
+    var isSterilized: Boolean = false
+    var isAntraSelectedAfterSave: Boolean = false
+
+    fun isAntraSelected() = dataset.isAntraSelected()
 
     private lateinit var eligibleCoupleTracking: EligibleCoupleTrackingCache
 
     init {
         viewModelScope.launch {
-            val asha = userRepo.getLoggedInUser()!!
+            val asha = userRepo.getLoggedInUser()
             val ben = patientRepo.getPatientDisplay(patientID)?.also { ben ->
                 _benName.value =
                     "${ben.patient.firstName} ${if (ben.patient.lastName == null) "" else ben.patient.lastName}"
@@ -82,16 +112,19 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
                 eligibleCoupleTracking = EligibleCoupleTrackingCache(
                     patientID = patientID,
                     syncState = SyncState.UNSYNCED,
-                    createdBy = asha.userName,
-                    updatedBy = asha.userName,
+                    createdBy = asha?.userName ?: "",
+                    updatedBy = asha?.userName ?: "",
                 )
             }
 
             val pastTrack = ecrRepo.getLatestEctByBenId(patientID)
+            val ecr = ecrRepo.getSavedECR(patientID)
 
             Log.d("patient Id is ", patientID)
             Log.d("createdDate is ", createdDate.toString())
 
+            _allEctRecords.value = ecrRepo.getAllECT(patientID)
+
             ecrRepo.getEct(patientID, createdDate)?.let {
                 eligibleCoupleTracking = it
                 _recordExists.value = true
@@ -100,6 +133,7 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
             }
 
 
+            dataset.setNumberOfChildren(ecr?.noOfChildren ?: 0)
             dataset.setUpPage(
                 ben,
                 pastTrack?.visitDate ?: 0,
@@ -115,39 +149,124 @@ class EligibleCoupleTrackingFormViewModel @Inject constructor(
     fun updateListOnValueChanged(formId: Int, index: Int) {
         viewModelScope.launch {
             dataset.updateList(formId, index)
-        }
 
+            // Trigger alerts immediately on selection (Requirement Phase 2)
+            if (formId == dataset.getContraceptionMethodId()) {
+                if (dataset.isAntraSelected()) {
+                    _showAlert.value = AlertType.ANTRA_INCENTIVE
+                } else if (dataset.isSterilizationSelected()) {
+                    _showAlert.value = AlertType.STERILIZATION_INCENTIVE
+                } else {
+                    _showAlert.value = AlertType.NONE
+                }
+            }
+        }
     }
 
 
 
     fun saveForm() {
         viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-                    _state.postValue(State.SAVING)
+            try {
+                // Ensure eligibleCoupleTracking is initialized
+                if (!::eligibleCoupleTracking.isInitialized) {
+                    val asha = userRepo.getLoggedInUser()
+                    eligibleCoupleTracking = EligibleCoupleTrackingCache(
+                        patientID = patientID,
+                        syncState = SyncState.UNSYNCED,
+                        createdBy = asha?.userName ?: "",
+                        updatedBy = asha?.userName ?: "",
+                    )
+                }
+
+                _state.value = State.SAVING
 
+                withContext(dispatcherProvider.io) {
                     dataset.mapValues(eligibleCoupleTracking, 1)
+                    eligibleCoupleTracking.syncState = SyncState.UNSYNCED
+                    eligibleCoupleTracking.processed =
+                        if (eligibleCoupleTracking.processed == "N") "N" else "U"
                     ecrRepo.saveEct(eligibleCoupleTracking)
-                    isPregnant = (eligibleCoupleTracking.isPregnant == "Yes") ||
-                            (eligibleCoupleTracking.pregnancyTestResult == "Positive")
-                    if (isPregnant) {
-
+                    Timber.d("ECT data saved successfully for patient: $patientID")
+
+                    // Update LMP Date in ECR Cache so it reflects on the Tracking List Card
+                    eligibleCoupleTracking.lmpDate?.let { newLmpDate ->
+                        ecrRepo.getSavedECR(patientID)?.let { ecr ->
+                            ecr.lmpDate = newLmpDate
+                            ecr.syncState = SyncState.UNSYNCED
+                            ecrRepo.updateECR(ecr)
+                        }
                     }
 
-                    _state.postValue(State.SAVE_SUCCESS)
-                } catch (e: Exception) {
-                    Timber.d("saving ECT data failed due to $e")
-                    _state.postValue(State.SAVE_FAILED)
+                    // Check statuses in background
+                    isPregnant = dataset.isPregnancyPositive()
+                    shouldOpenPregnantWomanRegistration = dataset.shouldOpenPregnantWomanRegistration()
+                    isSterilized = dataset.isSterilizationSelected()
+                    isAntraSelectedAfterSave = dataset.isAntraSelected()
+                }
+
+                // Update patient status if pregnant
+                if (isPregnant) {
+                    updatePatientStatusToPregnant()
+                    _triggerBeneficiarySync.value = true
+                }
+
+                // Update patient status if sterilization selected
+                if (isSterilized) {
+                    updatePatientStatusToSterilized()
+                    _statusUpdatedToSterilization.value = true
+                    _showAlert.value = AlertType.STERILIZATION_INCENTIVE
+                } else if (isAntraSelectedAfterSave) {
+                    _showAlert.value = AlertType.ANTRA_INCENTIVE
+                } else {
+                    // Explicitly clear alert if neither selected
+                    _showAlert.value = AlertType.NONE
                 }
+
+                // Set SAVE_SUCCESS last so observers see alert changes first
+                _state.value = State.SAVE_SUCCESS
+            } catch (e: Exception) {
+                Timber.e(e, "saving ECT data failed")
+                _state.value = State.SAVE_FAILED
             }
         }
     }
 
+    private suspend fun updatePatientStatusToPregnant() {
+        try {
+            val patient = patientDao.getPatient(patientID)
+            patient.statusOfWomanID = STATUS_PREGNANT_WOMAN
+            patient.syncState = SyncState.UNSYNCED
+            patientDao.updatePatient(patient)
+            Timber.d("Patient status updated to Pregnant Woman and marked UNSYNCED")
+        } catch (e: Exception) {
+            Timber.e("Failed to update patient status to pregnant: $e")
+        }
+    }
+
+    private suspend fun updatePatientStatusToSterilized() {
+        try {
+            val patient = patientDao.getPatient(patientID)
+            patient.statusOfWomanID = STATUS_PERMANENT_STERILIZATION
+            patientDao.updatePatient(patient)
+            Timber.d("Patient status updated to Permanent Sterilization")
+        } catch (e: Exception) {
+            Timber.e("Failed to update patient status to sterilized: $e")
+        }
+    }
+
     fun resetState() {
         _state.value = State.IDLE
     }
 
+    fun resetAlert() {
+        _showAlert.value = AlertType.NONE
+    }
+
+    fun onBeneficiarySyncTriggered() {
+        _triggerBeneficiarySync.value = false
+    }
+
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsFragment.kt
index 8b65fbac2..9448d1f9e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsFragment.kt
@@ -1,6 +1,6 @@
 package org.piramalswasthya.cho.ui.commons.fhir_patient_vitals
 
-import android.content.Intent
+
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -13,7 +13,9 @@ import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -32,7 +34,7 @@ import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.model.VitalsMasterDb
 import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsViewModel
 import org.piramalswasthya.cho.utils.generateUuid
 import org.piramalswasthya.cho.utils.nullIfEmpty
 import org.piramalswasthya.cho.utils.setBoxColor
@@ -85,6 +87,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
     private var sbpValue: Int? = null
     private var dbpValue: Int? = null
     private var masterDb: MasterDb? = null
+    private var editPatientViewModel: EditPatientDetailsViewModel? = null
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -105,6 +108,12 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
         activity?.onBackPressedDispatcher?.addCallback(viewLifecycleOwner, onBackPressedCallback)
         super.onViewCreated(view, savedInstanceState)
 
+        try {
+            editPatientViewModel = ViewModelProvider(requireActivity())[EditPatientDetailsViewModel::class.java]
+        } catch (_: Exception) {
+            // Fragment may not be hosted by EditPatientDetailsActivity
+        }
+
         masterDb = arguments?.getSerializable("MasterDb") as? MasterDb
         Log.d("aryan","category --  ${masterDb?.visitMasterDb?.subCategory}")
         viewModel.getLoggedInUserDetails()
@@ -145,6 +154,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                     viewModel.tempNull = true
                     binding.temperatureEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -158,6 +168,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.bpSystolicEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -170,6 +181,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.bpDiastolicEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -182,6 +194,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.pulseRateEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -194,6 +207,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.spo2EditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -206,6 +220,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.respiratoryEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -218,6 +233,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.rbsEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -230,6 +246,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.heightEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
@@ -242,11 +259,31 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 }else{
                     binding.weightEditTxt.helperText=null
                 }
+                updateNextButtonState()
             }
             override fun afterTextChanged(s: Editable?) {}
         })
 
     }
+
+    /**
+     * Checks all TextInputLayout helper texts. If any has a non-null helperText
+     * (indicating a validation error), the Next/Submit button is disabled.
+     */
+    private fun updateNextButtonState() {
+        val hasErrors = binding.temperatureEditTxt.helperText != null ||
+                binding.bpSystolicEditTxt.helperText != null ||
+                binding.bpDiastolicEditTxt.helperText != null ||
+                binding.pulseRateEditTxt.helperText != null ||
+                binding.spo2EditTxt.helperText != null ||
+                binding.respiratoryEditTxt.helperText != null ||
+                binding.rbsEditTxt.helperText != null ||
+                binding.heightEditTxt.helperText != null ||
+                binding.weightEditTxt.helperText != null
+
+        editPatientViewModel?.setSubmitActive(!hasErrors)
+    }
+
     private fun validateBPSystolic(bpSystolic: String) {
         try {
             val isValid = bpSystolic.matches(Regex("^\\d{2,3}$")) &&
@@ -287,20 +324,20 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                 "Please enter a valid numeric value."
         }
     }
-   /* private fun validateTemperature(temperature: String) {
-        try {
-            val isValid = temperature.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
-            if (isValid) {
-                binding.temperatureEditTxt.helperText = null
-            } else {
-                binding.temperatureEditTxt.helperText =
-                    "Invalid temperature."
-            }
-        } catch (e: NumberFormatException) {
-            binding.temperatureEditTxt.helperText =
-                "Please enter a valid numeric value."
-        }
-    }*/
+    /* private fun validateTemperature(temperature: String) {
+         try {
+             val isValid = temperature.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
+             if (isValid) {
+                 binding.temperatureEditTxt.helperText = null
+             } else {
+                 binding.temperatureEditTxt.helperText =
+                     "Invalid temperature."
+             }
+         } catch (e: NumberFormatException) {
+             binding.temperatureEditTxt.helperText =
+                 "Please enter a valid numeric value."
+         }
+     }*/
 
     private fun validateTemperature(temperature: String) {
         try {
@@ -333,20 +370,20 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
             }
         }
     }
- /*   private fun validateHeight(hei: String) {
-        try {
-            val isValid = hei.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
-            if (isValid) {
-                binding.heightEditTxt.helperText = null
-            } else {
-                binding.heightEditTxt.helperText =
-                    "Invalid Height."
-            }
-        } catch (e: NumberFormatException) {
-            binding.heightEditTxt.helperText =
-                "Please enter a valid numeric value."
-        }
-    }*/
+    /*   private fun validateHeight(hei: String) {
+           try {
+               val isValid = hei.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
+               if (isValid) {
+                   binding.heightEditTxt.helperText = null
+               } else {
+                   binding.heightEditTxt.helperText =
+                       "Invalid Height."
+               }
+           } catch (e: NumberFormatException) {
+               binding.heightEditTxt.helperText =
+                   "Please enter a valid numeric value."
+           }
+       }*/
 
     private fun validateHeight(hei: String) {
         try {
@@ -363,20 +400,20 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
         }
     }
 
-  /*  private fun validateWeight(w: String) {
-        try {
-            val isValid = w.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
-            if (isValid) {
-                binding.weightEditTxt.helperText = null
-            } else {
-                binding.weightEditTxt.helperText =
-                    "Invalid Weight."
-            }
-        } catch (e: NumberFormatException) {
-            binding.weightEditTxt.helperText =
-                "Please enter a valid numeric value."
-        }
-    }*/
+    /*  private fun validateWeight(w: String) {
+          try {
+              val isValid = w.matches(Regex("^\\d{2,3}(\\.\\d{1,2})?$"))
+              if (isValid) {
+                  binding.weightEditTxt.helperText = null
+              } else {
+                  binding.weightEditTxt.helperText =
+                      "Invalid Weight."
+              }
+          } catch (e: NumberFormatException) {
+              binding.weightEditTxt.helperText =
+                  "Please enter a valid numeric value."
+          }
+      }*/
 
     private fun validateWeight(w: String) {
         try {
@@ -495,7 +532,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
         override fun afterTextChanged(s: Editable?) {}
     }
 
-   private fun extractFormValues(){
+    private fun extractFormValues(){
         heightValue = binding.inputHeight.text?.toString()?.trim()
         weightValue = binding.inputWeight.text?.toString()?.trim()
         bmiValue = binding.inputBmi.text?.toString()?.trim()
@@ -579,41 +616,41 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
         if (weightValue != null && heightValue != null && heightValue > 0 &&  weightValue > 0) {
             val bmi = weightValue / (heightValue / 100).pow(2)
             val formattedBMI = "%.2f".format(bmi)
-    //            var status : String
+            //            var status : String
             binding.inputBmi.text = Editable.Factory.getInstance().newEditable(formattedBMI)
             if(bmi > 25 && bmi < 30){
                 binding.bmiCategory.isVisible = true
                 binding.bmiCategory.text = getString(R.string.overweight_txt)
-    //                status = getString(R.string.overweight_txt)
+                //                status = getString(R.string.overweight_txt)
                 binding.bmiCategory.setTextColor(resources.getColor(R.color.red))
                 binding.inputBmi.setTextColor(resources.getColor(R.color.red))
             }
             else if (bmi > 30){
                 binding.bmiCategory.isVisible = true
                 binding.bmiCategory.text = getString(R.string.obese_txt)
-    //                status = getString(R.string.obese_txt)
+                //                status = getString(R.string.obese_txt)
                 binding.bmiCategory.setTextColor(resources.getColor(R.color.red))
                 binding.inputBmi.setTextColor(resources.getColor(R.color.red))
             }
             else{
                 binding.bmiCategory.isVisible = true
-    //                status = getString(R.string.normal_txt)
+                //                status = getString(R.string.normal_txt)
                 binding.bmiCategory.text = getString(R.string.normal_txt)
                 binding.bmiCategory.setTextColor(resources.getColor(R.color.green))
                 binding.inputBmi.setTextColor(resources.getColor(R.color.black))
             }
-    //            val bmiText = "$formattedBMI                          Status: $status"
-    //
-    //            val spannable = SpannableString(bmiText)
-    //
-    //            // Color status text
-    //            val statusStart = bmiText.indexOf("Status:")
-    //            spannable.setSpan(ForegroundColorSpan(resources.getColor(R.color.red)), statusStart, bmiText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-    //
-    //            val indentation = resources.getDimensionPixelSize(R.dimen.bmi_status_indentation) // Define this dimension in resources
-    //            spannable.setSpan(LeadingMarginSpan.Standard(0, indentation), statusStart, bmiText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
-
-    //            binding.inputBmi.text = Editable.Factory.getInstance().newEditable(spannable)
+            //            val bmiText = "$formattedBMI                          Status: $status"
+            //
+            //            val spannable = SpannableString(bmiText)
+            //
+            //            // Color status text
+            //            val statusStart = bmiText.indexOf("Status:")
+            //            spannable.setSpan(ForegroundColorSpan(resources.getColor(R.color.red)), statusStart, bmiText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            //
+            //            val indentation = resources.getDimensionPixelSize(R.dimen.bmi_status_indentation) // Define this dimension in resources
+            //            spannable.setSpan(LeadingMarginSpan.Standard(0, indentation), statusStart, bmiText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+            //            binding.inputBmi.text = Editable.Factory.getInstance().newEditable(spannable)
         }
         else{
             binding.inputBmi.text = null
@@ -626,14 +663,14 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
     }
 
     override fun onSubmitAction() {
-    //        saveEntity()
+        //        saveEntity()
         navigateNext()
     }
 
     override fun onCancelAction() {
-    //        findNavController().navigate(
-    //            FhirVitalsFragmentDirections.actionFhirVitalsFragmentToFhirVisitDetailsFragment()
-    //        )
+        //        findNavController().navigate(
+        //            FhirVitalsFragmentDirections.actionFhirVitalsFragmentToFhirVisitDetailsFragment()
+        //        )
         findNavController().navigateUp()
     }
 
@@ -665,22 +702,26 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
 
                     var benVisitNo = 0;
                     var createNewBenflow = false;
-                    viewModel.getLastVisitInfoSync(masterDb!!.patientId.toString()).let {
-                        if (it == null) {
-                            benVisitNo = 1;
-                        } else if (it.nurseFlag == 1) {
-                            benVisitNo = it.benVisitNo
-                        } else {
-                            benVisitNo = it.benVisitNo + 1
-                            createNewBenflow = true;
+
+                    // Use benVisitNo from bundle if a specialized form passed it; otherwise derive from DB to avoid a split-visit mismatch.
+                    val passedBenVisitNo = arguments?.getInt("benVisitNo", -1) ?: -1
+                    if (passedBenVisitNo > 0) {
+                        benVisitNo = passedBenVisitNo
+                    } else {
+                        viewModel.getLastVisitInfoSync(masterDb!!.patientId.toString()).let {
+                            if (it == null) {
+                                benVisitNo = 1;
+                            } else if (it.nurseFlag == 1) {
+                                benVisitNo = it.benVisitNo
+                            } else {
+                                benVisitNo = it.benVisitNo + 1
+                                createNewBenflow = true;
+                            }
                         }
                     }
                     if (emptyFields.isEmpty()) {
                         extractFormValues()
                         setVitalsMasterData()
-//                addVisitRecordDataToCache(benVisitNo)
-//                addVitalsDataToCache(benVisitNo)
-//                addPatientVisitInfoSyncToCache(benVisitNo, createNewBenflow)
 
                         val user = userRepo.getLoggedInUser()
 
@@ -689,17 +730,10 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
                         viewModel.isDataSaved.observe(viewLifecycleOwner) {
                             when (it!!) {
                                 true -> {
-                                    WorkerUtils.triggerAmritSyncWorker(requireContext())
-                                    val intent = Intent(context, HomeActivity::class.java)
-                                    startActivity(intent)
+                                    WorkerUtils.clinicalPushWorker(requireContext())
                                     requireActivity().finish()
                                 }
-
-                                else -> {
-//                            requireActivity().runOnUiThread {
-//                                Toast.makeText(requireContext(), resources.getString(R.string.something_wend_wong), Toast.LENGTH_SHORT).show()
-//                            }
-                                }
+                                else -> {}
                             }
                         }
 
@@ -720,9 +754,9 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
     }
 
     private fun isTempFieldFilledForFever(): Boolean {
-       if (viewModel.boolTemp && viewModel.tempNull){
-           return false
-       }
+        if (viewModel.boolTemp && viewModel.tempNull){
+            return false
+        }
         return true
     }
 
@@ -782,6 +816,7 @@ class FhirVitalsFragment : Fragment(R.layout.fragment_vitals_custom), Navigation
         )
         masterDb?.vitalsMasterDb = vitalDb
         bundle.putSerializable("MasterDb", masterDb)
+        arguments?.getInt("benVisitNo", -1)?.takeIf { it > 0 }?.let { bundle.putInt("benVisitNo", it) }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsViewModel.kt
index 8e6332e39..45669c8c2 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_patient_vitals/FhirVitalsViewModel.kt
@@ -27,6 +27,7 @@ import org.piramalswasthya.cho.model.PatientVitalsModel
 import org.piramalswasthya.cho.model.PrescriptionCaseRecord
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.model.VisitDB
+import org.piramalswasthya.cho.repositories.CphcDetailsRepository
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
 import org.piramalswasthya.cho.repositories.UserRepo
@@ -45,7 +46,8 @@ class FhirVitalsViewModel @Inject constructor(@ApplicationContext private val ap
                                               private val visitRepo: VisitReasonsAndCategoriesRepo,
                                               private val vitalsRepo: VitalsRepo,
                                               private val patientRepo: PatientRepo,
-                                              private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo
+                                              private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo,
+                                              private val cphcDetailsRepo: CphcDetailsRepository,
 
 ) :
     ViewModel() {
@@ -121,10 +123,12 @@ class FhirVitalsViewModel @Inject constructor(@ApplicationContext private val ap
                           patientVitals: PatientVitalsModel, patientVisitInfoSync: PatientVisitInfoSync){
         viewModelScope.launch {
             try {
-                saveVisitDbToCatche(visitDB)
-                chiefComplaints.forEach {
-                    saveChiefComplaintDbToCatche(it)
-                }
+                cphcDetailsRepo.replaceVisitAndChiefComplaints(
+                    visitDB = visitDB,
+                    chiefComplaints = chiefComplaints,
+                    patientID = visitDB.patientID,
+                    benVisitNo = visitDB.benVisitNo ?: patientVisitInfoSync.benVisitNo,
+                )
                 savePatientVitalInfoToCache(patientVitals)
                 savePatientVisitInfoSync(patientVisitInfoSync)
                 _isDataSaved.value = true
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/ChiefComplaintAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/ChiefComplaintAdapter.kt
index 93056f9b2..6dc91b058 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/ChiefComplaintAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/ChiefComplaintAdapter.kt
@@ -9,14 +9,15 @@ import android.widget.Filter
 import android.widget.AutoCompleteTextView
 import android.widget.TextView
 import org.piramalswasthya.cho.model.ChiefComplaintMaster
+import org.piramalswasthya.cho.utils.MasterDataLocalizer
 
 class ChiefComplaintAdapter(
-    context: Context,
+    private val ctx: Context,
     resource: Int,
     private val dataList: List<ChiefComplaintMaster>,
     autoCompleteTextView: AutoCompleteTextView,
     private val dataListConst: List<ChiefComplaintMaster>,
-) : ArrayAdapter<ChiefComplaintMaster>(context, resource, dataList) {
+) : ArrayAdapter<ChiefComplaintMaster>(ctx, resource, dataList) {
     init {
         // Set the custom filter to the AutoCompleteTextView
         autoCompleteTextView.setAdapter(this)
@@ -24,26 +25,44 @@ class ChiefComplaintAdapter(
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
         val view = super.getView(position, convertView, parent)
         val chiefComplaint = dataList[position]
-        (view as? TextView)?.text = chiefComplaint.chiefComplaint
+        (view as? TextView)?.text =
+            MasterDataLocalizer.localizeChiefComplaint(ctx, chiefComplaint.chiefComplaint)
         return view
     }
 
     override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
         val view = super.getDropDownView(position, convertView, parent)
         val chiefComplaint = dataList[position]
-        (view as? TextView)?.text = chiefComplaint.chiefComplaint
+        (view as? TextView)?.text =
+            MasterDataLocalizer.localizeChiefComplaint(ctx, chiefComplaint.chiefComplaint)
         return view
     }
     override fun getFilter(): Filter {
         return object : Filter() {
             override fun performFiltering(constraint: CharSequence?): FilterResults {
                 val results = FilterResults()
+
+                // if constraint is null or blank, return full list so that dropdown shows all options
+                if (constraint.isNullOrBlank()) {
+                    results.values = ArrayList(dataListConst)
+                    results.count = dataListConst.size
+                    return results
+                }
+
                 constraint?.let { query ->
                     val filteredData = ArrayList<ChiefComplaintMaster>()
                     val lowerCaseQuery = query.toString().lowercase()
 
                     for (item in dataListConst) {
-                        if (item.chiefComplaint.lowercase().contains(lowerCaseQuery)) {
+                        // Match against the localized label so users can search in their own language;
+                        // also keep matching the canonical English so legacy/free-typed input still works.
+                        val localized = MasterDataLocalizer
+                            .localizeChiefComplaint(ctx, item.chiefComplaint)
+                            .lowercase()
+                        val canonical = item.chiefComplaint.lowercase()
+                        if (localized.startsWith(lowerCaseQuery) ||
+                            canonical.startsWith(lowerCaseQuery)
+                        ) {
                             filteredData.add(item)
                         }
                     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FhirVisitDetailsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FhirVisitDetailsFragment.kt
index 73c66e097..3d9d93ec0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FhirVisitDetailsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FhirVisitDetailsFragment.kt
@@ -1,17 +1,16 @@
 package org.piramalswasthya.cho.ui.commons.fhir_visit_details
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.databinding.FragmentFhirVisitDetailsBinding
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.web_view_activity.WebViewActivity
 
 //R.layout.fragment_fhir_visit_details
 
@@ -58,8 +57,7 @@ class FhirVisitDetailsFragment : Fragment(R.layout.fragment_fhir_visit_details),
     }
 
     override fun onCancelAction() {
-        val intent = Intent(context, WebViewActivity::class.java)
-        startActivity(intent)
+        findNavController().navigateUp()
     }
 
     fun navigateNext() {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FragmentVisitDetail.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FragmentVisitDetail.kt
index c1bf73b94..2f05cac0d 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FragmentVisitDetail.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/FragmentVisitDetail.kt
@@ -59,23 +59,31 @@ import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.SpeechToTextContract
 import org.piramalswasthya.cho.ui.commons.immunization_due.child_immunization.list.ChildImmunizationListViewModel
 import org.piramalswasthya.cho.ui.commons.immunization_due.child_immunization.list.ChildImmunizationVaccineBottomSheetFragment
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.utils.DateTimeUtil
 import org.piramalswasthya.cho.utils.HelperUtil.getEddDateFromLmpDate
 import org.piramalswasthya.cho.utils.HelperUtil.setCustomOnClickListener
 import org.piramalswasthya.cho.utils.generateUuid
 import org.piramalswasthya.cho.utils.nullIfEmpty
+import org.piramalswasthya.cho.utils.setupDropdownKeyboardHandling
 import org.piramalswasthya.cho.work.WorkerUtils
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.TimeZone
+import timber.log.Timber
 import javax.inject.Inject
+import kotlin.compareTo
 
 @AndroidEntryPoint
 class FragmentVisitDetail : Fragment(), NavigationAdapter,
     EndIconClickListener {
 
+    companion object {
+        private const val DATE_FORMAT_PATTERN = "yyyy-MM-dd HH:mm:ss"
+        private const val OTHER_CPHC_SERVICES = "Other CPHC Services"
+    }
+
     var fragmentContainerId = 0
     private lateinit var benVisitInfo: PatientDisplayWithVisitInfo
     private lateinit var patientId: String
@@ -99,9 +107,10 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
     private var units = mutualVisitUnitsVal
     private var subCatOptions = ArrayList<SubVisitCategory>()
 
-//    private lateinit var subCatAdapter: SubCategoryAdapter
+    //    private lateinit var subCatAdapter: SubCategoryAdapter
     private var isFileSelected: Boolean = false
     private var isFileUploaded: Boolean = false
+    private var isNavigationInProgress: Boolean = false
 
     @Inject
     lateinit var preferenceDao: PreferenceDao
@@ -181,7 +190,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         if (dateString.isNullOrEmpty()) {
             return false
         }
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        val dateFormat = SimpleDateFormat(DATE_FORMAT_PATTERN)
         try {
             val visitDate = dateFormat.parse(dateString)
 
@@ -291,120 +300,50 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         return (ageGap > minAge) && (ageGap <= maxAge)
     }
 
-    private fun setSubCategoryDropdown(){
-        viewModel.selectedSubCat = ""
-        binding.subCatInput.setText(viewModel.selectedSubCat, false)
-        if( ageCheckForChild(benVisitInfo.patient.dob) ){
-
-             if (ageCheckForFemaleChild(benVisitInfo.patient.dob) && benVisitInfo.genderName?.lowercase() == "female"){
-                val subCatAdapter = SubCategoryAdapter(
-                    requireContext(),
-                    R.layout.dropdown_subcategory,
-                    R.id.tv_dropdown_item_text,
-                    DropdownConst.age_0_to_1)
-                binding.subCatInput.setAdapter(subCatAdapter)
-            } else if (age15To18ForFemaleChild(benVisitInfo.patient.dob) && benVisitInfo.genderName?.lowercase() == "female") {
-                 val subCatAdapter = SubCategoryAdapter(
-                     requireContext(),
-                     R.layout.dropdown_subcategory,
-                     R.id.tv_dropdown_item_text,
-                     DropdownConst.female_1_to_59)
-                 binding.subCatInput.setAdapter(subCatAdapter)
-             } else {
-                 val subCatAdapter = SubCategoryAdapter(
-                     requireContext(),
-                     R.layout.dropdown_subcategory,
-                     R.id.tv_dropdown_item_text,
-                     DropdownConst.age_0_to_1)
-                 binding.subCatInput.setAdapter(subCatAdapter)
-             }
-
-
-//            viewModel.selectedSubCat = DropdownConst.age_0_to_1[0]
-//            binding.subCatInput.setText(viewModel.selectedSubCat, false)
-//            setReasonForVisitDropdown(viewModel.selectedSubCat)
-        }
-        else if(benVisitInfo.genderName?.lowercase() == "male" && ageCheckForNCD(benVisitInfo.patient.dob)){
-            val subCatAdapter = SubCategoryAdapter(
-                requireContext(),
-                R.layout.dropdown_subcategory,
-                R.id.tv_dropdown_item_text,
-                DropdownConst.male_ncd)
-            binding.subCatInput.setAdapter(subCatAdapter)
-        }
-        else if( ageCheckForFemale(benVisitInfo.patient.dob) && benVisitInfo.genderName?.lowercase() == "female"){
-            if(ageCheckForNCD(benVisitInfo.patient.dob)){
-                val subCatAdapter = SubCategoryAdapter(
-                    requireContext(),
-                    R.layout.dropdown_subcategory,
-                    R.id.tv_dropdown_item_text,
-                    DropdownConst.female_ncd)
-                binding.subCatInput.setAdapter(subCatAdapter)
-            }
-            else{
-                val subCatAdapter = SubCategoryAdapter(
-                    requireContext(),
-                    R.layout.dropdown_subcategory,
-                    R.id.tv_dropdown_item_text,
-                    DropdownConst.female_1_to_59)
-                binding.subCatInput.setAdapter(subCatAdapter)
-            }
-//            viewModel.selectedSubCat = DropdownConst.female_1_to_59[0]
-//            binding.subCatInput.setText(viewModel.selectedSubCat, false)
-//            setReasonForVisitDropdown(viewModel.selectedSubCat)
+    fun ageCheckForElderly(dob: Date?): Boolean{
+        if(dob == null){
+            return false
         }
 
-    }
+        val minAge = 365L*60*24*60*60*1000
+        val ageGap = System.currentTimeMillis() - dob.time
 
-    private fun setReasonForVisitDropdown(subCat: String){
+        return (ageGap >= minAge)
+    }
 
-        Log.d("Reason for visit is ", "Working " + subCat)
-        if(subCat == DropdownConst.careAndPreg){
-            val subCatAdapter = SubCategoryAdapter(
-                requireContext(),
-                R.layout.dropdown_subcategory,
-                R.id.tv_dropdown_item_text,
-                listOf(DropdownConst.anc, DropdownConst.pnc)
-            )
-            binding.reasonForVisitInput.setAdapter(subCatAdapter)
-            changeBtnView()
-//            viewModel.selectedReasonForVisit = DropdownConst.anc
-//            binding.reasonForVisitInput.setText(viewModel.selectedReasonForVisit, false)
-        }
-        else if(subCat == DropdownConst.fpAndOtherRep){
-            val subCatAdapter = SubCategoryAdapter(
-                requireContext(),
-                R.layout.dropdown_subcategory,
-                R.id.tv_dropdown_item_text,
-                listOf(DropdownConst.fpAndCs)
-            )
-            binding.reasonForVisitInput.setAdapter(subCatAdapter)
-            changeBtnView()
-//            viewModel.selectedReasonForVisit = DropdownConst.fpAndCs
-//            binding.reasonForVisitInput.setText(viewModel.selectedReasonForVisit, false)
-        }
-        else if(subCat == DropdownConst.neonatalAndInfant){
-            val subCatAdapter = SubCategoryAdapter(
-                requireContext(),
-                R.layout.dropdown_subcategory,
-                R.id.tv_dropdown_item_text,
-                listOf(DropdownConst.immunization)
-            )
-            binding.reasonForVisitInput.setAdapter(subCatAdapter)
-            changeBtnView()
-//            viewModel.selectedReasonForVisit = DropdownConst.immunization
-//            binding.reasonForVisitInput.setText(viewModel.selectedReasonForVisit, false)
+    private fun ageCheckForMentalHealth(dob: Date?): Boolean {
+        if (dob == null) return false
+        val today = Calendar.getInstance()
+        val birth = Calendar.getInstance().apply { time = dob }
+        var ageYears = today.get(Calendar.YEAR) - birth.get(Calendar.YEAR)
+        if (today.get(Calendar.DAY_OF_YEAR) < birth.get(Calendar.DAY_OF_YEAR)) {
+            ageYears--
         }
-        else if(subCat == DropdownConst.ncdScreening){
-            val subCatAdapter = SubCategoryAdapter(
+        return ageYears >= 11
+    }
+
+    private fun setSubCategoryDropdown() {
+        viewModel.selectedSubCat = ""
+        binding.subCatInput.setText(viewModel.selectedSubCat, false)
+        rebuildSubCategoryAdapter()
+    }
+
+    private fun setReasonForVisitAdapter(reasons: List<String>) {
+        binding.reasonForVisitInput.setAdapter(
+            SubCategoryAdapter(
                 requireContext(),
                 R.layout.dropdown_subcategory,
                 R.id.tv_dropdown_item_text,
-                listOf(DropdownConst.ncdScreening)
+                reasons
             )
-            binding.reasonForVisitInput.setAdapter(subCatAdapter)
-        }
-        else{
+        )
+    }
+
+    private fun setReasonForVisitDropdown(subCat: String) {
+        val reasons = DropdownConst.reasonForVisitBySubCategory[subCat]
+        if (reasons != null) {
+            setReasonForVisitAdapter(reasons)
+        } else {
             viewModel.selectedReasonForVisit = ""
             binding.reasonForVisitInput.setText(viewModel.selectedReasonForVisit, false)
         }
@@ -442,7 +381,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.rvAnc.visibility = View.VISIBLE
             binding.rvPnc.visibility = View.GONE
             binding.rvEct.visibility = View.GONE
-            changeBtnView()
+
         }
         else if(reasonForVisit == DropdownConst.pnc){
             binding.lmpDateText.visibility = View.GONE
@@ -461,7 +400,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.rvAnc.visibility = View.GONE
             binding.rvPnc.visibility = View.VISIBLE
             binding.rvEct.visibility = View.GONE
-            changeBtnView()
+
         }
         else if(reasonForVisit == DropdownConst.fpAndCs){
             binding.lmpDateText.visibility = View.GONE
@@ -470,7 +409,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.rvAnc.visibility = View.GONE
             binding.rvPnc.visibility = View.GONE
             binding.rvEct.visibility = View.VISIBLE
-            changeBtnView()
+
         }
         else if(reasonForVisit == DropdownConst.ncdScreening){
             binding.lmpDateText.visibility = View.GONE
@@ -479,12 +418,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.rvAnc.visibility = View.GONE
             binding.rvPnc.visibility = View.GONE
             binding.rvEct.visibility = View.GONE
-            if (viewModel.cbacId != 0) {
-                binding.btnSubmit.text = resources.getString(R.string.view)
-                binding.btnSubmit.backgroundTintList = resources.getColorStateList(R.color.colorAccent)
-            } else {
-                changeBtnView()
-            }
+
 
         }
         else{
@@ -505,11 +439,15 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
     override fun onResume(){
         Log.v("tag on", "onResume")
         super.onResume()
-        
+
+        isNavigationInProgress = false
+//        binding.btnSubmit.isEnabled = true
         deliveryDate = null
         binding.deliveryDate.setText("")
-        setSubCategoryDropdown()
-        setReasonForVisitDropdown(viewModel.selectedSubCat)
+        if (binding.subCatInput.text.isNullOrBlank() && viewModel.selectedSubCat.isBlank()) {
+            setSubCategoryDropdown()
+        }
+        restoreVisitDropdownState()
     }
 
     override fun onPause(){
@@ -538,12 +476,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
 //        viewModel.selectedReasonForVisit = ""
 //        binding.subCatInput.setText(viewModel.selectedSubCat, false)
 //        binding.reasonForVisitInput.setText(viewModel.selectedReasonForVisit, false)
-        binding.btnCancel.setOnClickListener {
-            onCancelCall()
-        }
-        binding.btnSubmit.setOnClickListener {
-            navigateNext()
-        }
+
         if(!preferenceDao.isUserCHO()){
             binding.patientList.visibility = View.GONE
         }
@@ -568,22 +501,11 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             category = binding.radioButton1.tag.toString()
         }
 
-        val selectedCategoryRadioButtonId = binding.radioGroup.checkedRadioButtonId
-        val selectedCategoryRadioButton = view?.findViewById<RadioButton>(selectedCategoryRadioButtonId)
-        val selectedCategory = selectedCategoryRadioButton?.tag.toString()
-
-        if(selectedCategory == "General OPD"){
-            binding.reasonText.visibility = View.VISIBLE
-            binding.radioGroup2.visibility = View.VISIBLE
-            binding.subCatDropDown.visibility = View.GONE
-            binding.reasonForVisitDropDown.visibility = View.GONE
-        }
-        else{
-            binding.reasonText.visibility = View.GONE
-            binding.radioGroup2.visibility = View.GONE
-            binding.subCatDropDown.visibility = View.VISIBLE
-            binding.reasonForVisitDropDown.visibility = View.VISIBLE
-        }
+        binding.reasonText.visibility = View.VISIBLE
+        binding.radioGroup2.visibility = View.VISIBLE
+        binding.layyy.visibility = View.VISIBLE
+        updateSubCategoryAndReasonVisibility()
+        validateAndEnableDropdowns()
 
         requireActivity().onBackPressedDispatcher.addCallback(
             viewLifecycleOwner,
@@ -633,10 +555,10 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             if(viewModel.selectedReasonForVisit == DropdownConst.anc){
                 binding.rvAnc.visibility = View.VISIBLE
 //                viewModel.activePwrRecord.observe(viewLifecycleOwner){
-                    if(viewModel.activePwrRecord == null && lmpDate == null){
-                        binding.lmpDateText.visibility = View.VISIBLE
-                        binding.eddDateText.visibility = View.VISIBLE
-                    }
+                if(viewModel.activePwrRecord == null && lmpDate == null){
+                    binding.lmpDateText.visibility = View.VISIBLE
+                    binding.eddDateText.visibility = View.VISIBLE
+                }
 //                }
             }
             else if(viewModel.selectedReasonForVisit == DropdownConst.pnc){
@@ -705,8 +627,17 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         masterDb?.patientId = benVisitInfo.patient.patientID
         patientId = benVisitInfo.patient.patientID
 
+        val savedSubCat = viewModel.selectedSubCat
+        val savedReasonForVisit = viewModel.selectedReasonForVisit
         setSubCategoryDropdown()
-        setReasonForVisitDropdown(viewModel.selectedSubCat)
+        if (savedSubCat.isNotBlank()) {
+            viewModel.selectedSubCat = savedSubCat
+            binding.subCatInput.setText(savedSubCat, false)
+        }
+        if (savedReasonForVisit.isNotBlank()) {
+            viewModel.selectedReasonForVisit = savedReasonForVisit
+        }
+        restoreVisitDropdownState()
 
         viewModel.init(benVisitInfo.patient.patientID,benVisitInfo.patient.beneficiaryID.toString())
 
@@ -728,13 +659,13 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
 //                    ).show()
 //                }
 //                else{
-                    val submitDoctorData = Bundle()
-                    submitDoctorData.putBoolean("viewRecord", true)
-                    submitDoctorData.putSerializable("benVisitInfo", it)
+                val submitDoctorData = Bundle()
+                submitDoctorData.putBoolean("viewRecord", true)
+                submitDoctorData.putSerializable("benVisitInfo", it)
 
-                    findNavController().navigate(
-                        R.id.action_fhirVisitDetailsFragment_to_caseRecordCustom, submitDoctorData
-                    )
+                findNavController().navigate(
+                    R.id.action_fhirVisitDetailsFragment_to_caseRecordCustom, submitDoctorData
+                )
 
 //                }
 
@@ -821,7 +752,6 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             viewModel.setIsFollowUp(isWithinThreeDays(it))
             makeFollowUpDefault()
         }
-        binding.subCatInput.threshold = 1
         lifecycleScope.launch {
             viewModel.chiefComplaintMaster.collect { chiefComplaintsList ->
                 chiefComplaints.clear()
@@ -841,34 +771,33 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
 //                    binding.reasonText.visibility = View.VISIBLE
                     binding.reasonText.visibility = View.VISIBLE
                     binding.radioGroup2.visibility = View.VISIBLE
-                    binding.subCatDropDown.visibility = View.GONE
-                    binding.reasonForVisitDropDown.visibility = View.GONE
                     binding.layyy.visibility = View.VISIBLE
 //                    binding.usePrevious.visibility = View.VISIBLE
 //                    category = binding.radioButton1.text.toString()
                     category = binding.radioButton1.tag.toString()
-                    changeBtnView()
+
                 }
 
                 else -> {
 //                    binding.radioGroup2.visibility = View.GONE
 //                    binding.reasonText.visibility = View.GONE
                     setVisibility()
-                    binding.reasonText.visibility = View.GONE
-                    binding.radioGroup2.visibility = View.GONE
-                    binding.subCatDropDown.visibility = View.VISIBLE
-                    binding.reasonForVisitDropDown.visibility = View.VISIBLE
-                    binding.layyy.visibility = View.GONE
+                    binding.reasonText.visibility = View.VISIBLE
+                    binding.radioGroup2.visibility = View.VISIBLE
+                    binding.layyy.visibility = View.VISIBLE
                     binding.usePrevious.visibility = View.GONE
 //                    category = binding.radioButton2.text.toString()
                     category = binding.radioButton2.tag.toString()
 
                 }
             }
+            updateSubCategoryAndReasonVisibility()
+            validateAndEnableDropdowns()
         }
         binding.radioGroup2.setOnCheckedChangeListener { _, checkedId ->
             reason = when (checkedId) {
                 R.id.radioButton3 -> {
+                    viewModel.setIsFollowUp(false)
                     binding.chf.visibility = View.VISIBLE
                     binding.chiefComplaintExtra.visibility = View.VISIBLE
                     binding.chiefComplaintHeading.visibility = View.GONE
@@ -876,16 +805,20 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
                     binding.vitalsHeading.visibility = View.GONE
                     binding.vitalsLayout.visibility = View.GONE
                     binding.usePrevious.visibility = View.GONE
+                    updateSubCategoryAndReasonVisibility()
 //                    binding.radioButton3.text.toString()
                     binding.radioButton3.tag.toString()
                 }
 
                 else -> {
+                    viewModel.setIsFollowUp(true)
                     chiefAndVitalsDataFill()
+                    updateSubCategoryAndReasonVisibility()
                     binding.radioButton4.tag.toString()
 //                    binding.radioButton4.text.toString()
                 }
             }
+            validateAndEnableDropdowns()
         }
         adapter = VisitDetailAdapter(
             itemList,
@@ -894,6 +827,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             object : RecyclerViewItemChangeListener {
                 override fun onItemChanged() {
                     binding.plusButton.isEnabled = !isAnyItemEmpty()
+                    validateAndEnableDropdowns()
                 }
             },
             chiefComplaintsForFilter,
@@ -908,17 +842,115 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         binding.plusButton.setOnClickListener {
             val newItem = ChiefComplaintValues()
             itemList.add(newItem)
-            adapter.notifyItemInserted(itemList.size - 1)
+            adapter.notifyDataSetChanged()
             binding.plusButton.isEnabled = false
+            validateAndEnableDropdowns()
+        }
+
+    }
+    private fun validateAndEnableDropdowns() {
+        val selectedCategoryRadioButtonId = binding.radioGroup.checkedRadioButtonId
+        val selectedCategoryRadioButton = view?.findViewById<RadioButton>(selectedCategoryRadioButtonId)
+        val selectedCategory = selectedCategoryRadioButton?.tag.toString()
+        val isNewCC = binding.radioButton3.isChecked
+
+        if (selectedCategory == OTHER_CPHC_SERVICES && isNewCC) {
+            val isValid = hasAtLeastOneCompleteChiefComplaint()
+            binding.subCatDropDown.isEnabled = isValid
+            binding.reasonForVisitDropDown.isEnabled = isValid
+            if (!isValid) {
+                clearSubCategoryAndReasonForVisit()
+            }
+        } else {
+            binding.subCatDropDown.isEnabled = true
+            binding.reasonForVisitDropDown.isEnabled = true
+        }
+    }
+
+    private fun clearSubCategoryAndReasonForVisit() {
+        viewModel.selectedSubCat = ""
+        viewModel.selectedReasonForVisit = ""
+        binding.subCatInput.setText("", false)
+        binding.reasonForVisitInput.setText("", false)
+        removeVisibility()
+    }
+
+    private fun restoreVisitDropdownState() {
+        val subCat = viewModel.selectedSubCat.ifBlank { binding.subCatInput.text?.toString().orEmpty() }
+        if (subCat.isBlank()) return
+
+        viewModel.selectedSubCat = subCat
+        if (binding.subCatInput.text?.toString() != subCat) {
+            binding.subCatInput.setText(subCat, false)
         }
+        setReasonForVisitDropdown(subCat)
 
+        val reason = viewModel.selectedReasonForVisit.ifBlank {
+            binding.reasonForVisitInput.text?.toString().orEmpty()
+        }
+        if (reason.isNotBlank()) {
+            viewModel.selectedReasonForVisit = reason
+            if (binding.reasonForVisitInput.text?.toString() != reason) {
+                binding.reasonForVisitInput.setText(reason, false)
+            }
+            setVisibility()
+        }
+    }
+
+
+    private fun updateSubCategoryAndReasonVisibility() {
+        val selectedCategoryRadioButton =
+            view?.findViewById<RadioButton>(binding.radioGroup.checkedRadioButtonId)
+        val selectedCategory = selectedCategoryRadioButton?.tag.toString()
+        val showForNewChiefComplaint =
+            selectedCategory == OTHER_CPHC_SERVICES && !viewModel.getIsFollowUp()
+        val visibility = if (showForNewChiefComplaint) View.VISIBLE else View.GONE
+        binding.subCatDropDown.visibility = visibility
+        binding.reasonForVisitDropDown.visibility = visibility
+    }
+
+    private fun resolveCphcSubCategoryOptions(): List<String> {
+        val options = DropdownConst.cphcSubCategoriesAllAges.toMutableList()
+        val dob = benVisitInfo.patient.dob
+        if (ageCheckForMentalHealth(dob)) {
+            options.add(DropdownConst.mentalHealth)
+        }
+        if (ageCheckForNCD(dob)) {
+            options.add(DropdownConst.ncd)
+        }
+        if (ageCheckForElderly(dob)) {
+            options.add(DropdownConst.elderlyAndPalliative)
+        }
+        return options.distinct()
+    }
+
+    private fun resolveBaseSubCategoryOptions(): List<String> = resolveCphcSubCategoryOptions()
+
+    private fun rebuildSubCategoryAdapter() {
+        if (!::benVisitInfo.isInitialized) return
+        val selectedSubCat = viewModel.selectedSubCat.ifBlank {
+            binding.subCatInput.text?.toString().orEmpty()
+        }
+        if (selectedSubCat == DropdownConst.mentalHealth &&
+            !ageCheckForMentalHealth(benVisitInfo.patient.dob)
+        ) {
+            clearSubCategoryAndReasonForVisit()
+        }
+        val options = resolveBaseSubCategoryOptions()
+        binding.subCatInput.setAdapter(
+            SubCategoryAdapter(
+                requireContext(),
+                R.layout.dropdown_subcategory,
+                R.id.tv_dropdown_item_text,
+                options
+            )
+        )
     }
 
     private fun extractFormValues() {
         heightValue = binding.inputHeight.text?.toString()?.trim().nullIfEmpty()
         weightValue = binding.inputWeight.text?.toString()?.trim().nullIfEmpty()
         bmiValue = binding.inputBmi.text?.toString()?.trim().nullIfEmpty()
-//        waistCircumferenceValue = binding.inputWaistCircum.text?.toString()?.trim()
         temperatureValue = binding.inputTemperature.text?.toString()?.trim().nullIfEmpty()
         pulseRateValue = binding.inputPulseRate.text?.toString()?.trim().nullIfEmpty()
         spo2Value = binding.inputSpo2.text?.toString()?.trim().nullIfEmpty()
@@ -942,7 +974,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             subCategory = subCategory.nullIfEmpty(),
             patientID = patientId,
             benVisitNo = benVisitNo,
-            benVisitDate =  SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date()),
+            benVisitDate =  SimpleDateFormat(DATE_FORMAT_PATTERN).format(Date()),
             createdBy = user?.userName
         )
 
@@ -1026,8 +1058,6 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
                     when(it!!){
                         true ->{
                             WorkerUtils.triggerAmritSyncWorker(requireContext())
-                            val intent = Intent(context, HomeActivity::class.java)
-                            startActivity(intent)
                             requireActivity().finish()
                         }
                         else ->{
@@ -1041,9 +1071,9 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             }
         }
         else{
-                findNavController().navigate(
-                    R.id.action_fhirVisitDetailsFragment_to_caseRecordCustom, bundle
-                )
+            findNavController().navigate(
+                R.id.action_fhirVisitDetailsFragment_to_caseRecordCustom, bundle
+            )
         }
     }
     private fun setVitalsMasterData() {
@@ -1195,7 +1225,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             }
         }
         if (chiefComplaintDB2.size==0){
-                binding.usePrevious.visibility = View.GONE
+            binding.usePrevious.visibility = View.GONE
         }
         chAdapter = ChiefComplaintMultiAdapter(chiefComplaintDB2,"")
         binding.chiefComplaintExtra2.adapter = chAdapter
@@ -1237,6 +1267,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.radioButton3.isChecked = false
             binding.radioButton4.isChecked = true
             chiefAndVitalsDataFill()
+            updateSubCategoryAndReasonVisibility()
 //            reason = binding.radioButton4.text.toString()
             reason = binding.radioButton4.tag.toString()
         } else {
@@ -1249,18 +1280,22 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
             binding.vitalsHeading.visibility = View.GONE
             binding.vitalsLayout.visibility = View.GONE
             binding.usePrevious.visibility = View.GONE
+            updateSubCategoryAndReasonVisibility()
 //            reason = binding.radioButton4.text.toString()
             reason = binding.radioButton3.tag.toString()
         }
     }
 
     fun isAnyItemEmpty(): Boolean {
-        for (item in itemList) {
-            if (item.chiefComplaint!!.isEmpty() || item.duration!!.isEmpty()) {
-                return true
-            }
+        return itemList.any { item ->
+            item.chiefComplaint.isNullOrBlank() || item.duration.isNullOrBlank()
+        }
+    }
+
+    private fun hasAtLeastOneCompleteChiefComplaint(): Boolean {
+        return itemList.any { item ->
+            !item.chiefComplaint.isNullOrBlank() && !item.duration.isNullOrBlank()
         }
-        return false
     }
 
 
@@ -1319,35 +1354,36 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
 
     @RequiresApi(Build.VERSION_CODES.O)
     fun navigateNext() {
+        if (isNavigationInProgress) return
         val selectedCategoryRadioButtonId = binding.radioGroup.checkedRadioButtonId
         val selectedCategoryRadioButton =
             view?.findViewById<RadioButton>(selectedCategoryRadioButtonId)
         val selectedCategory = selectedCategoryRadioButton?.tag.toString()
-        if(selectedCategory == "Other CPHC Services"){
+        if(selectedCategory == OTHER_CPHC_SERVICES){
             val reasonForVisit = binding.reasonForVisitInput.text.toString()
             if(reasonForVisit == DropdownConst.anc){
 
 //                viewModel.activePwrRecord.observe(viewLifecycleOwner) { it1->
-                    if(viewModel.activePwrRecord == null && lmpDate == null){
-                        Toast.makeText(
-                            requireContext(),
-                            "Select LMP Date",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                    else if(viewModel.activePwrRecord == null){
-                        viewModel.savePregnantWomanRegistration(benVisitInfo.patient.patientID, lmpDate!!)
+                if(viewModel.activePwrRecord == null && lmpDate == null){
+                    Toast.makeText(
+                        requireContext(),
+                        "Select LMP Date",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
+                else if(viewModel.activePwrRecord == null){
+                    viewModel.savePregnantWomanRegistration(benVisitInfo.patient.patientID, lmpDate!!)
 //                        lmpDateDisablity = true
-                        binding.lmpDate.setOnClickListener {}
-                        viewModel.isLMPDateSaved.observe(viewLifecycleOwner){it2->
-                            if(it2){
-                                checkAndNavigateAnc()
-                            }
+                    binding.lmpDate.setOnClickListener {}
+                    viewModel.isLMPDateSaved.observe(viewLifecycleOwner){it2->
+                        if(it2){
+                            checkAndNavigateAnc()
                         }
                     }
-                    else{
-                        checkAndNavigateAnc()
-                    }
+                }
+                else{
+                    checkAndNavigateAnc()
+                }
 //                }
             }
             else if(reasonForVisit == DropdownConst.pnc){
@@ -1402,6 +1438,76 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
                     )
                 )
             }
+            else if(
+                reasonForVisit == DropdownConst.screening ||
+                reasonForVisit == DropdownConst.REASON_SYMPTOMATIC ||
+                reasonForVisit == DropdownConst.REASON_FIRST_AID_EYE_INJURY ||
+                reasonForVisit == DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA
+            ){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = true) { bundle ->
+                    findNavController().navigate(R.id.ophthalmicScreeningFragment, bundle)
+                }
+            }
+            else if(reasonForVisit == DropdownConst.ear ){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.earDiagnosisFormFragment, bundle)
+                }
+            }
+            else if(reasonForVisit == DropdownConst.dental){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.oralHealthFormFragment, bundle)
+                }
+            }
+            else if(reasonForVisit == DropdownConst.nose){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.fragment_nose_diagnosis_form, bundle)
+                }
+            }
+            else if(reasonForVisit == DropdownConst.throat){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.throatDiagnosisFormFragment, bundle)
+                }
+            }
+            else if(
+                reasonForVisit == DropdownConst.elderlyHealthAssessment ||
+                reasonForVisit == DropdownConst.functionalDeclineOrDependency
+            ){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.fragment_elderly_health_assessment_form, bundle)
+                }
+            }
+            else if(
+                reasonForVisit == DropdownConst.persistentPain ||
+                reasonForVisit == DropdownConst.distressingSymptoms
+            ){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.painAndSymptomAssessmentFormFragment, bundle)
+                }
+            }
+            else if(reasonForVisit == DropdownConst.psychosocialCaregiverSupport ||
+                reasonForVisit == DropdownConst.caregiverSupportCounselling){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()) { bundle ->
+                    findNavController().navigate(R.id.psychosocialCaregiverSupportFormFragment, bundle)
+                }
+            }
+            else if(
+                reasonForVisit in DropdownConst.mentalHealthReasons ||
+                reasonForVisit == DropdownConst.mentalHealth ||
+                reasonForVisit == DropdownConst.mentalHealthScreening
+            ){
+                isNavigationInProgress = true
+                proceedToSpecializedForm(skipChiefComplaintValidation = viewModel.getIsFollowUp()){ bundle ->
+                    findNavController().navigate(R.id.mentalHealthScreeningFormFragment, bundle)
+                }
+            }
 
         }
         else {
@@ -1421,6 +1527,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
                         resources.getString(R.string.toast_cat_select),
                         Toast.LENGTH_SHORT
                     ).show()
+                    isNavigationInProgress = false
                     false
                 } else true
 
@@ -1466,27 +1573,27 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         val minGap : Long = (28.toLong() * 24 * 60 * 60 * 1000)
         val fiveWeeks : Long = (35.toLong() * 24 * 60 * 60 * 1000)
 //        viewModel.lastAnc.observe(viewLifecycleOwner){
-            if(viewModel.lastAnc != null && System.currentTimeMillis() - viewModel.lastAnc!!.ancDate < minGap){
-                Toast.makeText(
-                    requireContext(),
-                    "ANC found within 28 days",
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-            else if(viewModel.lastAnc == null && System.currentTimeMillis() - viewModel.activePwrRecord!!.lmpDate <= fiveWeeks) {
-                Toast.makeText(
-                    requireContext(),
-                    "LMP date found " + DateTimeUtil.formatCustDate(viewModel.activePwrRecord!!.lmpDate) + ". Gap with first ANC should be at least 5 weeks",
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-            else{
-                findNavController().navigate(
-                    FragmentVisitDetailDirections.actionFhirVisitDetailsFragmentToPwAncFormFragment(
-                        benVisitInfo.patient.patientID, lastAncVisit + 1, false
-                    )
+        if(viewModel.lastAnc != null && System.currentTimeMillis() - viewModel.lastAnc!!.ancDate < minGap){
+            Toast.makeText(
+                requireContext(),
+                "ANC found within 28 days",
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+        else if(viewModel.lastAnc == null && System.currentTimeMillis() - viewModel.activePwrRecord!!.lmpDate <= fiveWeeks) {
+            Toast.makeText(
+                requireContext(),
+                "LMP date found " + DateTimeUtil.formatCustDate(viewModel.activePwrRecord!!.lmpDate) + ". Gap with first ANC should be at least 5 weeks",
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+        else{
+            findNavController().navigate(
+                FragmentVisitDetailDirections.actionFhirVisitDetailsFragmentToPwAncFormFragment(
+                    benVisitInfo.patient.patientID, lastAncVisit + 1, false
                 )
-            }
+            )
+        }
 //        }
     }
 
@@ -1541,18 +1648,14 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         val subCategory = binding.subCatInput.text.toString()
         visitMasterDb.subCategory = subCategory
 
-        val chiefComplaintList2 = mutableListOf<ChiefComplaintValues>()
-        viewModel.chiefComplaintDB.observe(viewLifecycleOwner) { chiefComplaintList ->
-            for (chiefComplaintData in chiefComplaintList) {
-                var cc = ChiefComplaintValues(
-                    id = chiefComplaintData.chiefComplaintId,
-                    chiefComplaint = chiefComplaintData.chiefComplaint.nullIfEmpty(),
-                    duration = chiefComplaintData.duration.nullIfEmpty(),
-                    durationUnit = chiefComplaintData.durationUnit.nullIfEmpty(),
-                    description = chiefComplaintData.description.nullIfEmpty()
-                )
-                chiefComplaintList2.add(cc)
-            }
+        val chiefComplaintList2 = chiefComplaintDB2.map { chiefComplaintData ->
+            ChiefComplaintValues(
+                id = chiefComplaintData.chiefComplaintId,
+                chiefComplaint = chiefComplaintData.chiefComplaint.nullIfEmpty(),
+                duration = chiefComplaintData.duration.nullIfEmpty(),
+                durationUnit = chiefComplaintData.durationUnit.nullIfEmpty(),
+                description = chiefComplaintData.description.nullIfEmpty()
+            )
         }
 
         visitMasterDb.chiefComplaint = chiefComplaintList2
@@ -1593,18 +1696,14 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         val subCategory = binding.subCatInput.text.toString()
         visitMasterDb.subCategory = subCategory
 
-        val chiefComplaintList2 = mutableListOf<ChiefComplaintValues>()
-        viewModel.chiefComplaintDB.observe(viewLifecycleOwner) { chiefComplaintList ->
-            for (chiefComplaintData in chiefComplaintList) {
-                var cc = ChiefComplaintValues(
-                    id = chiefComplaintData.chiefComplaintId,
-                    chiefComplaint = chiefComplaintData.chiefComplaint.nullIfEmpty(),
-                    duration = chiefComplaintData.duration.nullIfEmpty(),
-                    durationUnit = chiefComplaintData.durationUnit.nullIfEmpty(),
-                    description = chiefComplaintData.description.nullIfEmpty()
-                )
-                chiefComplaintList2.add(cc)
-            }
+        val chiefComplaintList2 = chiefComplaintDB2.map { chiefComplaintData ->
+            ChiefComplaintValues(
+                id = chiefComplaintData.chiefComplaintId,
+                chiefComplaint = chiefComplaintData.chiefComplaint.nullIfEmpty(),
+                duration = chiefComplaintData.duration.nullIfEmpty(),
+                durationUnit = chiefComplaintData.durationUnit.nullIfEmpty(),
+                description = chiefComplaintData.description.nullIfEmpty()
+            )
         }
 
         visitMasterDb.chiefComplaint = chiefComplaintList2
@@ -1613,7 +1712,9 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
     }
 
     private fun setVisitMasterData() {
-        val masterDb = MasterDb(patientId)
+        if (masterDb == null) {
+            masterDb = MasterDb(patientId)
+        }
         val visitMasterDb = VisitMasterDb()
 
         val selectedCategoryRadioButtonId = binding.radioGroup.checkedRadioButtonId
@@ -1632,28 +1733,196 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         visitMasterDb.subCategory = subCategory
 
         val chiefComplaintList = mutableListOf<ChiefComplaintValues>()
-        for (i in 0 until itemList.size) {
-            val chiefComplaintData = itemList[i]
 
-            if (chiefComplaintData.chiefComplaint!!.isNotEmpty() &&
-                chiefComplaintData.duration!!.isNotEmpty()
-            ) {
-                var cc = ChiefComplaintValues(
-                    id = chiefComplaintData.id,
-                    chiefComplaint = chiefComplaintData.chiefComplaint,
-                    duration = chiefComplaintData.duration,
-                    durationUnit = chiefComplaintData.durationUnit,
-                    description = chiefComplaintData.description.nullIfEmpty()
-                )
-                chiefComplaintList.add(cc)
+        // Use chiefComplaintDB2 for follow-up, itemList otherwise
+        if (viewModel.getIsFollowUp()) {
+            for (i in 0 until chiefComplaintDB2.size) {
+                val chiefComplaintData = chiefComplaintDB2[i]
+
+                if (!chiefComplaintData.chiefComplaint.isNullOrEmpty() &&
+                    !chiefComplaintData.duration.isNullOrEmpty()
+                ) {
+                    var cc = ChiefComplaintValues(
+                        id = chiefComplaintData.chiefComplaintId,
+                        chiefComplaint = chiefComplaintData.chiefComplaint.nullIfEmpty(),
+                        duration = chiefComplaintData.duration.nullIfEmpty(),
+                        durationUnit = chiefComplaintData.durationUnit.nullIfEmpty(),
+                        description = chiefComplaintData.description.nullIfEmpty()
+                    )
+                    chiefComplaintList.add(cc)
+                }
+            }
+        } else {
+            for (i in 0 until itemList.size) {
+                val chiefComplaintData = itemList[i]
+
+                if (chiefComplaintData.chiefComplaint!!.isNotEmpty() &&
+                    chiefComplaintData.duration!!.isNotEmpty()
+                ) {
+                    var cc = ChiefComplaintValues(
+                        id = chiefComplaintData.id,
+                        chiefComplaint = chiefComplaintData.chiefComplaint,
+                        duration = chiefComplaintData.duration,
+                        durationUnit = chiefComplaintData.durationUnit,
+                        description = chiefComplaintData.description.nullIfEmpty()
+                    )
+                    chiefComplaintList.add(cc)
+                }
             }
         }
 
         visitMasterDb.chiefComplaint = chiefComplaintList
-        masterDb.visitMasterDb = visitMasterDb
+        masterDb?.visitMasterDb = visitMasterDb
         bundle.putSerializable("MasterDb", masterDb)
     }
 
+    private fun proceedToSpecializedForm(skipChiefComplaintValidation: Boolean = false, navigateToForm: (Bundle) -> Unit) {
+        if (!skipChiefComplaintValidation && !addChiefComplaintsData()) {
+            isNavigationInProgress = false
+            return
+        }
+
+        if (viewModel.getIsFollowUp()) {
+            setVisitMasterDataForFollow()
+        } else {
+            setVisitMasterData()
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                var benVisitNo = 0
+                viewModel.getLastVisitInfoSync(masterDb!!.patientId.toString()).let {
+                    if (it == null) {
+                        benVisitNo = 1
+                    } else if (it.nurseFlag == 1) {
+                        benVisitNo = it.benVisitNo
+                    } else {
+                        benVisitNo = it.benVisitNo + 1
+                    }
+                }
+
+                val bundle = Bundle().apply {
+                    putString("patientID", benVisitInfo.patient.patientID)
+                    putInt("benVisitNo", benVisitNo)
+                    putSerializable("MasterDb", masterDb)
+                    putSerializable("benVisitInfo", benVisitInfo)
+                    putString("reasonForVisit", binding.reasonForVisitInput.text.toString())
+                }
+
+                navigateToForm(bundle)
+            } catch (e: Exception) {
+                isNavigationInProgress = false
+                Timber.e(e, "Error preparing specialized form navigation")
+            }
+        }
+    }
+
+    private fun saveVisitData(skipChiefComplaintValidation: Boolean = false, onSuccess: (Int) -> Unit) {
+        if (!skipChiefComplaintValidation && !addChiefComplaintsData()) {
+            isNavigationInProgress = false
+//            binding.btnSubmit.isEnabled = true
+            return
+        }
+
+        setVisitMasterData()
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            try {
+                var benVisitNo = 0
+                var createNewBenflow = false
+                viewModel.getLastVisitInfoSync(masterDb!!.patientId.toString()).let {
+                    if (it == null) {
+                        benVisitNo = 1
+                    } else if (it.nurseFlag == 1) {
+                        benVisitNo = it.benVisitNo
+                    } else {
+                        benVisitNo = it.benVisitNo + 1
+                        createNewBenflow = true
+                    }
+                }
+
+                val user = viewModel.loggedInUser
+
+                val visitDB = VisitDB(
+                    visitId = generateUuid(),
+                    category = masterDb?.visitMasterDb?.category.nullIfEmpty(),
+                    reasonForVisit = masterDb?.visitMasterDb?.reason.nullIfEmpty(),
+                    subCategory = masterDb?.visitMasterDb?.subCategory.nullIfEmpty(),
+                    patientID = masterDb!!.patientId.toString(),
+                    benVisitNo = benVisitNo,
+                    benVisitDate = SimpleDateFormat(DATE_FORMAT_PATTERN).format(Date()),
+                    createdBy = user?.userName
+                )
+
+                var chiefComplaints = mutableListOf<ChiefComplaintDB>()
+                for (i in 0 until (masterDb?.visitMasterDb?.chiefComplaint?.size ?: 0)) {
+                    val chiefComplaintItem = masterDb!!.visitMasterDb!!.chiefComplaint!![i]
+                    val chiefC = ChiefComplaintDB(
+                        id = generateUuid(),
+                        chiefComplaintId = chiefComplaintItem.id,
+                        chiefComplaint = chiefComplaintItem.chiefComplaint.nullIfEmpty(),
+                        duration = chiefComplaintItem.duration.nullIfEmpty(),
+                        durationUnit = chiefComplaintItem.durationUnit.nullIfEmpty(),
+                        description = chiefComplaintItem.description.nullIfEmpty(),
+                        patientID = masterDb!!.patientId.toString(),
+                        benVisitNo = benVisitNo,
+                        benFlowID = null
+                    )
+                    chiefComplaints.add(chiefC)
+                }
+
+                val patientVitals = PatientVitalsModel(
+                    vitalsId = generateUuid(),
+                    height = null,
+                    weight = null,
+                    bmi = null,
+                    waistCircumference = null,
+                    temperature = null,
+                    pulseRate = null,
+                    spo2 = null,
+                    bpDiastolic = null,
+                    bpSystolic = null,
+                    respiratoryRate = null,
+                    rbs = null,
+                    patientID = masterDb!!.patientId.toString(),
+                    benVisitNo = benVisitNo,
+                )
+
+                val patientVisitInfoSync = PatientVisitInfoSync(
+                    patientID = masterDb!!.patientId.toString(),
+                    benVisitNo = benVisitNo,
+                    createNewBenFlow = createNewBenflow,
+                    nurseDataSynced = SyncState.UNSYNCED,
+                    doctorDataSynced = SyncState.SYNCED,
+                    nurseFlag = 9,
+                    doctorFlag = 1,
+                    visitDate = Date(),
+                )
+
+                viewModel.saveNurseDataToDb(visitDB, chiefComplaints, patientVitals, patientVisitInfoSync)
+
+                viewModel.isDataSaved.value = null
+                viewModel.isDataSaved.observe(viewLifecycleOwner) {
+                    if (it == true) {
+                        viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
+                        WorkerUtils.triggerAmritSyncWorker(requireContext())
+                        onSuccess(benVisitNo)
+                    } else if (it == false) {
+                        viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
+                        isNavigationInProgress = false
+//                        binding.btnSubmit.isEnabled = true
+                    }
+                }
+            } catch (e: Exception) {
+                isNavigationInProgress = false
+//                binding.btnSubmit.isEnabled = true
+                Timber.e(e, "Error saving visit data")
+                Toast.makeText(requireContext(), "Error saving data", Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
+
     private fun addChiefComplaintsData(): Boolean {
         // get all the ChiefComplaint data from list and convert that to fhir resource
         for (i in 0 until itemList.size) {
@@ -1695,13 +1964,11 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
     }
 
     override fun onCancelAction() {
-       onCancelCall()
+        onCancelCall()
     }
 
-  private fun onCancelCall() {
-      val intent = Intent(context, HomeActivity::class.java)
-      startActivity(intent)
-      requireActivity().finish()
+    private fun onCancelCall() {
+        requireActivity().finish()
     }
     //methods for voice to text conversion and update the input fields
     override fun onEndIconDurationClick(position: Int) {
@@ -1740,10 +2007,7 @@ class FragmentVisitDetail : Fragment(), NavigationAdapter,
         currChiefPos = position
     }
 
-    fun changeBtnView(){
-        binding.btnSubmit.text = resources.getString(R.string.next)
-        binding.btnSubmit.backgroundTintList = resources.getColorStateList(R.color.green)
-    }
+
 }
 
 fun AutoCompleteTextView.showDropdown(adapter: ArrayAdapter<String>?) {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailAdapter.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailAdapter.kt
index cebb6365c..16a03fbe4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailAdapter.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailAdapter.kt
@@ -1,7 +1,5 @@
 package org.piramalswasthya.cho.ui.commons.fhir_visit_details
 
-import android.content.res.ColorStateList
-import android.graphics.Color
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -9,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.AutoCompleteTextView
-import android.widget.Button
 import android.widget.TextView
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.RecyclerView
@@ -19,6 +16,7 @@ import com.google.android.material.textfield.TextInputLayout
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.model.ChiefComplaintMaster
 import org.piramalswasthya.cho.model.ChiefComplaintValues
+import org.piramalswasthya.cho.utils.MasterDataLocalizer
 
 class VisitDetailAdapter(
     private val itemList: MutableList<ChiefComplaintValues>,
@@ -30,8 +28,6 @@ class VisitDetailAdapter(
 ) :
     RecyclerView.Adapter<VisitDetailAdapter.ViewHolder>() {
 
-    private val viewHolders = mutableListOf<ViewHolder>()
-
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val chiefComplaintOptions: AutoCompleteTextView =
             itemView.findViewById(R.id.chiefComplaintDropDowns)
@@ -48,23 +44,139 @@ class VisitDetailAdapter(
 
         val addButton : TextView = itemView.findViewById(R.id.addButton)
         val subtractButton : TextView = itemView.findViewById(R.id.subtractButton)
+
+        var isBinding = false
+
         init {
-            // Set up click listener for the "Cancel" button
             cancelButton.setOnClickListener {
                 val position = adapterPosition
                 if (position != RecyclerView.NO_POSITION) {
                     if (itemCount > 1) deleteItem(position)
-                    updateDeleteButtonVisibility()
                 }
             }
 
-            // Set up click listener for the "Reset" button
             resetButton.setOnClickListener {
                 val position = adapterPosition
                 if (position != RecyclerView.NO_POSITION) {
                     resetFields(position)
                 }
             }
+
+            addButton.setOnClickListener {
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@setOnClickListener
+                val itemData = itemList[position]
+                val durationCount = itemData.duration?.toIntOrNull() ?: 0
+                if (durationCount < 99) {
+                    durationInput.setText((durationCount + 1).toString())
+                    subtractButton.isEnabled = true
+                }
+                itemChangeListener.onItemChanged()
+            }
+
+            subtractButton.setOnClickListener {
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@setOnClickListener
+                val itemData = itemList[position]
+                val durationCount = itemData.duration?.toIntOrNull() ?: 0
+                if (durationCount > 1) {
+                    durationInput.setText((durationCount - 1).toString())
+                }
+                itemChangeListener.onItemChanged()
+            }
+
+            chiefComplaintOptions.setOnItemClickListener { parent, _, selectedPosition, _ ->
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@setOnItemClickListener
+                val chiefComplaint = parent.getItemAtPosition(selectedPosition) as ChiefComplaintMaster
+                val ctx = chiefComplaintOptions.context
+                val localized =
+                    MasterDataLocalizer.localizeChiefComplaint(ctx, chiefComplaint.chiefComplaint)
+                chiefComplaintOptions.setText(localized, false)
+                itemList[position].id = chiefComplaint.chiefComplaintID
+                itemList[position].chiefComplaint = chiefComplaint.chiefComplaint
+                updateResetButtonState()
+                itemChangeListener.onItemChanged()
+            }
+
+            chiefComplaintOptions.addTextChangedListener {
+                if (isBinding) return@addTextChangedListener
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@addTextChangedListener
+                val itemData = itemList[position]
+                val typed = it.toString()
+                val ctx = chiefComplaintOptions.context
+
+                if (chiefComplaintOptionInput.error != null && typed.isNotBlank()) {
+                    chiefComplaintOptionInput.error = null
+                    chiefComplaintOptionInput.isErrorEnabled = false
+                }
+
+                // The user's input may be the localized label, the canonical English,
+                // or free-typed text. Canonicalize first; if it resolves to a known
+                // master value, accept it and store the canonical English.
+                val canonical = MasterDataLocalizer.canonicalizeChiefComplaint(ctx, typed)
+                val matchesMaster = canonical != null &&
+                    chiefComplaints.any { master -> master.chiefComplaint == canonical }
+
+                if (matchesMaster) {
+                    itemData.chiefComplaint = canonical!!
+                    updateResetButtonState()
+                    itemChangeListener.onItemChanged()
+                } else {
+                    itemData.chiefComplaint = ""
+                    itemChangeListener.onItemChanged()
+                }
+            }
+
+            durationInput.addTextChangedListener(object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                override fun afterTextChanged(s: Editable?) {
+                    if (isBinding) return
+                    val position = adapterPosition
+                    if (position == RecyclerView.NO_POSITION) return
+
+                    if (!s.isNullOrBlank() && s.length == 1 && s[0] == '0') s.clear()
+                    if (!s.isNullOrBlank() && s.length > 2) {
+                        s.replace(0, s.length, s.subSequence(0, 2))
+                    }
+
+                    itemList[position].duration = s.toString()
+                    subtractButton.isEnabled = !s.isNullOrBlank() && (s.toString().toIntOrNull() ?: 0) > 1
+                    updateResetButtonState()
+                    itemChangeListener.onItemChanged()
+                }
+            })
+
+            durationUnitDropdown.addTextChangedListener {
+                if (isBinding) return@addTextChangedListener
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@addTextChangedListener
+                val typed = it.toString()
+                val ctx = durationUnitDropdown.context
+                // Convert localized display text back to canonical English for storage;
+                // fall back to the raw input if it does not match a known unit.
+                val canonical = MasterDataLocalizer.canonicalizeDurationUnit(ctx, typed) ?: typed
+                itemList[position].durationUnit = canonical
+                itemChangeListener.onItemChanged()
+            }
+
+            descriptionInput.addTextChangedListener {
+                if (isBinding) return@addTextChangedListener
+                val position = adapterPosition
+                if (position == RecyclerView.NO_POSITION) return@addTextChangedListener
+                itemList[position].description = it.toString()
+                updateResetButtonState()
+                itemChangeListener.onItemChanged()
+            }
+
+            descInputLayout.setEndIconOnClickListener {
+                val position = adapterPosition
+                if (position != RecyclerView.NO_POSITION) {
+                    endIconClickListener.onEndIconDescClick(position)
+                }
+            }
         }
 
         fun updateResetButtonState() {
@@ -75,20 +187,14 @@ class VisitDetailAdapter(
             resetButton.isEnabled = isItemFilled
         }
 
-        fun updateDeleteButtonVisibility() {
-            for (viewHolder in viewHolders) {
-                viewHolder.cancelButton.isEnabled = itemCount > 1
-            }
-        }
-
         private fun deleteItem(position: Int) {
-            if (position in 0 until itemList.size) {
-                itemList.removeAt(position)
-                notifyItemRemoved(position)
-                itemChangeListener.onItemChanged()
-            }
-        }
+            if (itemList.size <= 1) return
+            if (position !in 0 until itemList.size) return
 
+            itemList.removeAt(position)
+            notifyDataSetChanged()
+            itemChangeListener.onItemChanged()
+        }
         private fun resetFields(position: Int) {
             if (position in 0 until itemList.size) {
                 val itemData = itemList[position]
@@ -103,21 +209,43 @@ class VisitDetailAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        var durationCount = 0
+        holder.isBinding = true
         val itemData = itemList[position]
-        // Bind data and set listeners for user interactions
-        holder.chiefComplaintOptions.setText(itemData.chiefComplaint)
+        val ctx = holder.itemView.context
+
+        holder.chiefComplaintOptionInput.error = null
+        holder.chiefComplaintOptionInput.isErrorEnabled = false
+
+        // chiefComplaint is stored in canonical English; show the localized label.
+        holder.chiefComplaintOptions.setText(
+            MasterDataLocalizer.localizeChiefComplaint(ctx, itemData.chiefComplaint),
+            false
+        )
         holder.durationInput.setText(itemData.duration)
-        holder.durationUnitDropdown.setText(unitDropDown[1])
+
+        val canonicalDurationUnit = itemData.durationUnit?.takeIf { it.isNotBlank() }
+            ?: unitDropDown.getOrNull(1)
+            ?: unitDropDown.firstOrNull()
+            ?: ""
+        if (itemData.durationUnit.isNullOrBlank()) {
+            itemData.durationUnit = canonicalDurationUnit
+        }
+        holder.durationUnitDropdown.setText(
+            MasterDataLocalizer.localizeDurationUnit(ctx, canonicalDurationUnit),
+            false
+        )
+
         holder.descriptionInput.setText(itemData.description)
         holder.cancelButton.isEnabled = itemCount > 1
-        holder.resetButton.isEnabled = false
+        holder.subtractButton.isEnabled = (itemData.duration?.toIntOrNull() ?: 0) > 1
 
-        // Set up dropdown adapter and populate dropdown values
+        // Render the duration-unit dropdown with localized labels; the TextWatcher
+        // canonicalizes the displayed text back to English before persisting.
+        val localizedUnits = unitDropDown.map { MasterDataLocalizer.localizeDurationUnit(ctx, it) }
         val unitDropdownAdapter =
-            ArrayAdapter(holder.itemView.context, R.layout.drop_down, unitDropDown)
+            ArrayAdapter(ctx, R.layout.drop_down, localizedUnits)
         val chiefComplaintAdapter = ChiefComplaintAdapter(
-            holder.itemView.context,
+            ctx,
             R.layout.drop_down,
             chiefComplaints,
             holder.chiefComplaintOptions,
@@ -125,136 +253,44 @@ class VisitDetailAdapter(
         )
         holder.chiefComplaintOptions.setAdapter(chiefComplaintAdapter)
         holder.durationUnitDropdown.setAdapter(unitDropdownAdapter)
-        holder.subtractButton.isEnabled = !itemData.duration.isNullOrEmpty()
-        holder.addButton.setOnClickListener {
-            if(itemData.duration.isNullOrEmpty()){
-                durationCount = 0
-            }else if(itemData.duration!!.toInt() <= 99) {
-                durationCount = itemData.duration!!.toInt()
-            }
-            if(durationCount<99){
-                durationCount++
-                holder.durationInput.setText(durationCount.toString())
-                holder.updateResetButtonState()
-                itemChangeListener.onItemChanged()
-            }
-
-            // Enable the "Subtract" button
-            holder.subtractButton.isEnabled = true
-
-        }
-        holder.subtractButton.setOnClickListener {
-            durationCount = if(itemData.duration.isNullOrEmpty()){
-                0
-            }else {
-                itemData.duration!!.toInt()
-            }
-            if (durationCount > 1) {
-                durationCount--
-                holder.durationInput.setText(durationCount.toString())
-                holder.updateResetButtonState()
-                itemChangeListener.onItemChanged()
-            }
-        }
-
-
-        holder.chiefComplaintOptions.setOnItemClickListener { parent, _, position, _ ->
-            var chiefComplaint = parent.getItemAtPosition(position) as ChiefComplaintMaster
-            holder.chiefComplaintOptions.setText(chiefComplaint?.chiefComplaint, false)
-            itemData.id = chiefComplaint.chiefComplaintID
-        }
-
-        // Set listeners to update data when user interacts
-        holder.chiefComplaintOptions.addTextChangedListener {
-                if(chiefComplaints.map{it.chiefComplaint}.contains(it.toString())){
-                    itemData.chiefComplaint = it.toString()
-                    holder.updateResetButtonState()
-                    itemChangeListener.onItemChanged()
-                    holder.chiefComplaintOptionInput.apply {
-                 //       boxStrokeColor = resources.getColor(R.color.purple)
-                        hintTextColor = defaultHintTextColor
-                    }
-                }else{
-                    itemData.chiefComplaint = ""
-                    holder.chiefComplaintOptionInput.apply {
-                        requestFocus()
-                        boxStrokeColor = Color.RED
-                        hintTextColor = ColorStateList.valueOf(Color.RED)
-                    }
-                }
-        }
-        holder.durationInput.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(s: Editable?) {
-                if (!s.isNullOrBlank() && s.length == 1 && s[0] == '0') s.clear()
-
-                if (!s.isNullOrBlank()) {
-                    // Limit the input to 2 digits
-                    if (s.length > 2) {
-                        // If the input is longer than 2 digits, truncate it
-                        s.replace(0, s.length, s.subSequence(0, 2))
-                    }
-                }
-
-                itemData.duration = s.toString()
-
-               /* if (s.isNullOrEmpty()) {
-                    holder.subtractButton.isEnabled = false
-                    holder.durationInputLayout.apply {
-                        requestFocus()
-                        boxStrokeColor = Color.RED
-                        hintTextColor = ColorStateList.valueOf(Color.RED)
-                    }
-                } else {
-                    holder.subtractButton.isEnabled = true
-                    holder.durationInputLayout.apply {
-                        boxStrokeColor = resources.getColor(R.color.purple)
-                        hintTextColor = defaultHintTextColor
-                    }
-                }*/
-
-                holder.updateResetButtonState()
-                itemChangeListener.onItemChanged()
-            }
-        })
-        holder.durationUnitDropdown.addTextChangedListener {
-            itemData.durationUnit = it.toString()
-            itemChangeListener.onItemChanged()
-        }
-        holder.descriptionInput.addTextChangedListener {
-            itemData.description = it.toString()
-            holder.updateResetButtonState()
-            itemChangeListener.onItemChanged()
-        }
-
-        // Update the visibility of the "Cancel" button for all items
-        holder.updateDeleteButtonVisibility()
-
-        // Update the visibility of the "Reset" button for all items
+        holder.isBinding = false
         holder.updateResetButtonState()
-
-        // Voice to text converter click listeners
-
-        holder.descInputLayout.setEndIconOnClickListener {
-            endIconClickListener.onEndIconDescClick(position)
-        }
-//        holder.chiefComplaintOptionInput.setEndIconOnClickListener {
-//            endIconClickListener.onEndIconChiefClick(position)
-//        }
     }
 
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context)
             .inflate(R.layout.extra_chief_complaint_layout, parent, false)
-        val viewHolder = ViewHolder(view)
-        viewHolders.add(viewHolder)
-        return viewHolder
+        return ViewHolder(view)
     }
 
     override fun getItemCount(): Int = itemList.size
 
+    fun highlightEmptyChiefComplaints(rv: RecyclerView, message: String): Int {
+        var firstEmpty = -1
+        for (i in itemList.indices) {
+            if (itemList[i].chiefComplaint.isNullOrEmpty()) {
+                if (firstEmpty == -1) firstEmpty = i
+                val vh = rv.findViewHolderForAdapterPosition(i) as? ViewHolder
+                if (vh != null) {
+                    vh.chiefComplaintOptionInput.isErrorEnabled = true
+                    vh.chiefComplaintOptionInput.error = message
+                } else {
+                    val target = i
+                    rv.scrollToPosition(target)
+                    rv.post {
+                        val late = rv.findViewHolderForAdapterPosition(target) as? ViewHolder
+                        late?.chiefComplaintOptionInput?.let {
+                            it.isErrorEnabled = true
+                            it.error = message
+                        }
+                    }
+                }
+            }
+        }
+        return firstEmpty
+    }
+
 }
 
 interface RecyclerViewItemChangeListener {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailViewModel.kt
index 9b9624a48..0f864f4a3 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/fhir_visit_details/VisitDetailViewModel.kt
@@ -10,7 +10,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.Dispatchers
+import org.piramalswasthya.cho.ui.commons.DropdownConst
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.model.CbacCache
 import org.piramalswasthya.cho.model.ChiefComplaintDB
@@ -27,6 +31,7 @@ import org.piramalswasthya.cho.model.SubVisitCategory
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.repositories.CbacRepo
+import org.piramalswasthya.cho.repositories.CphcDetailsRepository
 import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
 import org.piramalswasthya.cho.repositories.EcrRepo
 import org.piramalswasthya.cho.repositories.MaleMasterDataRepository
@@ -38,6 +43,7 @@ import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.repositories.VisitReasonsAndCategoriesRepo
 import org.piramalswasthya.cho.repositories.VitalsRepo
 import timber.log.Timber
+import java.util.Calendar
 import java.util.Date
 import javax.inject.Inject
 
@@ -55,6 +61,7 @@ class VisitDetailViewModel @Inject constructor(
     private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
     private val ecrRepo: EcrRepo,
     private val cbacRepo: CbacRepo,
+    private val cphcDetailsRepo: CphcDetailsRepository,
 
     @ApplicationContext private val application: Context
 ) : ViewModel() {
@@ -120,6 +127,8 @@ class VisitDetailViewModel @Inject constructor(
 
     var allActiveAncRecords = MutableLiveData<List<PregnantWomanAncCache>?>()
 
+    var completedAncRecords = MutableLiveData<List<PregnantWomanAncCache>?>()
+
     var activePwrRecord : PregnantWomanRegistrationCache? = null
 
     var lastPncVisitNumber = MutableLiveData<Int?>(null)
@@ -132,6 +141,8 @@ class VisitDetailViewModel @Inject constructor(
 
     var lastAnc: PregnantWomanAncCache? = null
 
+    var lastCompletedAnc: PregnantWomanAncCache? = null
+
     var lastEct = MutableLiveData<EligibleCoupleTrackingCache?>()
 
     init {
@@ -145,6 +156,7 @@ class VisitDetailViewModel @Inject constructor(
         viewModelScope.launch {
             lastAncVisitNumber.value = getLastAncVisitNumber(patientID)
             allActiveAncRecords.value = getAllActiveAncRecords(patientID)
+            completedAncRecords.value = getCompletedActiveAncRecords(patientID)
             activePwrRecord = getSavedActiveRecordObserve(patientID)
 
             lastPncVisitNumber.value = getLastPncVisitNumber(patientID)
@@ -153,6 +165,7 @@ class VisitDetailViewModel @Inject constructor(
 
             allEctRecords.value = getAllECT(patientID)
             lastAnc = getLastAnc(patientID)
+            lastCompletedAnc = getLastCompletedAnc(patientID)
             lastEct.value = getLastEct(patientID)
 
 
@@ -176,10 +189,12 @@ class VisitDetailViewModel @Inject constructor(
                           patientVitals: PatientVitalsModel, patientVisitInfoSync: PatientVisitInfoSync){
         viewModelScope.launch {
             try {
-                saveVisitDbToCatche(visitDB)
-                chiefComplaints.forEach {
-                    saveChiefComplaintDbToCatche(it)
-                }
+                cphcDetailsRepo.replaceVisitAndChiefComplaints(
+                    visitDB = visitDB,
+                    chiefComplaints = chiefComplaints,
+                    patientID = visitDB.patientID,
+                    benVisitNo = visitDB.benVisitNo ?: patientVisitInfoSync.benVisitNo,
+                )
                 savePatientVitalInfoToCache(patientVitals)
                 savePatientVisitInfoSync(patientVisitInfoSync)
                 _isDataSaved.value = true
@@ -205,19 +220,37 @@ class VisitDetailViewModel @Inject constructor(
         return maternalHealthRepo.getSavedRegistrationRecord(benId)
     }
 
-    fun savePregnantWomanRegistration(benId: String, lmpDate: Date) {
+    fun savePregnantWomanRegistration(benId: String, lmpDate: Date, isHighRisk: Boolean = false) {
         viewModelScope.launch {
-            val user = userRepo.getLoggedInUser()!!
+            val user = userRepo.getLoggedInUser() ?: return@launch
+            val lmpStartOfDayMillis = Calendar.getInstance().apply {
+                timeInMillis = lmpDate.time
+                set(Calendar.HOUR_OF_DAY, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }.timeInMillis
             val pwr = PregnantWomanRegistrationCache(
                 patientID = benId,
-                lmpDate = lmpDate.time,
+                lmpDate = lmpStartOfDayMillis,
+                isHrp = isHighRisk,
                 createdBy = user.userName,
                 syncState = SyncState.UNSYNCED,
                 updatedBy = user.userName
             )
-            maternalHealthRepo.persistRegisterRecord(pwr)
-            activePwrRecord = pwr
-            _isLMPDateSaved.value = true
+            val ashaId = user.userId
+            val registrationId = maternalHealthRepo.registerPregnancyWithAncAndAshaDueList(
+                pwr = pwr,
+                benId = benId,
+                ashaId = ashaId
+            )
+            if (registrationId > 0) {
+                activePwrRecord = pwr.copy(id = registrationId)
+                _isLMPDateSaved.value = true
+                refreshAncData(benId)
+            } else {
+                _isLMPDateSaved.value = false
+            }
         }
     }
 
@@ -233,6 +266,19 @@ class VisitDetailViewModel @Inject constructor(
         return maternalHealthRepo.getLastAnc(benId)
     }
 
+    suspend fun isPatientDelivered(patientID: String): Boolean {
+        val lastAnc = getLastAnc(patientID)
+        return lastAnc?.pregnantWomanDelivered == true
+    }
+
+    suspend fun getLastCompletedAnc(benId: String): PregnantWomanAncCache? {
+        return maternalHealthRepo.getLastCompletedAnc(benId)
+    }
+
+    suspend fun getCompletedActiveAncRecords(benId: String): List<PregnantWomanAncCache> {
+        return maternalHealthRepo.getCompletedActiveAncRecords(benId)
+    }
+
     suspend fun getLastEct(benId: String): EligibleCoupleTrackingCache? {
         return ecrRepo.getLatestEctByBenId(benId)
     }
@@ -257,6 +303,17 @@ class VisitDetailViewModel @Inject constructor(
         return maternalHealthRepo.getAllActiveAncRecords(benId)
     }
 
+
+    fun refreshAncData(patientID: String) {
+        viewModelScope.launch {
+            allActiveAncRecords.value = getAllActiveAncRecords(patientID)
+            completedAncRecords.value = getCompletedActiveAncRecords(patientID)
+            lastAnc = getLastAnc(patientID)
+            lastCompletedAnc = getLastCompletedAnc(patientID)
+            lastAncVisitNumber.value = getLastAncVisitNumber(patientID)
+        }
+    }
+
     suspend fun getAllPNCsByPatId(benId: String): List<PNCVisitCache> {
         return pncRepo.getAllPNCsByPatId(benId)
     }
@@ -326,7 +383,41 @@ class VisitDetailViewModel @Inject constructor(
 
     private fun getChiefMasterComplaintList() {
         try {
-            _chiefComplaintMaster = maleMasterDataRepository.getChiefMasterComplaint()
+            _chiefComplaintMaster = maleMasterDataRepository.getChiefMasterComplaint().map { list ->
+                val canonicalEyeComplaints = listOf(
+                    DropdownConst.CONDITION_CATARACT,
+                    DropdownConst.CONDITION_GLAUCOMA,
+                    DropdownConst.CONDITION_DIABETIC_RETINOPATHY,
+                    DropdownConst.CONDITION_PRESBYOPIA,
+                    DropdownConst.CONDITION_TRACHOMA,
+                    DropdownConst.CONDITION_CORNEAL_DISEASE,
+                    DropdownConst.CONDITION_CONJUNCTIVITIS,
+                    DropdownConst.CONDITION_DRY_EYE,
+                    DropdownConst.CONDITION_EYE_ALLERGY,
+                    DropdownConst.CONDITION_EYE_INJURY_BLUNT_PENETRATING,
+                    DropdownConst.CONDITION_CHEMICAL_EXPOSURE,
+                    DropdownConst.CONDITION_FOREIGN_BODY_EYE
+                )
+                val canonicalOralComplaints = DropdownConst.oralChiefComplaints.toList()
+                val canonicalEntComplaints = DropdownConst.entChiefComplaints.toList()
+
+                fun normalize(v: String) = v.lowercase().replace("[^a-z0-9]".toRegex(), "")
+                val existingNormalized = list.map { normalize(it.chiefComplaint) }.toSet()
+
+                val missingEye = canonicalEyeComplaints
+                    .filter { normalize(it) !in existingNormalized }
+                    .mapIndexed { index, complaint -> ChiefComplaintMaster(-(100 + index), complaint) }
+
+                val missingOral = canonicalOralComplaints
+                    .filter { normalize(it) !in existingNormalized }
+                    .mapIndexed { index, complaint -> ChiefComplaintMaster(-(200 + index), complaint) }
+
+                val missingEnt = canonicalEntComplaints
+                    .filter { normalize(it) !in existingNormalized }
+                    .mapIndexed { index, complaint -> ChiefComplaintMaster(-(300 + index), complaint) }
+
+                list + missingEye + missingOral + missingEnt
+            }
         } catch (e: Exception) {
             Timber.d("error in getChiefMasterComplaintList() $e")
         }
@@ -366,4 +457,4 @@ class VisitDetailViewModel @Inject constructor(
         fileName = file
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/govt_id/GovtIdViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/govt_id/GovtIdViewModel.kt
index 9e385eea3..b8eaf84d6 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/govt_id/GovtIdViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/govt_id/GovtIdViewModel.kt
@@ -9,8 +9,6 @@ import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
-import com.google.firebase.ml.vision.FirebaseVision
-import com.google.firebase.ml.vision.face.FirebaseVisionFaceDetectorOptions
 import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/immunization_due/child_immunization/form/ImmunizationFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/immunization_due/child_immunization/form/ImmunizationFormFragment.kt
index 5b8d49d49..f8e27f972 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/immunization_due/child_immunization/form/ImmunizationFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/immunization_due/child_immunization/form/ImmunizationFormFragment.kt
@@ -1,6 +1,6 @@
 package org.piramalswasthya.cho.ui.commons.immunization_due.child_immunization.form
 
-import android.content.Intent
+
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -29,7 +29,7 @@ import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.OtherCPHCServicesViewModel
 import org.piramalswasthya.cho.ui.commons.immunization_due.child_immunization.form.ImmunizationFormViewModel.State
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.utils.generateUuid
 import timber.log.Timber
 import java.text.SimpleDateFormat
@@ -166,9 +166,7 @@ class ImmunizationFormFragment : Fragment(), NavigationAdapter{
             CPHCviewModel.isDataSaved.observe(viewLifecycleOwner){
                 when(it!!){
                     true ->{
-                        WorkerUtils.triggerAmritSyncWorker(requireContext())
-                        val intent = Intent(context, HomeActivity::class.java)
-                        startActivity(intent)
+                        WorkerUtils.enqueueUpsync(requireContext(), WorkerUtils.UpsyncScope.IMMUNIZATION)
                         requireActivity().finish()
                     }
                     else ->{
@@ -254,4 +252,4 @@ class ImmunizationFormFragment : Fragment(), NavigationAdapter{
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormFragment.kt
index 5e209d789..128128d98 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormFragment.kt
@@ -1,7 +1,7 @@
 package org.piramalswasthya.cho.ui.commons.lab_technician
 
 
-import android.content.Intent
+
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,6 +18,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
@@ -36,13 +37,15 @@ import kotlinx.coroutines.launch
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.databinding.FragmentLabTechnicianFormBinding
+import org.piramalswasthya.cho.model.BenFlow
 import org.piramalswasthya.cho.model.ComponentDetailDTO
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.model.ProcedureDTO
 import org.piramalswasthya.cho.model.UserCache
+import org.piramalswasthya.cho.utils.DateTimeUtil
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsViewModel
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -76,6 +79,7 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
 
     private lateinit var benVisitInfo: PatientDisplayWithVisitInfo
     private lateinit var patientId: String
+    private var visitDateText = mutableStateOf("N/A")
 
 
     private val args: LabTechnicianFormFragmentArgs by lazy {
@@ -115,6 +119,26 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
             requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
         patientId = benVisitInfo.patient.patientID
 
+        benVisitInfo.patient.beneficiaryID?.let { beneficiaryID ->
+            viewModel.getVisitReasonByBenFlowID(beneficiaryID)
+        }
+        
+        visitDateText.value = benVisitInfo.visitDate?.let { DateTimeUtil.formatDate(it) } ?: "N/A"
+        
+        viewModel.benFlows.observe(viewLifecycleOwner) { benFlowList ->
+            if (benFlowList.isNullOrEmpty()) return@observe
+            
+            val benFlow = benVisitInfo.benVisitNo?.let { visitNo ->
+                benFlowList.find { it.benVisitNo == visitNo }
+            }
+            
+            visitDateText.value = if (!benFlow?.visitDate.isNullOrBlank()) {
+                DateTimeUtil.formatedDate(benFlow?.visitDate)
+            } else {
+                benVisitInfo.visitDate?.let { DateTimeUtil.formatDate(it) } ?: "N/A"
+            }
+        }
+
         viewModel.getLoggedInUserDetails()
         viewModel.boolCall.observe(viewLifecycleOwner) {
             if (it) {
@@ -123,7 +147,7 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
             }
         }
         composeView.setContent {
-            AddLoading()
+            AddLoading(message = "Loading...")
         }
 
         lifecycleScope.launch {
@@ -141,7 +165,7 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
             } else {
                 dtos = viewModel.procedures.value
                 composeView.setContent {
-                    AddProcedures(dtos)
+                    AddProcedures(dtos, benVisitInfo)
                 }
                 parentViewModel.setSubmitActive(true)
             }
@@ -155,8 +179,19 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
     }
 
     @Composable
-    fun AddLoading() {
-        LinearProgressIndicator()
+    private fun AddLoading(
+        message: String = "Submitting..."
+    ) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                CircularProgressIndicator()
+                Spacer(modifier = Modifier.height(12.dp))
+                Text(text = message, style = MaterialTheme.typography.bodyMedium)
+            }
+        }
     }
 
     @Composable
@@ -174,8 +209,43 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
     }
 
     @Composable
-    fun AddProcedures(dtos: List<ProcedureDTO>?) {
+    fun AddProcedures(dtos: List<ProcedureDTO>?, benVisitInfo: PatientDisplayWithVisitInfo) {
+        
         Column {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(Color.LightGray)
+                    .padding(16.dp)
+            ) {
+                Row(
+                    modifier = Modifier
+                        .weight(1f)
+                ) {
+                    Text(
+                        text = getString(R.string.ben_visit_num),
+                        style = TextStyle(fontSize = 16.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Bold)
+                    )
+                    Text(
+                        text = benVisitInfo.benVisitNo?.toString() ?: "",
+                        style = TextStyle(fontSize = 16.sp)
+                    )
+                }
+                Row(
+                    modifier = Modifier
+                        .weight(2f)
+                ) {
+                    Text(
+                        text = getString(R.string.ben_visit_date),
+                        style = TextStyle(fontSize = 16.sp, fontWeight = androidx.compose.ui.text.font.FontWeight.Bold)
+                    )
+                    Text(
+                        text = visitDateText.value,
+                        style = TextStyle(fontSize = 16.sp)
+                    )
+                }
+            }
+            
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -578,13 +648,13 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
                 .fillMaxWidth()
         ) {
             val value = dto.testResultValue
-            val rangeMin = dto.range_min
-            val rangeMax = dto.range_max
+            val rangeMin = dto.range_normal_min
+            val rangeMax = dto.range_normal_max
             if (!value.isNullOrEmpty() && rangeMax != null && rangeMin != null) {
                 val valueDouble = value.toDouble()
                 if (valueDouble > rangeMax || valueDouble < rangeMin) {
                     Text(
-                        text = "Range " + dto.range_min + " to " + dto.range_max,
+                        text = "Range " + dto.range_normal_min + " to " + dto.range_normal_max,
                         color = Color.Red,
                         modifier = Modifier
                             .padding(horizontal = 16.dp)
@@ -592,7 +662,7 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
                     )
                 } else {
                     Text(
-                        text = "Range " + dto.range_min + " to " + dto.range_max,
+                        text = "Range " + dto.range_normal_min + " to " + dto.range_normal_max,
                         modifier = Modifier
                             .padding(horizontal = 16.dp)
                             .fillMaxWidth(0.6f),
@@ -600,7 +670,7 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
                 }
             } else {
                 Text(
-                    text = "Range " + dto.range_min + " to " + dto.range_max,
+                    text = "Range " + dto.range_normal_min + " to " + dto.range_normal_max,
                     modifier = Modifier
                         .padding(horizontal = 16.dp)
                         .fillMaxWidth(0.6f),
@@ -618,18 +688,19 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
         dtos?.forEach { procedureDTO ->
             procedureDTO.compListDetails.forEach { componentDetailDTO ->
                 if (!componentDetailDTO.testResultValue.isNullOrEmpty() &&
-                    componentDetailDTO.range_max != null &&
-                    componentDetailDTO.range_min != null
+                    componentDetailDTO.range_normal_max != null &&
+                    componentDetailDTO.range_normal_min != null
                 ) {
                     isValidData =
-                        isValidData && (componentDetailDTO.testResultValue!!.toDouble() >= componentDetailDTO.range_min)
-                                && (componentDetailDTO.testResultValue!!.toDouble() <= componentDetailDTO.range_max)
+                        isValidData && (componentDetailDTO.testResultValue!!.toDouble() >= componentDetailDTO.range_normal_min)
+                                && (componentDetailDTO.testResultValue!!.toDouble() <= componentDetailDTO.range_normal_max)
                 }
             }
         }
         if (isValidData) {
+            parentViewModel.setBottomActionsVisible(false)
             composeView.setContent {
-                AddLoading()
+                AddLoading(message = "Submitting...")
             }
             viewModel.saveLabData(dtos, benVisitInfo)
             viewModel.isDataSaved.observe(viewLifecycleOwner) { state ->
@@ -641,20 +712,16 @@ class LabTechnicianFormFragment : Fragment(R.layout.fragment_lab_technician_form
                 }
             }
         } else {
-            Toast.makeText(requireContext(), "in valid data entered", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), getString(R.string.invalid_data_entered), Toast.LENGTH_SHORT).show()
         }
     }
 
     override fun onCancelAction() {
-        val intent = Intent(context, HomeActivity::class.java)
-        startActivity(intent)
         requireActivity().finish()
     }
 
     fun navigateNext() {
-        val intent = Intent(context, HomeActivity::class.java)
-        startActivity(intent)
         requireActivity().finish()
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormViewModel.kt
index a302869b0..87e2febbc 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/lab_technician/LabTechnicianFormViewModel.kt
@@ -17,6 +17,7 @@ import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.model.ProcedureDTO
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.repositories.BenFlowRepo
+import org.piramalswasthya.cho.repositories.CaseRecordeRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
 import org.piramalswasthya.cho.repositories.ProcedureRepo
@@ -33,7 +34,8 @@ class LabTechnicianFormViewModel @Inject constructor(
     private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo,
     private val benFlowRepo: BenFlowRepo,
     private val patientRepo: PatientRepo,
-    private val procedureRepo: ProcedureRepo
+    private val procedureRepo: ProcedureRepo,
+    private val caseRecordeRepo: CaseRecordeRepo
 ) : ViewModel() {
 
     private var _loggedInUser: UserCache? = null
@@ -53,10 +55,13 @@ class LabTechnicianFormViewModel @Inject constructor(
     val boolCall: LiveData<Boolean>
         get() = _boolCall
 
-    private var _procedures = MutableLiveData<List<ProcedureDTO>>(null)
+    private var _procedures = MutableLiveData<List<ProcedureDTO>>()
     val procedures: LiveData<List<ProcedureDTO>>
         get() = _procedures
 
+    private val _benFlows = MutableLiveData<List<org.piramalswasthya.cho.model.BenFlow>?>()
+    val benFlows: LiveData<List<org.piramalswasthya.cho.model.BenFlow>?> = _benFlows
+
     @SuppressLint("StaticFieldLeak")
     val context: Context = application.applicationContext
 
@@ -64,24 +69,65 @@ class LabTechnicianFormViewModel @Inject constructor(
 
     val isEntitySaved = MutableLiveData<Boolean>()
 
-    suspend fun downloadProcedure(benVisitInfo : PatientDisplayWithVisitInfo) {
-        withContext(Dispatchers.IO) {
-            benFlowRepo.pullLabProcedureData(benVisitInfo)
-        }
-
-        // TODO:get list of procedures and ben visit info here using nearby api
-//        val procedureID = 1L
-//        addProcedure(procedureID, benVisitInfo);
-
+    /**
+     * Returns the set of procedure IDs (master IDs) that the doctor selected for this visit.
+     * Uses newTestIds (current selection) or previousTestIds (synced from server).
+     */
+    private suspend fun getDoctorSelectedTestIds(patientID: String, benVisitNo: Int): Set<Long> {
+        val investigation = caseRecordeRepo.getInvestigationCaseRecordByPatientIDAndBenVisitNo(
+            patientID,
+            benVisitNo
+        )?.investigationCaseRecord ?: return emptySet()
+        val idsStr = investigation.newTestIds?.takeIf { it.isNotBlank() }
+            ?: investigation.previousTestIds?.takeIf { it.isNotBlank() } ?: return emptySet()
+        return idsStr.split(",").mapNotNull { it.trim().toLongOrNull() }.toSet()
     }
-    private suspend fun addProcedure(procedureID: Long, benVisitInfo: PatientDisplayWithVisitInfo) {
+
+    /**
+     * Ensures lab procedures are in DB for this visit so form can render from local data (no API).
+     * First ensures procedure_master has seed data (in case migration didn't run on fresh install).
+     * If doctor already saved investigation with newTestIds, procedures were copied when saving.
+     * If procedures are missing, copy from ProcedureMaster using newTestIds or previousTestIds (synced data).
+     * Then shows only the test forms that the doctor selected (filters by newTestIds/previousTestIds).
+     */
+    suspend fun downloadProcedure(benVisitInfo: PatientDisplayWithVisitInfo) {
         withContext(Dispatchers.IO) {
-            procedureRepo.addProcedure(procedureID, benVisitInfo);
+            procedureRepo.ensureLabProcedureMasterSeed()
+            var procedures = patientRepo.getProcedures(benVisitInfo)
+            if (procedures.isNullOrEmpty()) {
+                val investigation = caseRecordeRepo.getInvestigationCaseRecordByPatientIDAndBenVisitNo(
+                    benVisitInfo.patient.patientID,
+                    benVisitInfo.benVisitNo!!
+                )?.investigationCaseRecord
+                // Use newTestIds (doctor-selected) or previousTestIds (synced from server)
+                val idsToCopy = investigation?.newTestIds?.takeIf { it.isNotBlank() }
+                    ?: investigation?.previousTestIds?.takeIf { it.isNotBlank() }
+                idsToCopy?.let {
+                    procedureRepo.copyProceduresFromMasterForVisit(
+                        benVisitInfo.patient.patientID,
+                        benVisitInfo.benVisitNo!!,
+                        it
+                    )
+                    procedures = patientRepo.getProcedures(benVisitInfo)
+                }
+            }
+            val selectedIds = getDoctorSelectedTestIds(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
+            val filtered = if (selectedIds.isEmpty()) procedures
+            else procedures?.filter { it.procedureID in selectedIds } ?: emptyList()
+            _procedures.postValue(filtered)
         }
     }
-    suspend fun getPrescribedProcedures(benVisitInfo : PatientDisplayWithVisitInfo) {
+
+    /**
+     * Fetches procedures for this visit and shows only the test forms that the doctor selected.
+     */
+    suspend fun getPrescribedProcedures(benVisitInfo: PatientDisplayWithVisitInfo) {
         withContext(Dispatchers.IO) {
-            _procedures.postValue(patientRepo.getProcedures(benVisitInfo))
+            val procedures = patientRepo.getProcedures(benVisitInfo)
+            val selectedIds = getDoctorSelectedTestIds(benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo!!)
+            val filtered = if (selectedIds.isEmpty()) procedures
+            else procedures?.filter { it.procedureID in selectedIds } ?: emptyList()
+            _procedures.postValue(filtered)
             Timber.d("fetched procedures")
         }
     }
@@ -109,6 +155,17 @@ class LabTechnicianFormViewModel @Inject constructor(
         _boolCall.value = false
     }
 
+    fun getVisitReasonByBenFlowID(beneficiaryID: Long) {
+        viewModelScope.launch {
+            try {
+                val benFlowList = benFlowRepo.getBenFlowByBenFlowID(beneficiaryID)
+                _benFlows.value = benFlowList
+            } catch (e: Exception) {
+                _benFlows.value = emptyList()
+            }
+        }
+    }
+
     fun saveLabData(dtos: List<ProcedureDTO>?, benVisitInfo: PatientDisplayWithVisitInfo) {
         try {
 
@@ -128,6 +185,13 @@ class LabTechnicianFormViewModel @Inject constructor(
 
                 }
 
+                withContext(Dispatchers.IO) {
+                    procedureRepo.syncLabResultsToDownsyncTable(
+                        benVisitInfo.patient.patientID,
+                        benVisitInfo.benVisitNo!!
+                    )
+                }
+
                 // update sync state for lab data
                 val patientVisitInfoSync = patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
                     benVisitInfo.patient.patientID,
@@ -135,6 +199,8 @@ class LabTechnicianFormViewModel @Inject constructor(
                 )!!
                 patientVisitInfoSync.labDataSynced = SyncState.UNSYNCED
                 patientVisitInfoSync.doctorFlag = 3
+                // Lab result is locally completed; closure logic relies on labtechFlag=9.
+                patientVisitInfoSync.labtechFlag = 9
 
                 patientVisitInfoSyncRepo.insertPatientVisitInfoSync(patientVisitInfoSync)
                 WorkerUtils.labPushWorker(context)
@@ -153,4 +219,4 @@ class LabTechnicianFormViewModel @Inject constructor(
             Timber.d("error saving lab records due to $e")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormFragment.kt
new file mode 100644
index 000000000..d6a6d8f18
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormFragment.kt
@@ -0,0 +1,196 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ANC_VISITS_KEY
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentNewFormBinding
+import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity
+import org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form.DeliveryOutcomeFormViewModel.Alert
+import org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form.DeliveryOutcomeFormViewModel.State
+import org.piramalswasthya.cho.work.WorkerUtils
+import timber.log.Timber
+
+@AndroidEntryPoint
+class DeliveryOutcomeFormFragment : Fragment() {
+
+    private var _binding: FragmentNewFormBinding? = null
+    private val binding get() = _binding!!
+
+    private val viewModel: DeliveryOutcomeFormViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNewFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.fabEdit.visibility = View.GONE
+        binding.btnSubmit.visibility = View.VISIBLE
+        
+        // Show form title for Delivery Outcome
+        binding.tvFormTitle.visibility = View.VISIBLE
+        binding.tvFormTitle.text = getString(R.string.delivery_outcome)
+
+        var adapter: FormInputAdapter? = null
+        viewModel.recordExists.observe(viewLifecycleOwner) { recordExists ->
+            if (recordExists == true) {
+                // Record already filled → show "Back" button, navigate back
+                binding.btnSubmit.text = getString(R.string.back)
+                binding.btnSubmit.setOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            } else {
+                // No record yet → show "Register" button, validate & save on click
+                binding.btnSubmit.text = getString(R.string.register)
+                binding.btnSubmit.setOnClickListener { onNextClicked() }
+            }
+
+            val isFirstCreation = adapter == null
+            val formInputAdapter = FormInputAdapter(
+                formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                    viewModel.updateListOnValueChanged(formId, index)
+                },
+                isEnabled = !(recordExists == true)
+            )
+            adapter = formInputAdapter
+            binding.form.rvInputForm.adapter = formInputAdapter
+            formInputAdapter.submitList(viewModel.formList.value)
+
+            if (isFirstCreation) {
+                viewLifecycleOwner.lifecycleScope.launch {
+                    viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                        viewModel.formList.collect { list ->
+                            if (list.isNotEmpty()) adapter?.submitList(list)
+                        }
+                    }
+                }
+            }
+        }
+
+        // Observe patient details
+        viewModel.benName.observe(viewLifecycleOwner) { binding.tvBenName.text = it }
+        viewModel.benAgeGender.observe(viewLifecycleOwner) { binding.tvAgeGender.text = it }
+        
+        // Observe and display Case ID
+        viewModel.caseId.observe(viewLifecycleOwner) { caseId ->
+            caseId?.let {
+                binding.llCaseIdRow.visibility = View.VISIBLE
+                binding.tvCaseId.text = it
+            }
+        }
+        
+        // View ANC History link - show and set click listener
+        binding.tvViewAncHistory.visibility = View.VISIBLE
+        binding.tvViewAncHistory.setOnClickListener {
+            val intent = SubModuleActivity.getDirectFragmentIntent(requireContext(), SHOW_ANC_VISITS_KEY)
+            startActivity(intent)
+        }
+
+        // Observe mother condition specific alerts (PPH, Hysterectomy, Maternal Death)
+        observeMotherConditionAlerts()
+        
+        // Observe general alerts (date, place, gestational age, unskilled delivery, etc.)
+        observeGeneralAlerts()
+
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                State.IDLE -> { }
+                State.SAVING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                }
+                State.SAVE_SUCCESS_NAVIGATE_VITALS -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    WorkerUtils.triggerDeliveryOutcomeSync(requireContext())
+                    WorkerUtils.triggerInfantRegistrationSync(requireContext())
+                    WorkerUtils.triggerBeneficiarySync(requireContext())
+                    viewModel.resetState()
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+                State.SAVE_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(requireContext(), getString(R.string.something_went_wrong), Toast.LENGTH_SHORT).show()
+                    viewModel.resetState()
+                }
+                else -> { }
+            }
+        }
+    }
+
+    // ─── Helper: observe mother condition alerts (PPH, Hysterectomy, Death) ──
+    private fun observeMotherConditionAlerts() {
+        viewModel.alert.observe(viewLifecycleOwner) { alert ->
+            alert?.let {
+                viewModel.clearAlert()
+                MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_App_MaterialAlertDialog)
+                    .setTitle(getString(R.string.alert_popup))
+                    .setMessage(
+                        when (it) {
+                            is Alert.InformDistrictNodalOfficer -> it.message
+                            is Alert.IntensivePncMonitoring -> it.message
+                            is Alert.HysterectomyNote -> it.message
+                        }
+                    )
+                    .setPositiveButton(getString(android.R.string.ok)) { d, _ -> d.dismiss() }
+                    .show()
+            }
+        }
+    }
+
+    // ─── Helper: observe general alert messages via Flow ─────────────────────
+    private fun observeGeneralAlerts() {
+        lifecycleScope.launch {
+            viewModel.alertMessageFlow.collect { message ->
+                message?.let {
+                    if (isAdded) {
+                        MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_App_MaterialAlertDialog)
+                            .setTitle(getString(R.string.alert_popup))
+                            .setMessage(it)
+                            .setPositiveButton(getString(android.R.string.ok)) { dialog, _ -> 
+                                dialog.dismiss()
+                                viewModel.clearAlertMessage()
+                            }
+                            .setOnDismissListener {
+                                viewModel.clearAlertMessage()
+                            }
+                            .show()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun onNextClicked() {
+        val adapter = binding.form.rvInputForm.adapter as? FormInputAdapter ?: return
+        val invalidIndex = adapter.validateInput(resources)
+        if (invalidIndex == -1) {
+            viewModel.saveForm()
+        } else {
+            invalidIndex.let { binding.form.rvInputForm.scrollToPosition(it) }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormViewModel.kt
new file mode 100644
index 000000000..f9a901137
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/delivery_outcome/form/DeliveryOutcomeFormViewModel.kt
@@ -0,0 +1,332 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.configuration.DeliveryOutcomeDataset
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.R
+import timber.log.Timber
+import javax.inject.Inject
+
+    @HiltViewModel
+class DeliveryOutcomeFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext private val context: Context,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val patientDao: PatientDao,
+    private val ecrRepo: EcrRepo
+) : ViewModel() {
+
+    companion object {
+        const val STATUS_POST_NATAL_MOTHER = 3
+    }
+
+    val patientID: String = DeliveryOutcomeFormFragmentArgs.fromSavedStateHandle(savedStateHandle).patientID
+    val visitNumber: Int = DeliveryOutcomeFormFragmentArgs.fromSavedStateHandle(savedStateHandle).visitNumber
+
+    sealed class State {
+        object IDLE : State()
+        object SAVING : State()
+        object SAVE_SUCCESS_NAVIGATE_VITALS : State()
+        object SAVE_FAILED : State()
+    }
+
+    sealed class Alert {
+        data class InformDistrictNodalOfficer(val message: String) : Alert()
+        data class IntensivePncMonitoring(val message: String) : Alert()
+        data class HysterectomyNote(val message: String) : Alert()
+    }
+
+    private val _state = MutableLiveData<State>(State.IDLE)
+    val state: LiveData<State> get() = _state
+
+    private val _alert = MutableLiveData<Alert?>(null)
+    val alert: LiveData<Alert?> get() = _alert
+
+    private val _benName = MutableLiveData<String>()
+    val benName: LiveData<String> get() = _benName
+
+    private val _benAgeGender = MutableLiveData<String>()
+    val benAgeGender: LiveData<String> get() = _benAgeGender
+
+    private val _caseId = MutableLiveData<String>()
+    val caseId: LiveData<String> get() = _caseId
+
+    private val _recordExists = MutableLiveData<Boolean>(false)
+    val recordExists: LiveData<Boolean> get() = _recordExists
+
+    private val dataset = DeliveryOutcomeDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+    val alertMessageFlow = dataset.alertErrorMessageFlow
+
+    lateinit var deliveryOutcome: DeliveryOutcomeCache
+        private set
+    
+    private val _deliveryOutcomeId = MutableLiveData<Long>(0L)
+    val deliveryOutcomeId: LiveData<Long> get() = _deliveryOutcomeId
+
+    init {
+        viewModelScope.launch {
+            try {
+                val user = userRepo.getLoggedInUser()
+                val userName = user?.userName ?: ""
+                val saved = withContext(Dispatchers.IO) { deliveryOutcomeRepo.getDeliveryOutcome(patientID) }
+                val lastAnc = withContext(Dispatchers.IO) { maternalHealthRepo.getLastAnc(patientID) }
+                patientRepo.getPatientDisplay(patientID)?.let { ben ->
+                    val patientName = "${ben.patient.firstName} ${ben.patient.lastName ?: ""}"
+                    val patientAge = "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
+                    val caseId = ben.patient.patientID
+                    val pwr = withContext(Dispatchers.IO) {
+                        maternalHealthRepo.getSavedRegistrationRecord(patientID)
+                    } ?: createFallbackPwr(
+                        patient = ben.patient,
+                        saved = saved,
+                        userName = userName,
+                        lmpFromAnc = lastAnc?.lmpDate
+                    )
+
+                    _benName.value = patientName
+                    _benAgeGender.value = patientAge
+                    _caseId.value = caseId
+
+                    if (saved != null) {
+                        deliveryOutcome = saved
+                        _deliveryOutcomeId.value = saved.id
+                        _recordExists.value = true
+                        // Use full setUpPage method to show ALL fields (both delivery details and mother condition)
+                        dataset.setUpPage(
+                            pwr = pwr,
+                            anc = lastAnc,
+                            saved = saved,
+                            patientName = patientName,
+                            patientAge = patientAge,
+                            caseId = caseId
+                        )
+                    } else {
+                        deliveryOutcome = DeliveryOutcomeCache(
+                            patientID = patientID,
+                            isActive = true,
+                            createdBy = userName,
+                            updatedBy = userName,
+                            syncState = SyncState.UNSYNCED
+                        )
+                        _recordExists.value = false
+                        // Use full setUpPage method to show ALL fields (both delivery details and mother condition)
+                        dataset.setUpPage(
+                            pwr = pwr,
+                            anc = lastAnc,
+                            saved = null,
+                            patientName = patientName,
+                            patientAge = patientAge,
+                            caseId = caseId
+                        )
+                    }
+                } ?: run {
+                    _benName.value = "Error: Patient not found"
+                    _benAgeGender.value = ""
+                    Timber.e("Patient not found for ID: $patientID")
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing delivery outcome form")
+                _benName.value = "Error loading form"
+                _benAgeGender.value = e.message ?: "Unknown error"
+                _recordExists.value = false
+            }
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        viewModelScope.launch(Dispatchers.Main.immediate) {
+            dataset.updateList(formId, index)
+            checkAndEmitAlerts(formId, index)
+        }
+    }
+
+    fun clearAlertMessage() {
+        viewModelScope.launch {
+            dataset.resetErrorMessageFlow()
+        }
+    }
+
+    /** Mother's condition form element id. */
+    private val motherConditionId = 10 // ID in DeliveryOutcomeDataset
+    /** Maternal complications form element id. */
+    private val maternalComplicationsId = 11 // ID in DeliveryOutcomeDataset
+    /** Index of Maternal Death in do_mother_condition_array. */
+    private val motherConditionMaternalDeathIndex = 3
+    /** Index of PPH in do_maternal_complications_array. */
+    private val complicationPphIndex = 0
+    /** Index of Uterine rupture in do_maternal_complications_array. */
+    private val complicationUterineRuptureIndex = 4
+    /** Index of Hysterectomy performed in do_maternal_complications_array. */
+    private val complicationHysterectomyIndex = 8
+
+    /**
+     * Show alert only when the option that was just selected is the one that triggers that alert.
+     * Prevents alerts from popping on other options (e.g. no Hysterectomy alert when selecting Retained placenta).
+     * For checkboxes, index is positive when checked, negative when unchecked.
+     */
+    private fun checkAndEmitAlerts(formId: Int, index: Int) {
+        _alert.value = when {
+            // Only show "Inform District Nodal Officer" when user selected Maternal Death (index 3).
+            formId == motherConditionId && index == motherConditionMaternalDeathIndex && dataset.isMaternalDeath() ->
+                Alert.InformDistrictNodalOfficer(context.getString(R.string.do_inform_district_nodal_officer))
+            // Only show "Intensive PNC" when user just checked PPH (0) or Uterine rupture (4).
+            // Index is positive when checkbox is checked, negative when unchecked.
+            formId == maternalComplicationsId &&
+            (index == complicationPphIndex || index == complicationUterineRuptureIndex) &&
+            index >= 0 && // Only when checking (not unchecking)
+            dataset.hasPphOrUterineRupture() ->
+                Alert.IntensivePncMonitoring(context.getString(R.string.do_alert_intensive_pnc))
+            // Only show "Hysterectomy" when user just checked Hysterectomy performed (index 8).
+            formId == maternalComplicationsId &&
+            index == complicationHysterectomyIndex &&
+            index >= 0 && // Only when checking (not unchecking)
+            dataset.hasHysterectomy() ->
+                Alert.HysterectomyNote(context.getString(R.string.do_hysterectomy_note))
+            else -> null
+        }
+    }
+
+    fun clearAlert() {
+        _alert.value = null
+    }
+
+    fun saveForm() {
+        // Guard against accessing deliveryOutcome before async initialization completes
+        if (!::deliveryOutcome.isInitialized) {
+            Timber.e("DeliveryOutcomeFormViewModel: saveForm() called before deliveryOutcome initialization")
+            _state.postValue(State.SAVE_FAILED)
+            return
+        }
+        
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    _state.postValue(State.SAVING)
+                    dataset.mapValues(deliveryOutcome, 1)
+                    // Ensure delivery date is saved (from form field or fallback to current time)
+                    if (deliveryOutcome.dateOfDelivery == null) {
+                        deliveryOutcome.dateOfDelivery = System.currentTimeMillis()
+                    }
+                    userRepo.getLoggedInUser()?.let { user ->
+                        deliveryOutcome.updatedBy = user.userName
+                        deliveryOutcome.updatedDate = System.currentTimeMillis()
+                    }
+                    val savedId = deliveryOutcomeRepo.saveDeliveryOutcome(deliveryOutcome)
+                    if(savedId != null){
+                        _deliveryOutcomeId.postValue(deliveryOutcome.id)
+                        // Update patient status to Post Natal Mother so PNC list picks her up
+                        updatePatientStatusToPostNatal()
+                        // Retire upstream pregnancy state so she drops off PWR/ANC/e-PMSMA lists.
+                        retirePregnancyLifecycle()
+                        _state.postValue(State.SAVE_SUCCESS_NAVIGATE_VITALS)
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e, "DeliveryOutcomeFormViewModel: Failed to save delivery outcome")
+                    _state.postValue(State.SAVE_FAILED)
+                }
+            }
+        }
+    }
+
+    fun resetState() {
+        _state.value = State.IDLE
+    }
+
+    private fun createFallbackPwr(
+        patient: Patient,
+        saved: DeliveryOutcomeCache?,
+        userName: String,
+        lmpFromAnc: Long?
+    ): PregnantWomanRegistrationCache {
+        val fallbackLmp = when {
+            (lmpFromAnc ?: 0L) > 0L -> lmpFromAnc!!
+            (saved?.dateOfDelivery ?: 0L) > 0L -> saved!!.dateOfDelivery!!
+            patient.registrationDate?.time != null -> patient.registrationDate!!.time
+            else -> System.currentTimeMillis()
+        }
+        return PregnantWomanRegistrationCache(
+            patientID = patient.patientID,
+            dateOfRegistration = patient.registrationDate?.time ?: fallbackLmp,
+            lmpDate = fallbackLmp,
+            active = true,
+            createdBy = if (userName.isBlank()) "system" else userName,
+            updatedBy = if (userName.isBlank()) "system" else userName,
+            syncState = SyncState.SYNCED
+        )
+    }
+
+    private suspend fun updatePatientStatusToPostNatal() {
+        try {
+            val patient = patientDao.getPatient(patientID)
+            patient.statusOfWomanID = STATUS_POST_NATAL_MOTHER
+            patient.syncState = SyncState.UNSYNCED
+            patientDao.updatePatient(patient)
+            Timber.d("Patient status updated to Post Natal Mother for patientID: $patientID")
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to update patient status to Post Natal Mother")
+        }
+    }
+
+    private suspend fun retirePregnancyLifecycle() {
+        try {
+            maternalHealthRepo.getSavedRegistrationRecord(patientID)?.let { pwr ->
+                if (pwr.active) {
+                    pwr.active = false
+                    pwr.syncState = SyncState.UNSYNCED
+                    maternalHealthRepo.updatePwr(pwr)
+                }
+            }
+
+            val activeAnc = maternalHealthRepo.getAllActiveAncRecords(patientID)
+            if (activeAnc.isNotEmpty()) {
+                activeAnc.forEach {
+                    it.pregnantWomanDelivered = true
+                    it.isActive = false
+                    it.processed = "U"
+                    it.syncState = SyncState.UNSYNCED
+                }
+                maternalHealthRepo.updateAncRecord(activeAnc.toTypedArray())
+            }
+
+            // Clear pregnancy markers on every ECT row so the catch-all cannot leak
+            // post-delivery women back into ANC/PWR lists via stale historical visits.
+            ecrRepo.getAllECT(patientID).forEach { ect ->
+                if (ect.isPregnant != null || ect.pregnancyTestResult != null) {
+                    ect.isPregnant = null
+                    ect.pregnancyTestResult = null
+                    if (ect.processed != "N") ect.processed = "U"
+                    ect.syncState = SyncState.UNSYNCED
+                    ecrRepo.saveEct(ect)
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to retire pregnancy lifecycle for patientID: $patientID")
+            throw e
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormFragment.kt
new file mode 100644
index 000000000..3c0d8fbd1
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormFragment.kt
@@ -0,0 +1,147 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentNeonatalOutcomeBinding
+import org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form.NeonatalOutcomeFormViewModel.State
+import timber.log.Timber
+
+@AndroidEntryPoint
+class NeonatalOutcomeFormFragment : Fragment() {
+
+    private var _binding: FragmentNeonatalOutcomeBinding? = null
+    private val binding get() = _binding!!
+
+    private val viewModel: NeonatalOutcomeFormViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNeonatalOutcomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val adapter = FormInputAdapter(
+            formValueListener = FormInputAdapter.FormValueListener { id, index ->
+                viewModel.onFieldValueChanged(id, index)
+            }
+        )
+
+        binding.rvForm.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(requireContext())
+        binding.rvForm.adapter = adapter
+
+        viewModel.formElements.asLiveData().observe(viewLifecycleOwner) { elements ->
+            adapter.submitList(elements)
+        }
+
+        setupObservers()
+        setupClickListeners()
+    }
+
+    private fun setupObservers() {
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                State.IDLE -> {
+                    binding.progressBar.visibility = View.GONE
+                    binding.btnSave.isEnabled = true
+                }
+                State.LOADING -> {
+                    binding.progressBar.visibility = View.VISIBLE
+                    binding.btnSave.isEnabled = false
+                }
+                State.SAVING -> {
+                    binding.progressBar.visibility = View.VISIBLE
+                    binding.btnSave.isEnabled = false
+                }
+                State.SAVE_SUCCESS -> {
+                    Toast.makeText(requireContext(), "Neonatal outcomes saved successfully", Toast.LENGTH_SHORT).show()
+                    navigateToVitals()
+                }
+                State.SAVE_FAILED -> {
+                    binding.progressBar.visibility = View.GONE
+                    binding.btnSave.isEnabled = true
+                }
+            }
+        }
+
+        viewModel.errorMessage.observe(viewLifecycleOwner) { error ->
+            error?.let {
+                Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show()
+                viewModel.clearError()
+            }
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewModel.alertMessageFlow.collect { message ->
+                message?.let {
+                    if (isAdded) {
+                        MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(getString(R.string.alert_title))
+                            .setMessage(it)
+                            .setPositiveButton(getString(R.string.continue_btn), null)
+                            .show()
+                        viewModel.resetAlertMessageFlow()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun setupClickListeners() {
+        binding.btnSave.setOnClickListener {
+            viewModel.saveForm()
+        }
+
+        binding.btnCancel.setOnClickListener {
+            safeNavigateBack()
+        }
+    }
+
+    private fun navigateToVitals() {
+        try {
+            // Navigate to vitals screen
+            findNavController().navigateUp()
+        } catch (e: Exception) {
+            Timber.e(e, "Navigation error")
+            // Fallback: just go back
+            safeNavigateBack()
+        }
+    }
+
+    /**
+     * Safely navigate back, handling both NavController-hosted and
+     * FragmentManager-hosted scenarios.
+     */
+    private fun safeNavigateBack() {
+        try {
+            findNavController().popBackStack()
+        } catch (e: IllegalStateException) {
+            if (!parentFragmentManager.popBackStackImmediate()) {
+                requireActivity().finish()
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormViewModel.kt
new file mode 100644
index 000000000..175eb5d99
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/neonatal_outcome/form/NeonatalOutcomeFormViewModel.kt
@@ -0,0 +1,159 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.NeonatalOutcomeRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.configuration.NeonatalOutcomeDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class NeonatalOutcomeFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    @ApplicationContext private val context: Context,
+    private val neonatalOutcomeRepo: NeonatalOutcomeRepo,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
+    private val userRepo: UserRepo,
+    private val preferenceDao: PreferenceDao,
+) : ViewModel() {
+
+    private val args = NeonatalOutcomeFormFragmentArgs.fromSavedStateHandle(savedStateHandle)
+    val deliveryOutcomeId: Long = args.deliveryOutcomeId
+    val patientID: String = args.patientID
+    val babyIndex: Int = args.babyIndex
+
+    sealed class State {
+        object IDLE : State()
+        object LOADING : State()
+        object SAVING : State()
+        object SAVE_SUCCESS : State()
+        object SAVE_FAILED : State()
+    }
+
+    private val _state = MutableLiveData<State>(State.IDLE)
+    val state: LiveData<State> get() = _state
+
+    private val _errorMessage = MutableLiveData<String?>()
+    val errorMessage: LiveData<String?> get() = _errorMessage
+
+    private val dataset = NeonatalOutcomeDataset(context, preferenceDao.getCurrentLanguage())
+    val formElements = dataset.listFlow
+    val alertMessageFlow = dataset.alertErrorMessageFlow
+
+    fun resetAlertMessageFlow() {
+        viewModelScope.launch { dataset.resetErrorMessageFlow() }
+    }
+    
+    // We only need one outcome for the specific babyIndex
+    private var currentOutcome: NeonatalOutcomeCache? = null
+
+    init {
+        loadData()
+    }
+
+    private fun loadData() {
+        viewModelScope.launch {
+            try {
+                _state.value = State.LOADING
+                
+                // Get delivery outcome to verify
+                val deliveryOutcome = withContext(Dispatchers.IO) {
+                    deliveryOutcomeRepo.getDeliveryOutcome(patientID)
+                }
+
+                if (deliveryOutcome == null) {
+                    _errorMessage.value = "Delivery outcome not found"
+                    _state.value = State.SAVE_FAILED
+                    return@launch
+                }
+
+                // Load existing neonatal outcome for this specific baby index
+                val existing = withContext(Dispatchers.IO) {
+                    neonatalOutcomeRepo.getNeonatalOutcomeByIndexAndDelivery(deliveryOutcomeId, babyIndex)
+                }
+
+                val user = userRepo.getLoggedInUser()
+                val userName = user?.userName ?: ""
+                
+                currentOutcome = existing ?: NeonatalOutcomeCache(
+                    deliveryOutcomeId = deliveryOutcomeId,
+                    neonateIndex = babyIndex,
+                    createdBy = userName,
+                    updatedBy = userName,
+                    syncState = SyncState.UNSYNCED
+                )
+
+                dataset.setUpPage(currentOutcome)
+                _state.value = State.IDLE
+            } catch (e: Exception) {
+                Timber.e(e, "Error loading neonatal outcome data")
+                _errorMessage.value = "Error loading data: ${e.message}"
+                _state.value = State.SAVE_FAILED
+            }
+        }
+    }
+
+    fun onFieldValueChanged(formId: Int, index: Int) {
+        viewModelScope.launch {
+            dataset.updateList(formId, index)
+        }
+    }
+
+    fun saveForm() {
+        val outcome = currentOutcome ?: return
+        viewModelScope.launch {
+            try {
+                _state.value = State.SAVING
+                
+                dataset.mapValues(outcome)
+                
+                val user = userRepo.getLoggedInUser()
+                val userName = user?.userName ?: ""
+                val currentTime = System.currentTimeMillis()
+
+                val updated = outcome.copy(
+                    updatedBy = userName,
+                    updatedDate = currentTime,
+                    syncState = SyncState.UNSYNCED
+                )
+
+                withContext(Dispatchers.IO) {
+                    if (updated.id == 0L) {
+                        neonatalOutcomeRepo.insertNeonatalOutcome(updated)
+                    } else {
+                        neonatalOutcomeRepo.updateNeonatalOutcome(updated)
+                    }
+                }
+
+                _state.value = State.SAVE_SUCCESS
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to save neonatal outcome")
+                _errorMessage.value = "Failed to save: ${e.message}"
+                _state.value = State.SAVE_FAILED
+            }
+        }
+    }
+
+    fun resetState() {
+        _state.value = State.IDLE
+    }
+
+    fun clearError() {
+        _errorMessage.value = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormFragment.kt
index 2172176d6..b03dcd2bb 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormFragment.kt
@@ -1,12 +1,14 @@
 package org.piramalswasthya.cho.ui.commons.maternal_health.pnc.form
 
-import android.content.Intent
+
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -27,7 +29,7 @@ import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.OtherCPHCServicesViewModel
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.ui.commons.maternal_health.pnc.form.PncFormViewModel.State
 import org.piramalswasthya.cho.utils.generateUuid
 import org.piramalswasthya.cho.work.WorkerUtils
@@ -48,7 +50,7 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
 
     val viewModel: PncFormViewModel by viewModels()
 
-    private lateinit var benVisitInfo: PatientDisplayWithVisitInfo
+    private var benVisitInfo: PatientDisplayWithVisitInfo? = null
 
     val CPHCviewModel: OtherCPHCServicesViewModel by viewModels()
 
@@ -68,10 +70,17 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
         return binding.root
     }
 
+    private val pallorFormId = 22
+    private val severePallorIndex = 3
+    private val vaginalBleedingFormId = 23
+    private val heavyBleedingIndex = 1
+    private val foulSmellingDischargeIndex = 2
+    private val maternalSymptomsFormId = 20
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
+        benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
 
         viewModel.recordExists.observe(viewLifecycleOwner) { notIt ->
             notIt?.let { recordExists ->
@@ -85,6 +94,41 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
                     formValueListener = FormInputAdapter.FormValueListener { formId, index ->
                         viewModel.updateListOnValueChanged(formId, index)
                         hardCodedListUpdate(formId)
+                        if (formId == pallorFormId && index == severePallorIndex) {
+                            showReferralAlertToFacility(R.string.pnc_referral_alert_severe_pallor)
+                        }
+                        if (formId == vaginalBleedingFormId &&
+                            (index == heavyBleedingIndex || index == foulSmellingDischargeIndex)
+                        ) {
+                            showReferralAlertToFacility(R.string.pnc_referral_alert_vaginal_bleeding)
+                        }
+                        if (formId == maternalSymptomsFormId) {
+                            val pncAdapter = binding.form.rvInputForm.adapter as? FormInputAdapter
+                            val rowPosition = pncAdapter?.currentList?.indexOfFirst { it.id == maternalSymptomsFormId } ?: -1
+                            if (rowPosition >= 0) {
+                                pncAdapter?.notifyItemChanged(rowPosition)
+                            }
+
+                            // Count actual symptoms selected (exclude "None") for referral alert
+                            val maternalSymptomsItem = pncAdapter?.currentList?.find { it.id == maternalSymptomsFormId }
+                            val currentValue = maternalSymptomsItem?.value
+                            val selectedSymptoms = currentValue
+                                ?.split(",")
+                                ?.map { it.trim() }
+                                ?.filter { it.isNotBlank() && !it.equals("None", ignoreCase = true) }
+                                ?: emptyList()
+                            if (selectedSymptoms.size >= 2) {
+                                showReferralAlertToFacility(R.string.pnc_referral_alert_multiple_symptoms)
+                            }
+                        }
+
+                        if (formId == pallorFormId || formId == vaginalBleedingFormId || formId == maternalSymptomsFormId || formId == 19 /* anyDangerSign */) {
+                            val pncAdapter = binding.form.rvInputForm.adapter as? FormInputAdapter
+                            val referralIndex = pncAdapter?.currentList?.indexOfFirst { it.id == 9 /* referralFacility */ } ?: -1
+                            if (referralIndex >= 0) {
+                                pncAdapter?.notifyItemChanged(referralIndex)
+                            }
+                        }
                     }, isEnabled = !recordExists
                 )
                 binding.form.rvInputForm.adapter = adapter
@@ -108,6 +152,20 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
         binding.fabEdit.setOnClickListener {
             viewModel.setRecordExist(false)
         }
+        viewModel.initErrorMessage.observe(viewLifecycleOwner) { message ->
+            message?.let { errorMessage ->
+                AlertDialog.Builder(requireContext())
+                    .setTitle(getString(R.string.alert_popup))
+                    .setMessage(errorMessage)
+                    .setPositiveButton(getString(R.string.ok_button)) { dialog, _ ->
+                        dialog.dismiss()
+                        viewModel.clearInitError()
+                        findNavController().navigateUp()
+                    }
+                    .setCancelable(false)
+                    .show()
+            }
+        }
         viewModel.state.observe(viewLifecycleOwner) { state ->
             when (state!!) {
                 State.IDLE -> {
@@ -121,8 +179,11 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
                 State.SAVE_SUCCESS -> {
                     binding.llContent.visibility = View.VISIBLE
                     binding.pbForm.visibility = View.GONE
-                    Toast.makeText(context, "Save Successful", Toast.LENGTH_LONG).show()
-                    saveNurseData()
+                    Toast.makeText(context, getString(R.string.save_successful_toast), Toast.LENGTH_LONG).show()
+                    WorkerUtils.triggerPncSync(requireContext())
+                    
+                    // Finish activity to return to PNC list
+                    requireActivity().finish()
                 }
 
                 State.SAVE_FAILED -> {
@@ -140,8 +201,9 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
         CoroutineScope(Dispatchers.Main).launch {
             var benVisitNo = 0;
             var createNewBenflow = false;
-            CPHCviewModel.getLastVisitInfoSync(benVisitInfo.patient.patientID).let {
-                if(it == null){
+            benVisitInfo?.let { visitInfo ->
+                CPHCviewModel.getLastVisitInfoSync(visitInfo.patient.patientID).let {
+                    if(it == null){
                     benVisitNo = 1;
                 }
                 else if(it.nurseFlag == 1) {
@@ -149,7 +211,8 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
                 }
                 else {
                     benVisitNo = it.benVisitNo + 1
-                    createNewBenflow = true;
+                        createNewBenflow = true;
+                    }
                 }
             }
 
@@ -160,9 +223,7 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
             CPHCviewModel.isDataSaved.observe(viewLifecycleOwner){
                 when(it!!){
                     true ->{
-                        WorkerUtils.triggerAmritSyncWorker(requireContext())
-                        val intent = Intent(context, HomeActivity::class.java)
-                        startActivity(intent)
+                        WorkerUtils.triggerPncSync(requireContext())
                         requireActivity().finish()
                     }
                     else ->{
@@ -175,25 +236,24 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
     }
 
     fun saveNurseData(benVisitNo: Int, createNewBenflow: Boolean, user: UserDomain?){
-
         val visitDB = VisitDB(
             visitId = generateUuid(),
             category = "PNC",
             reasonForVisit = "New Chief Complaint",
             subCategory = "PNC",
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: "",
             benVisitNo = benVisitNo,
             benVisitDate =  SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date()),
             createdBy = user?.userName
         )
 
         val patientVitals = PatientVitalsModel(
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: "",
             benVisitNo = benVisitNo,
         )
 
         val patientVisitInfoSync = PatientVisitInfoSync(
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: "",
             benVisitNo = benVisitNo,
             createNewBenFlow = false,
             nurseDataSynced = SyncState.SYNCED,
@@ -231,9 +291,14 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
     private fun hardCodedListUpdate(formId: Int) {
         binding.form.rvInputForm.adapter?.apply {
             when (formId) {
-
-                1 -> notifyItemChanged(1)
-
+                1 -> {
+                    notifyItemChanged(1)
+                    val visitDateIndex = (binding.form.rvInputForm.adapter as? FormInputAdapter)
+                        ?.currentList?.indexOfFirst { it.id == 2 } ?: -1
+                    if (visitDateIndex >= 0) {
+                        notifyItemChanged(visitDateIndex)
+                    }
+                }
             }
         }
     }
@@ -255,7 +320,16 @@ class PncFormFragment() : Fragment(), NavigationAdapter{
     }
 
     override fun onCancelAction() {
-        findNavController().navigateUp()
+        requireActivity().finish()
+    }
+
+    private fun showReferralAlertToFacility(@StringRes messageResId: Int) {
+        if (!isAdded || context == null) return
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.alert_title))
+            .setMessage(getString(messageResId))
+            .setPositiveButton(android.R.string.ok, null)
+            .show()
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormViewModel.kt
index e214de671..71d864984 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pnc/form/PncFormViewModel.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.database.room.SyncState
-import org.piramalswasthya.cho.model.PregnantWomanAncCache
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.configuration.PncFormDataset
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
@@ -21,16 +20,18 @@ import org.piramalswasthya.cho.model.PNCVisitCache
 import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
 import org.piramalswasthya.cho.repositories.PncRepo
 import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.R
 import timber.log.Timber
 import java.util.Calendar
 import java.util.Date
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @HiltViewModel
 class PncFormViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     preferenceDao: PreferenceDao,
-    @ApplicationContext context: Context,
+    @ApplicationContext private val context: Context,
     private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
     private val pncRepo: PncRepo,
     private val patientRepo: PatientRepo,
@@ -63,60 +64,111 @@ class PncFormViewModel @Inject constructor(
     val recordExists: LiveData<Boolean>
         get() = _recordExists
 
+    private val _initErrorMessage = MutableLiveData<String?>()
+    val initErrorMessage: LiveData<String?> get() = _initErrorMessage
+
+    fun clearInitError() { _initErrorMessage.value = null }
+
     //    private lateinit var user: UserDomain
     private val dataset =
         PncFormDataset(context, preferenceDao.getCurrentLanguage())
     val formList = dataset.listFlow
 
     private lateinit var pncCache: PNCVisitCache
+    var deliveryOutcome: DeliveryOutcomeCache? = null
 
-    init {
-        viewModelScope.launch {
-            val calendar = Calendar.getInstance()
-            calendar.time = Date() // Set the calendar to the current date and time
-            calendar.add(Calendar.DAY_OF_MONTH, -42) // Subtract 42 days
-            val millis = calendar.timeInMillis
-
-            val asha = userRepo.getLoggedInUser()!!
-            val ben = patientRepo.getPatientDisplay(patientID)?.also { ben ->
-                _benName.value =
-                    "${ben.patient.firstName} ${ben.patient.lastName ?: ""}"
-                _benAgeGender.value = "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
-                pncCache = PNCVisitCache(
-                    patientID = patientID,
-                    pncPeriod = visitNumber,
-                    isActive = true,
-                    syncState = SyncState.UNSYNCED,
-                    createdBy = asha.userName,
-                    updatedBy = asha.userName
-                )
+    suspend fun hasPreviousPermanentSterilization(): Boolean {
+        return pncRepo.getAllPNCsByPatId(patientID)
+            .filter { it.pncPeriod.toInt() < visitNumber.toInt() }
+            .any { pncVisit ->
+                pncVisit.contraceptionMethod?.let { method ->
+                    isPermanentSterilizationMethod(method)
+                } ?: false
             }
-            val outcomeRecord = deliveryOutcomeRepo.getDeliveryOutcome(patientID)!!
-//            val outcomeRecord = DeliveryOutcomeCache(
-//                patientID = patientID,
-//                isActive = false,
-//                createdBy = asha.userName,
-//                updatedBy = asha.userName,
-//                dateOfDelivery = millis,
-//                syncState = SyncState.UNSYNCED
-//            )
-            pncRepo.getSavedPncRecord(patientID, visitNumber)?.let {
-                pncCache = it
-                _recordExists.value = true
-            } ?: run {
-                _recordExists.value = false
+    }
+
+    suspend fun getLastPermanentSterilizationVisit(
+        currentVisitNumber: Int
+    ): PNCVisitCache? {
+        return pncRepo.getAllPNCsByPatId(patientID)
+            .filter { it.pncPeriod < currentVisitNumber }
+            .filter { pncVisit ->
+                pncVisit.contraceptionMethod?.let { method ->
+                    isPermanentSterilizationMethod(method)
+                } ?: false
             }
-            val lastPnc = pncRepo.getLastFilledPncRecord(patientID)
-
-            dataset.setUpPage(
-                visitNumber,
-                ben,
-                outcomeRecord,
-                lastPnc,
-                if (recordExists.value == true) pncCache else null
-            )
+            .maxByOrNull { it.pncPeriod }
+    }
+
+    private fun isPermanentSterilizationMethod(method: String): Boolean {
+        val permanentMethods = context.resources.getStringArray(R.array.sterilization_methods_array).toList()
+        return permanentMethods.any { it.equals(method, ignoreCase = true) }
+    }
+
+    init {
+        viewModelScope.launch {
+            try {
+                val asha = userRepo.getLoggedInUser()
+                if (asha == null) {
+                    Timber.e("PncFormViewModel: no logged-in user found")
+                    _initErrorMessage.postValue(context.getString(R.string.form_session_expired))
+                    return@launch
+                }
+                val ben = patientRepo.getPatientDisplay(patientID)?.also { ben ->
+                    _benName.value =
+                        "${ben.patient.firstName} ${ben.patient.lastName ?: ""}"
+                    _benAgeGender.value = "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
+                    pncCache = PNCVisitCache(
+                        patientID = patientID,
+                        pncPeriod = visitNumber,
+                        isActive = true,
+                        syncState = SyncState.UNSYNCED,
+                        createdBy = asha.userName,
+                        updatedBy = asha.userName
+                    )
+                }
+                if (ben == null) {
+                    Timber.e("PncFormViewModel: patient not found for ID %s", patientID)
+                    _initErrorMessage.postValue(context.getString(R.string.form_patient_not_found))
+                    return@launch
+                }
+                deliveryOutcome = deliveryOutcomeRepo.getDeliveryOutcome(patientID)
+                if (deliveryOutcome == null) {
+                    deliveryOutcome = DeliveryOutcomeCache(
+                        patientID = patientID,
+                        isActive = true,
+                        dateOfDelivery = null,
+                        createdBy = asha.userName,
+                        updatedBy = asha.userName,
+                        syncState = SyncState.UNSYNCED
+                    )
+                }
 
+                pncRepo.getSavedPncRecord(patientID, visitNumber)?.let {
+                    pncCache = it
+                    _recordExists.value = true
+                } ?: run {
+                    _recordExists.value = false
+                }
+                val lastPnc = pncRepo.getLastFilledPncRecord(patientID)
+                val hasPreviousSterilization = hasPreviousPermanentSterilization()
+                val lastSterilizationVisit = if (hasPreviousSterilization) {
+                    getLastPermanentSterilizationVisit(visitNumber)
+                } else null
 
+                dataset.setUpPage(
+                    visitNumber,
+                    ben,
+                    deliveryOutcome!!,
+                    lastPnc,
+                    if (recordExists.value == true) pncCache else null,
+                    hasPreviousSterilization,
+                    lastSterilizationVisit
+                )
+            } catch (e: Exception) {
+                Timber.e(e, "PncFormViewModel: failed to initialize form")
+                _initErrorMessage.postValue(context.getString(R.string.form_load_failed))
+            }
         }
     }
 
@@ -135,15 +187,133 @@ class PncFormViewModel @Inject constructor(
                     _state.postValue(State.SAVING)
                     dataset.mapValues(pncCache, 1)
                     pncRepo.persistPncRecord(pncCache)
+
+                    persistDeliveryDateIfNeeded(pncCache.updatedBy)
+
+                    // Update woman status after PNC
+                    updateWomanStatusAfterPnc(pncCache)
+
+                    // Handle maternal death
+                    handleMaternalDeath(pncCache)
+
                     _state.postValue(State.SAVE_SUCCESS)
                 } catch (e: Exception) {
-                    Timber.d("saving PW-ANC data failed!! $e")
+                    Timber.d("saving PNC data failed!! $e")
                     _state.postValue(State.SAVE_FAILED)
                 }
             }
         }
     }
 
+    private suspend fun persistDeliveryDateIfNeeded(updatedBy: String) {
+        val selectedDeliveryDate = dataset.getSelectedDeliveryDateMillis() ?: return
+        val existing = deliveryOutcome ?: deliveryOutcomeRepo.getDeliveryOutcome(patientID)
+        val outcome = if (existing != null) {
+            existing.copy(
+                dateOfDelivery = selectedDeliveryDate,
+                isActive = true,
+                updatedBy = updatedBy,
+                syncState = SyncState.UNSYNCED
+            )
+        } else {
+            DeliveryOutcomeCache(
+                patientID = patientID,
+                isActive = true,
+                dateOfDelivery = selectedDeliveryDate,
+                createdBy = updatedBy,
+                updatedBy = updatedBy,
+                syncState = SyncState.UNSYNCED
+            )
+        }
+        deliveryOutcomeRepo.saveDeliveryOutcome(outcome)
+        deliveryOutcome = outcome
+    }
+
+    // ─── Helper: close PNC visits and update patient on maternal death ───
+    private suspend fun handleMaternalDeath(pncCache: PNCVisitCache) {
+        if (!pncCache.motherDeath) return
+        val patient = patientRepo.getPatient(patientID)
+
+        // Close PNC case immediately - mark all active PNC visits as inactive
+        val allPncVisits = pncRepo.getAllPNCsByPatId(patientID)
+        allPncVisits.forEach { visit ->
+            visit.isActive = false
+            visit.syncState = SyncState.UNSYNCED
+            if (visit.processed != "N") visit.processed = "U"
+            visit.updatedDate = System.currentTimeMillis()
+            visit.updatedBy = pncCache.updatedBy
+            pncRepo.persistPncRecord(visit)
+        }
+
+        // Update beneficiary status = Death
+        // Note: Patient model may need to be updated to include death status field
+        // For now, we'll sync the death information
+        patient.syncState = SyncState.UNSYNCED
+        patientRepo.updateRecord(patient)
+        // Sync death details to AMRIT (handled by sync worker)
+    }
+
+    private suspend fun updateWomanStatusAfterPnc(pncCache: PNCVisitCache) {
+        // Skip status update if maternal death occurred
+        if (pncCache.motherDeath) {
+            return
+        }
+        
+        val patient = patientRepo.getPatient(patientID)
+        val dateOfDelivery = deliveryOutcome?.dateOfDelivery ?: return
+        
+        val is42ndDayPnc = pncCache.pncPeriod == 42
+        val daysSinceDelivery = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - dateOfDelivery)
+        val isAfter60Days = daysSinceDelivery >= 60
+
+        // Transition to Eligible Couple Tracking
+        // After 42nd day PNC visit submission OR 60 days from Date of Delivery
+        if (is42ndDayPnc || isAfter60Days) {
+            val allPncVisits = pncRepo.getAllPNCsByPatId(patientID)
+            val permanentSterilizationMethods = context.resources.getStringArray(R.array.sterilization_methods_array).toList()
+
+            val hasPermanentSterilization = allPncVisits.any { pncVisit ->
+                pncVisit.contraceptionMethod?.let { method ->
+                    permanentSterilizationMethods.any { sterilizationMethod ->
+                        method.contains(sterilizationMethod, ignoreCase = true)
+                    }
+                } ?: false
+            }
+
+            // Update patient status based on sterilization
+            // Note: This may need to be adapted based on HWC's Patient model structure
+            // The Patient model in HWC may not have reproductiveStatus field directly
+            // Status updates might need to be handled through a different mechanism
+            if (hasPermanentSterilization) {
+                // If female permanent method selected:
+                // After 42nd day PNC submission OR 60 days from delivery:
+                // Update Status of Woman = Permanently Sterilized
+                val femaleSterilizationMethods = context.resources.getStringArray(R.array.female_sterilization_methods_array).toList()
+                val hasFemalePermanentSterilization = allPncVisits.any { pncVisit ->
+                    pncVisit.contraceptionMethod?.let { method ->
+                        femaleSterilizationMethods.any { sterilizationMethod ->
+                            method.contains(sterilizationMethod, ignoreCase = true)
+                        }
+                    } ?: false
+                }
+
+                if (hasFemalePermanentSterilization) {
+                    // Update to Permanently Sterilized status
+                    // patient.reproductiveStatus = "Permanently Sterilised"
+                    // Move record to Eligible Couple and ECT Tracking sections
+                }
+            } else {
+                // If no permanent sterilization selected:
+                // Update Status of Woman = Eligible Couple
+                // Move record to Eligible Couple and ECT Tracking sections
+                // patient.reproductiveStatus = "Eligible Couple"
+            }
+
+            patient.syncState = SyncState.UNSYNCED
+            patientRepo.updateRecord(patient)
+        }
+    }
+
     fun setRecordExist(b: Boolean) {
         _recordExists.value = b
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormFragment.kt
index 67102956b..67aedf320 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormFragment.kt
@@ -1,6 +1,7 @@
 package org.piramalswasthya.cho.ui.commons.maternal_health.pregnant_woment_anc_visits.form
 
 
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,7 +12,9 @@ import android.widget.RadioButton
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -22,6 +25,7 @@ import org.piramalswasthya.cho.adapter.FormInputAdapter
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.databinding.FragmentNewFormBinding
 import org.piramalswasthya.cho.model.ChiefComplaintDB
+import org.piramalswasthya.cho.model.FormElement
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVitalsModel
@@ -54,7 +58,7 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
 
     val viewModel: PwAncFormViewModel by viewModels()
 
-    private lateinit var benVisitInfo: PatientDisplayWithVisitInfo
+    private var benVisitInfo: PatientDisplayWithVisitInfo? = null
 
     val CPHCviewModel: OtherCPHCServicesViewModel by viewModels()
 
@@ -62,6 +66,8 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
 
     val jsonFile = "patient-visit-details-paginated.json"
 
+    private var ancFormAdapter: FormInputAdapter? = null
+    private var latestFormList: List<FormElement> = emptyList()
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
@@ -73,67 +79,122 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
+        benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
 
+        setupFormAdapter()
+        setupOldVisitObserver()
+        setupPatientDetailsObservers()
+        setupButtonListeners()
+        setupStateObserver()
+        setupAlertObserver()
+        setupInitErrorObserver()
+    }
+
+    private fun setupInitErrorObserver() {
+        viewModel.initErrorMessage.observe(viewLifecycleOwner) { message ->
+            message?.let { errorMessage ->
+                context?.let { ctx ->
+                    AlertDialog.Builder(ctx)
+                        .setTitle(getString(R.string.alert_popup))
+                        .setMessage(errorMessage)
+                        .setPositiveButton(getString(R.string.ok_button)) { dialog, _ ->
+                            dialog.dismiss()
+                            viewModel.clearInitError()
+                            findNavController().navigateUp()
+                        }
+                        .setCancelable(false)
+                        .show()
+                }
+            }
+        }
+    }
+
+    private fun setupFormAdapter() {
         viewModel.recordExists.observe(viewLifecycleOwner) { notIt ->
             notIt?.let { recordExists ->
-                binding.fabEdit.visibility = /*if (recordExists) View.VISIBLE else */View.GONE
-                if(recordExists){
+                val formEditable = !(viewModel.isOldVisit.value ?: true)
+                binding.fabEdit.visibility = View.GONE
+                binding.btnSubmit.visibility = View.GONE
+                
+                if (viewModel.isOldVisit.value == true) {
                     val btnSubmit = activity?.findViewById<Button>(R.id.btnSubmit)
                     btnSubmit?.visibility = View.GONE
                 }
-                binding.btnSubmit.visibility = if (recordExists) View.GONE else View.VISIBLE
-                val adapter = FormInputAdapter(
+                
+                ancFormAdapter = FormInputAdapter(
                     formValueListener = FormInputAdapter.FormValueListener { formId, index ->
                         viewModel.updateListOnValueChanged(formId, index)
                         hardCodedListUpdate(formId)
-                    }, isEnabled = !recordExists
+                    }, isEnabled = formEditable
                 )
-                binding.form.rvInputForm.adapter = adapter
+                binding.form.rvInputForm.adapter = ancFormAdapter
+                
                 lifecycleScope.launch {
                     viewModel.formList.collect {
-                        if (it.isNotEmpty())
-
-                            adapter.submitList(it)
+                        latestFormList = it
+                        if (it.isNotEmpty()) ancFormAdapter?.submitList(it)
+                    }
+                }
 
+                lifecycleScope.launch {
+                    viewModel.forceRefreshIdFlow.collect { id ->
+                        val pos = ancFormAdapter?.currentList?.indexOfFirst { it.id == id } ?: -1
+                        if (pos != -1) ancFormAdapter?.notifyItemChanged(pos)
                     }
                 }
             }
         }
+    }
+
+    private fun setupOldVisitObserver() {
+        viewModel.isOldVisit.observe(viewLifecycleOwner) { isOld ->
+            val formEditable = !isOld
+            activity?.findViewById<Button>(R.id.btnSubmit)?.visibility = if (formEditable) View.VISIBLE else View.GONE
+            
+            ancFormAdapter = FormInputAdapter(
+                formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                    viewModel.updateListOnValueChanged(formId, index)
+                    hardCodedListUpdate(formId)
+                }, isEnabled = formEditable
+            )
+            binding.form.rvInputForm.adapter = ancFormAdapter
+            if (latestFormList.isNotEmpty()) ancFormAdapter?.submitList(latestFormList)
+        }
+    }
+
+    private fun setupPatientDetailsObservers() {
         viewModel.benName.observe(viewLifecycleOwner) {
             binding.tvBenName.text = it
         }
         viewModel.benAgeGender.observe(viewLifecycleOwner) {
             binding.tvAgeGender.text = it
         }
+    }
+
+    private fun setupButtonListeners() {
         binding.btnSubmit.setOnClickListener {
             submitAncForm()
         }
         binding.fabEdit.setOnClickListener {
             viewModel.setRecordExist(false)
         }
+    }
+
+    private fun setupStateObserver() {
         viewModel.state.observe(viewLifecycleOwner) { state ->
             when (state!!) {
                 State.IDLE -> {
+                    // No action needed
                 }
-
                 State.SAVING -> {
                     binding.llContent.visibility = View.GONE
                     binding.pbForm.visibility = View.VISIBLE
                 }
-
                 State.SAVE_SUCCESS -> {
-                    binding.llContent.visibility = View.VISIBLE
-                    binding.pbForm.visibility = View.GONE
-                    Toast.makeText(context, "Save Successful", Toast.LENGTH_LONG).show()
-                    saveNurseData()
+                    handleSaveSuccess()
                 }
-
                 State.SAVE_FAILED -> {
-                    Toast.makeText(
-
-                        context, "Something wend wong! Contact testing!", Toast.LENGTH_LONG
-                    ).show()
+                    Toast.makeText(context, getString(R.string.something_wend_wong_contact_testing), Toast.LENGTH_LONG).show()
                     binding.llContent.visibility = View.VISIBLE
                     binding.pbForm.visibility = View.GONE
                 }
@@ -141,11 +202,65 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
         }
     }
 
+    private fun setupAlertObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.ancAlertMessage.collect { message ->
+                    if (!message.isNullOrEmpty()) {
+                        showAncAlertDialog(message)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun showAncAlertDialog(message: String) {
+        context?.let { ctx ->
+            AlertDialog.Builder(ctx)
+                .setTitle(getString(R.string.alert_popup))
+                .setMessage(message)
+                .setPositiveButton(getString(R.string.ok_button)) { dialog, _ ->
+                    dialog.dismiss()
+                    viewModel.resetAlertMessage()
+                }
+                .setCancelable(false)
+                .show()
+        }
+    }
+
+    private fun handleSaveSuccess() {
+        binding.llContent.visibility = View.VISIBLE
+        binding.pbForm.visibility = View.GONE
+        Toast.makeText(context, getString(R.string.save_successful_toast), Toast.LENGTH_LONG).show()
+        WorkerUtils.triggerAncVisitSync(requireContext())
+        if (viewModel.shouldTriggerBeneficiarySyncAfterSave()) {
+            WorkerUtils.triggerBeneficiarySync(requireContext())
+            viewModel.consumeBeneficiarySyncTrigger()
+        }
+        if (viewModel.shouldTriggerEctSyncAfterSave()) {
+            WorkerUtils.triggerEligibleCoupleTrackingSync(requireContext())
+            viewModel.consumeEctSyncTrigger()
+        }
+
+        // When launched directly from ANC listing, there is no patient home to navigate back to.
+        if (benVisitInfo == null) {
+            requireActivity().finish()
+            return
+        }
+
+        try {
+            findNavController().navigateUp()
+        } catch (e: Exception) {
+            requireActivity().finish()
+        }
+    }
+
     private fun saveNurseData(){
         CoroutineScope(Dispatchers.Main).launch {
             var benVisitNo = 0;
             var createNewBenflow = false;
-            CPHCviewModel.getLastVisitInfoSync(benVisitInfo.patient.patientID).let {
+            val patientID = benVisitInfo?.patient?.patientID ?: viewModel.getPatientID()
+            CPHCviewModel.getLastVisitInfoSync(patientID).let {
                 if(it == null){
                     benVisitNo = 1;
                 }
@@ -165,9 +280,7 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
             CPHCviewModel.isDataSaved.observe(viewLifecycleOwner){
                 when(it!!){
                     true ->{
-                        WorkerUtils.triggerAmritSyncWorker(requireContext())
-                        val intent = Intent(context, HomeActivity::class.java)
-                        startActivity(intent)
+                        WorkerUtils.triggerAncVisitSync(requireContext())
                         requireActivity().finish()
                     }
                     else ->{
@@ -186,19 +299,19 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
             category = "ANC",
             reasonForVisit = "New Chief Complaint",
             subCategory = "ANC",
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: viewModel.getPatientID(),
             benVisitNo = benVisitNo,
             benVisitDate =  SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(Date()),
             createdBy = user?.userName
         )
 
         val patientVitals = PatientVitalsModel(
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: viewModel.getPatientID(),
             benVisitNo = benVisitNo,
         )
 
         val patientVisitInfoSync = PatientVisitInfoSync(
-            patientID = benVisitInfo.patient.patientID,
+            patientID = benVisitInfo?.patient?.patientID ?: viewModel.getPatientID(),
             benVisitNo = benVisitNo,
             createNewBenFlow = false,
             nurseDataSynced = SyncState.SYNCED,
@@ -270,7 +383,7 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
     }
 
     override fun onCancelAction() {
-        findNavController().navigateUp()
+        requireActivity().finish()
     }
 
     override fun onDestroy() {
@@ -278,4 +391,4 @@ class PwAncFormFragment() : Fragment(), NavigationAdapter{
         _binding = null
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormViewModel.kt
index d6aa624a4..57b99135f 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pregnant_woment_anc_visits/form/PwAncFormViewModel.kt
@@ -16,10 +16,13 @@ import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.configuration.PregnantWomanAncVisitDataset
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PatientDisplay
 import org.piramalswasthya.cho.model.PregnantWomanAncCache
 import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import org.piramalswasthya.cho.repositories.EcrRepo
 import org.piramalswasthya.cho.repositories.MaternalHealthRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.repositories.UserRepo
 import timber.log.Timber
 import java.util.Calendar
@@ -29,10 +32,11 @@ import javax.inject.Inject
 class PwAncFormViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     preferenceDao: PreferenceDao,
-    @ApplicationContext context: Context,
+    @ApplicationContext private val context: Context,
     private val maternalHealthRepo: MaternalHealthRepo,
     private val patientRepo: PatientRepo,
     private val userRepo: UserRepo,
+    private val ecrRepo: EcrRepo,
 ) : ViewModel() {
 
     enum class State {
@@ -44,8 +48,10 @@ class PwAncFormViewModel @Inject constructor(
         PwAncFormFragmentArgs.fromSavedStateHandle(savedStateHandle).patientID
     private val visitNumber =
         PwAncFormFragmentArgs.fromSavedStateHandle(savedStateHandle).visitNumber
-    val isOldVisit =
-        PwAncFormFragmentArgs.fromSavedStateHandle(savedStateHandle).isOldVisit
+    private val initialIsOldVisit = PwAncFormFragmentArgs.fromSavedStateHandle(savedStateHandle).isOldVisit
+
+    private val _isOldVisit = MutableLiveData(initialIsOldVisit)
+    val isOldVisit: LiveData<Boolean> = _isOldVisit
 
 
     private val _state = MutableLiveData(State.IDLE)
@@ -63,21 +69,40 @@ class PwAncFormViewModel @Inject constructor(
     val recordExists: LiveData<Boolean>
         get() = _recordExists
 
+    private val _initErrorMessage = MutableLiveData<String?>()
+    val initErrorMessage: LiveData<String?> get() = _initErrorMessage
+
+    fun clearInitError() { _initErrorMessage.value = null }
+
     //    private lateinit var user: UserDomain
     private val dataset =
         PregnantWomanAncVisitDataset(context, preferenceDao.getCurrentLanguage())
     val formList = dataset.listFlow
+    val ancAlertMessage = dataset.alertErrorMessageFlow
+    val forceRefreshIdFlow = dataset.forceRefreshIdFlow
 
     private lateinit var ancCache: PregnantWomanAncCache
     private lateinit var registerRecord: PregnantWomanRegistrationCache
+    private var ben: PatientDisplay? = null
+    private var lastAncVisitNumber: Int = 0
+    private var currentVisitNumber: Int = visitNumber
+    private var shouldTriggerBeneficiarySyncAfterSave: Boolean = false
+    private var shouldTriggerEctSyncAfterSave: Boolean = false
 
     init {
         viewModelScope.launch {
-            val asha = userRepo.getLoggedInUser()!!
-            val ben = patientRepo.getPatientDisplay(patientID)?.also { ben ->
+            try {
+            val asha = userRepo.getLoggedInUser()
+            if (asha == null) {
+                Timber.e("PwAncFormViewModel: no logged-in user found")
+                _initErrorMessage.postValue(context.getString(R.string.form_session_expired))
+                return@launch
+            }
+            ben = patientRepo.getPatientDisplay(patientID)?.also { ben ->
                 _benName.value =
                     "${ben.patient.firstName} ${ben.patient.lastName ?: ""}"
-                _benAgeGender.value = "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
+                _benAgeGender.value =
+                    "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
                 ancCache = PregnantWomanAncCache(
                     patientID = patientID,
                     visitNumber = visitNumber,
@@ -86,32 +111,154 @@ class PwAncFormViewModel @Inject constructor(
                     updatedBy = asha.userName
                 )
             }
-            registerRecord = maternalHealthRepo.getSavedRegistrationRecord(patientID)!!
-            maternalHealthRepo.getSavedAncRecord(patientID, visitNumber)?.let {
-                ancCache = it
-                _recordExists.value = true
+            if (ben == null) {
+                Timber.e("PwAncFormViewModel: patient not found for ID %s", patientID)
+                _initErrorMessage.postValue(context.getString(R.string.form_patient_not_found))
+                return@launch
+            }
+            registerRecord = maternalHealthRepo.getSavedRegistrationRecord(patientID) ?: run {
+                Timber.e("No registration record found for $patientID")
+                _initErrorMessage.postValue(context.getString(R.string.form_patient_not_found))
+                return@launch
+            }
+            
+            // Get or create ANC record for this visit
+            var savedAnc = maternalHealthRepo.getSavedAncRecord(patientID, visitNumber)
+            
+            // CRITICAL FIX: If savedAnc is null (e.g., HRP visit 5+), create it on-demand
+            if (savedAnc == null) {
+                Timber.d("Creating new ANC record for visit $visitNumber (likely HRP > 4)")
+                val newAncRecord = PregnantWomanAncCache(
+                    patientID = patientID,
+                    visitNumber = visitNumber,
+                    ancDate = System.currentTimeMillis(), // Current date
+                    isActive = true,
+                    createdBy = asha.userName,
+                    updatedBy = asha.userName,
+                    syncState = SyncState.UNSYNCED
+                )
+                maternalHealthRepo.persistAncRecord(newAncRecord)
+                savedAnc = maternalHealthRepo.getSavedAncRecord(patientID, visitNumber)
+            }
+            
+            // Per Jira MHWC-197: Previous forms become read-only when a NEWER visit is started (completed).
+            // Schedule pre-creates all 4 visit records (no weight); so lock only when a later visit has weight.
+            val allAncRecords = maternalHealthRepo.getAllActiveAncRecords(patientID)
+            val maxCompletedVisitNumber = allAncRecords.filter { it.weight != null }.maxOfOrNull { it.visitNumber } ?: 0
+            val hasDelivered = allAncRecords.any { it.pregnantWomanDelivered == true }
+            val isOldVisit = hasDelivered || visitNumber < maxCompletedVisitNumber
+            
+            savedAnc?.let {
+                val registerRecordOrNull = maternalHealthRepo.getSavedRegistrationRecord(patientID)
+                if (registerRecordOrNull == null) {
+                    Timber.e("No registration record for patient $patientID; cannot load ANC form")
+                    _initErrorMessage.postValue(context.getString(R.string.form_patient_not_found))
+                    _state.postValue(State.SAVE_FAILED)
+                    return@launch
+                }
+                registerRecord = registerRecordOrNull
+                lastAncVisitNumber = allAncRecords.maxOfOrNull { it.visitNumber } ?: 0
+                val recordExists =
+                    maternalHealthRepo.getSavedAncRecord(patientID, visitNumber)?.let {
+                        ancCache = it
+                        _recordExists.value = (it.weight != null)
+                        true
+                    } ?: run {
+                        _recordExists.value = false
+                        false
+                    }
+                val lastAnc = maternalHealthRepo.getSavedAncRecord(patientID, visitNumber - 1)
+                
+                // Set isOldVisit based on whether a newer visit exists
+                _isOldVisit.value = isOldVisit
+
+                dataset.setUpPage(
+                    visitNumber,
+                    ben,
+                    registerRecord,
+                    lastAnc,
+                    if (recordExists) ancCache else null
+                )
             } ?: run {
+                // Even if savedAnc is null, we MUST still set up the form
+                _isOldVisit.value = isOldVisit
+                lastAncVisitNumber = allAncRecords.maxOfOrNull { it.visitNumber } ?: 0
                 _recordExists.value = false
+                val lastAnc = maternalHealthRepo.getSavedAncRecord(patientID, visitNumber - 1)
+                
+                // CRITICAL: Set up the form even for new visits
+                dataset.setUpPage(
+                    visitNumber,
+                    ben,
+                    registerRecord,
+                    lastAnc,
+                    null  // No existing data for new visit
+                )
             }
-            val lastAnc = maternalHealthRepo.getSavedAncRecord(patientID, visitNumber - 1)
-
-            dataset.setUpPage(
-                visitNumber,
-                ben,
-                registerRecord,
-                lastAnc,
-                if (recordExists.value == true) ancCache else null
-            )
+            } catch (e: Exception) {
+                Timber.e(e, "PwAncFormViewModel: failed to initialize form")
+                _initErrorMessage.postValue(context.getString(R.string.form_load_failed))
+            }
+        }
+    }
 
+    private val ancPeriodFormId = 3
 
+    private fun switchToVisit(selectedVisit: Int) {
+        if (selectedVisit == currentVisitNumber) return
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    if (!::registerRecord.isInitialized) {
+                        Timber.w("switchToVisit: registerRecord not initialized yet")
+                        _state.postValue(State.SAVE_FAILED)
+                        return@withContext
+                    }
+                    val saved = maternalHealthRepo.getSavedAncRecord(patientID, selectedVisit)
+                    val lastAnc = maternalHealthRepo.getSavedAncRecord(patientID, selectedVisit - 1)
+                    val asha = userRepo.getLoggedInUser() ?: return@withContext
+                    ancCache = saved ?: PregnantWomanAncCache(
+                        patientID = patientID,
+                        visitNumber = selectedVisit,
+                        syncState = SyncState.UNSYNCED,
+                        createdBy = asha.userName,
+                        updatedBy = asha.userName
+                    )
+                    currentVisitNumber = selectedVisit
+                    _recordExists.postValue(saved != null)
+                    
+                    // Per Jira MHWC-197: Lock when a newer visit is completed (weight set). Schedule pre-creates all visits.
+                    val allAncRecords = maternalHealthRepo.getAllActiveAncRecords(patientID)
+                    val maxCompletedVisitNumber = allAncRecords.filter { it.weight != null }.maxOfOrNull { it.visitNumber } ?: 0
+                    val hasDelivered = allAncRecords.any { it.pregnantWomanDelivered == true }
+                    val isOld = hasDelivered || selectedVisit < maxCompletedVisitNumber
+                    lastAncVisitNumber = allAncRecords.maxOfOrNull { it.visitNumber } ?: 0
+                    _isOldVisit.postValue(isOld)
+                    dataset.setUpPage(
+                        selectedVisit,
+                        ben,
+                        registerRecord,
+                        lastAnc,
+                        if (saved != null) ancCache else null
+                    )
+                } catch (e: Exception) {
+                    Timber.e(e, "switchToVisit failed")
+                    _state.postValue(State.SAVE_FAILED)
+                }
+            }
         }
     }
 
+
     fun updateListOnValueChanged(formId: Int, index: Int) {
         viewModelScope.launch {
             dataset.updateList(formId, index)
+            if (formId == ancPeriodFormId) {
+                dataset.getAncVisitNumber()?.let { newVisit ->
+                    if (newVisit != currentVisitNumber) switchToVisit(newVisit)
+                }
+            }
         }
-
     }
 
 
@@ -120,10 +267,72 @@ class PwAncFormViewModel @Inject constructor(
             withContext(Dispatchers.IO) {
                 try {
                     _state.postValue(State.SAVING)
+                    shouldTriggerBeneficiarySyncAfterSave = false
+                    shouldTriggerEctSyncAfterSave = false
+                    val wasCompletedBefore = ancCache.weight != null
                     dataset.mapValues(ancCache, 1)
+                    // Mark ANC as updated for re-sync so /maternal/ancVisit/saveAll is called on edits.
+                    if (ancCache.processed != "N") ancCache.processed = "U"
+                    ancCache.syncState = SyncState.UNSYNCED
+                    ancCache.updatedDate = System.currentTimeMillis()
+                    val isCompletedNow = ancCache.weight != null
+                    
+                    // Per Jira MHWC-196: Log when patient moves from due list to completed list
+                    if (!wasCompletedBefore && isCompletedNow) {
+                        Timber.d("ANC Visit Completed: Patient $patientID, ANC Visit ${ancCache.visitNumber} completed. " +
+                                "Moving from ANC ${ancCache.visitNumber} due list to completed list.")
+                    }
+                    
                     maternalHealthRepo.persistAncRecord(ancCache)
+                    
+                    // PER-163: Ensure Registration Record is updated and persisted
+                    if (::registerRecord.isInitialized) {
+                        // Apply HRP update
+                        if (ancCache.anyHighRisk == true) {
+                            registerRecord.isHrp = true
+                            if (registerRecord.processed != "N") registerRecord.processed = "U"
+                            registerRecord.syncState = SyncState.UNSYNCED
+                            registerRecord.updatedDate = System.currentTimeMillis()
+                        }
+                        
+                        maternalHealthRepo.persistRegisterRecord(registerRecord)
+                    } else {
+                        // Fallback if not initialized (though it should be)
+                         maternalHealthRepo.getSavedRegistrationRecord(patientID)?.let {
+                            var changed = false
+                            if (it.syncState == SyncState.UNSYNCED) changed = true
+                            
+                            if (ancCache.anyHighRisk == true) {
+                                it.isHrp = true
+                                if (it.processed != "N") it.processed = "U"
+                                it.syncState = SyncState.UNSYNCED
+                                it.updatedDate = System.currentTimeMillis()
+                                changed = true
+                            }
+                            
+                            if (changed) maternalHealthRepo.persistRegisterRecord(it)
+                         }
+                    }
+                    
+                    if (isCompletedNow) {
+                        maternalHealthRepo.getSavedRegistrationRecord(patientID)?.let {
+                            if (!it.isFirstAncSubmitted) {
+                                it.isFirstAncSubmitted = true
+                                if (it.processed != "N") it.processed = "U"
+                                it.syncState = SyncState.UNSYNCED
+                                it.updatedDate = System.currentTimeMillis()
+                                maternalHealthRepo.persistRegisterRecord(it)
+                                Timber.d("Setting isFirstAncSubmitted to true for patient $patientID")
+                            }
+                        }
+                    }
                     if (ancCache.pregnantWomanDelivered == true) {
-
+                        val patient = patientRepo.getPatient(patientID)
+                        patient.statusOfWomanID = 3 // Post Natal Mother
+                        patient.syncState = SyncState.UNSYNCED
+                        patientRepo.updateRecord(patient)
+                        shouldTriggerBeneficiarySyncAfterSave = true
+                        Timber.d("ANC delivered=true for patient $patientID, marked postnatal and queued beneficiary sync")
                     } else if (ancCache.isAborted) {
 
                         maternalHealthRepo.getSavedRegistrationRecord(patientID)?.let {
@@ -141,6 +350,23 @@ class PwAncFormViewModel @Inject constructor(
                             }
                             maternalHealthRepo.updateAncRecord(toTypedArray())
                         }
+                        try {
+                            val patient = patientRepo.getPatient(patientID)
+                            if (patient.statusOfWomanID != 1) {
+                                patient.statusOfWomanID = 1 // Eligible Couple — fresh start after abortion
+                                patient.syncState = SyncState.UNSYNCED
+                                patientRepo.updateRecord(patient)
+                            }
+                            // Clear pregnancy markers and keep (or recreate) one active ECT row,
+                            // so the EC-tracking DAO (filters on isActive = 1) still surfaces her
+                            // after statusOfWomanID is reset to 1.
+                            val createdBy = userRepo.getLoggedInUser()?.userName ?: "system"
+                            ecrRepo.resetEctAfterAbortion(patientID, createdBy)
+                            shouldTriggerBeneficiarySyncAfterSave = true
+                            shouldTriggerEctSyncAfterSave = true
+                        } catch (e: Exception) {
+                            Timber.e(e, "Abortion EC transition failed for $patientID")
+                        }
 
 
                     } else if (ancCache.maternalDeath == true) {
@@ -177,6 +403,23 @@ class PwAncFormViewModel @Inject constructor(
     fun getIndexOfTT1(): Int = dataset.getIndexOfTd1()
     fun getIndexOfTT2(): Int = dataset.getIndexOfTd2()
     fun getIndexOfTTBooster(): Int = dataset.getIndexOfTdBooster()
+    
+    fun getPatientID(): String = patientID
 
+    fun resetAlertMessage() {
+        viewModelScope.launch { dataset.resetErrorMessageFlow() }
+    }
+
+    fun shouldTriggerBeneficiarySyncAfterSave(): Boolean = shouldTriggerBeneficiarySyncAfterSave
+
+    fun consumeBeneficiarySyncTrigger() {
+        shouldTriggerBeneficiarySyncAfterSave = false
+    }
+
+    fun shouldTriggerEctSyncAfterSave(): Boolean = shouldTriggerEctSyncAfterSave
+
+    fun consumeEctSyncTrigger() {
+        shouldTriggerEctSyncAfterSave = false
+    }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormFragment.kt
new file mode 100644
index 000000000..91b7d9a45
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormFragment.kt
@@ -0,0 +1,480 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.pregnant_women_registration.form
+
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentPregnancyRegistrationFormBinding
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.MODULE_MATERNAL_HEALTH
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.NavigationAdapter
+import org.piramalswasthya.cho.model.InputType
+import org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity
+import org.piramalswasthya.cho.work.WorkerUtils
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PregnantWomanRegistrationFragment : Fragment(), NavigationAdapter {
+
+    private var _binding: FragmentPregnancyRegistrationFormBinding? = null
+    private val binding get() = _binding!!
+
+    @Inject
+    lateinit var userRepo: UserRepo
+
+    private val viewModel: PregnancyRegistrationFormViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentPregnancyRegistrationFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onOptionsItemSelected(item: android.view.MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onCancelAction()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    private val onBackPressedCallback by lazy {
+        object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                onCancelAction()
+            }
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            onBackPressedCallback
+        )
+
+        setupForm()
+        observeViewModel()
+
+        viewModel.benName.observe(viewLifecycleOwner) { name ->
+            binding.tvBenName.text = name ?: ""
+        }
+        viewModel.benAgeGender.observe(viewLifecycleOwner) { ageGender ->
+            binding.tvAgeGender.text = ageGender ?: ""
+        }
+
+        binding.tvCaseId.text = viewModel.patientID ?: ""
+        binding.llCaseIdRow.visibility = View.VISIBLE
+
+        binding.btnSubmit.setOnClickListener {
+            submitRegistrationForm()
+        }
+
+        binding.btnCancel.setOnClickListener {
+            onCancelAction()
+        }
+
+        binding.fabEdit.setOnClickListener {
+            viewModel.setRecordExist(false)
+        }
+    }
+
+    private fun setupForm() {
+        viewModel.recordExists.observe(viewLifecycleOwner) { exists ->
+            // Skip UI updates if we are in process of saving/navigating to prevent flickering
+            if (viewModel.state.value == PregnancyRegistrationFormViewModel.State.SAVING) return@observe
+            
+            val isReadOnly = viewModel.isReadOnly.value ?: false
+            val title = if (exists) {
+                getString(R.string.title_view_pregnancy_registration)
+            } else {
+                getString(R.string.title_register_pregnancy)
+            }
+            (activity as? AppCompatActivity)?.supportActionBar?.title = title
+            activity?.findViewById<View>(R.id.bottom_navigation)?.visibility = View.GONE
+            
+            binding.fabEdit.visibility = if (exists && !isReadOnly) View.VISIBLE else View.GONE
+            binding.btnSubmit.visibility = if (exists) View.GONE else View.VISIBLE
+            val adapter = FormInputAdapter(
+                formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                    viewModel.updateListOnValueChanged(formId, index)
+                    handleFormFieldChange(formId)
+                },
+                isEnabled = !exists
+            )
+
+            binding.form.rvInputForm.adapter = adapter
+
+            lifecycleScope.launch {
+                viewModel.formList.collect { list ->
+                    if (list.isNotEmpty()) {
+                        val processedList = if (exists) {
+                            list.map { item ->
+                                if (item.inputType == InputType.CHECKBOXES) {
+                                    item.copy(inputType = InputType.TEXT_VIEW)
+                                } else item
+                            }
+                        } else list
+                        adapter.submitList(processedList)
+                    }
+                }
+            }
+        }
+        
+        viewModel.isReadOnly.observe(viewLifecycleOwner) { isReadOnly ->
+            if (viewModel.state.value == PregnancyRegistrationFormViewModel.State.SAVING) return@observe
+            
+            val exists = viewModel.recordExists.value ?: false
+            binding.fabEdit.visibility = if (exists && !isReadOnly) View.VISIBLE else View.GONE
+        }
+    }
+
+    /**
+     * Handle form field changes and update UI accordingly
+     */
+    private fun handleFormFieldChange(formId: Int) {
+        val layoutManager = binding.form.rvInputForm.layoutManager as? LinearLayoutManager ?: return
+        val adapter = binding.form.rvInputForm.adapter ?: return
+        val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
+        val offset = binding.form.rvInputForm.getChildAt(0)?.top ?: 0
+
+        when (formId) {
+            14 -> handleComplicationsFieldChange(adapter)
+            15, 16 -> handleAnthropometryFieldChange(adapter)
+            18 -> handlePreExistingConditionsFieldChange(adapter)
+            19, 21, 23 -> handleTestResultFieldChange(formId, adapter, layoutManager, firstVisiblePosition, offset)
+            5 -> handleLmpFieldChange(adapter)
+            10 -> handleGravidaFieldChange(adapter)
+        }
+    }
+
+    /**
+     * Handle complications field change
+     */
+    private fun handleComplicationsFieldChange(adapter: RecyclerView.Adapter<*>) {
+        val complicationsIndex = viewModel.getIndexOfComplications()
+        if (complicationsIndex >= 0) {
+            adapter.notifyItemChanged(complicationsIndex)
+        }
+    }
+
+    /**
+     * Handle anthropometry (height/weight) field change
+     */
+    private fun handleAnthropometryFieldChange(adapter: RecyclerView.Adapter<*>) {
+        val bmiPosition = viewModel.getIndexOfBmi()
+        if (bmiPosition >= 0) {
+            adapter.notifyItemChanged(bmiPosition)
+        }
+    }
+
+    /**
+     * Handle pre-existing conditions field change
+     */
+    private fun handlePreExistingConditionsFieldChange(adapter: RecyclerView.Adapter<*>) {
+        val preExistingConditionsIndex = viewModel.getIndexOfPreExistingConditions()
+        if (preExistingConditionsIndex >= 0) {
+            adapter.notifyItemChanged(preExistingConditionsIndex)
+        }
+    }
+
+    /**
+     * Handle test result field change (VDRL/RPR, HIV, HBsAg)
+     */
+    private fun handleTestResultFieldChange(
+        formId: Int,
+        adapter: RecyclerView.Adapter<*>, // Corrected this line
+        layoutManager: LinearLayoutManager,
+        firstVisiblePosition: Int,
+        offset: Int
+    ) {
+        // Force immediate UI update for date fields
+        lifecycleScope.launch {
+            delay(100)
+            adapter.notifyDataSetChanged()
+            layoutManager.scrollToPositionWithOffset(firstVisiblePosition, offset)
+        }
+
+        // Handle test date field update
+        val testDateFieldId = getTestDateFieldId(formId)
+        if (testDateFieldId != -1) {
+            val testDateIndex = viewModel.getIndexOfTestDate(testDateFieldId)
+            if (testDateIndex >= 0) {
+                adapter.notifyItemChanged(testDateIndex)
+            } else {
+                adapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    /**
+     * Get test date field ID based on test result field ID
+     */
+    private fun getTestDateFieldId(testResultFieldId: Int): Int {
+        return when (testResultFieldId) {
+            19 -> 20 // vdrlRprDate.id
+            21 -> 22 // hivTestDate.id
+            23 -> 24 // hbsAgTestDate.id
+            else -> -1
+        }
+    }
+
+    /**
+     * Handle LMP field change
+     */
+    private fun handleLmpFieldChange(adapter: RecyclerView.Adapter<*>) {
+        adapter.notifyItemChanged(viewModel.getIndexOfEdd())
+        adapter.notifyItemChanged(viewModel.getIndexOfGestationalAge())
+        adapter.notifyItemChanged(viewModel.getIndexOfTrimester())
+    }
+
+    /**
+     * Handle Gravida field change
+     */
+    private fun handleGravidaFieldChange(adapter: RecyclerView.Adapter<*>) {
+        adapter.notifyItemChanged(viewModel.getIndexOfPara())
+        adapter.notifyDataSetChanged()
+    }
+
+    private fun observeViewModel() {
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                PregnancyRegistrationFormViewModel.State.IDLE -> Unit
+
+                PregnancyRegistrationFormViewModel.State.SAVING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                    
+                    // Immediately update activity title to Vitals for faster feedback
+                    requireActivity().findViewById<android.widget.TextView>(R.id.header_text_register_patient)?.text = getString(R.string.vitals_text)
+                }
+
+                PregnancyRegistrationFormViewModel.State.SAVE_SUCCESS -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(context, "Registration Successful", Toast.LENGTH_LONG).show()
+                }
+
+                PregnancyRegistrationFormViewModel.State.SAVE_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(context, "Save failed", Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+
+        // Observe alerts from ViewModel
+        viewModel.showAlert.observe(viewLifecycleOwner) { message ->
+            message?.let { alertMessage ->
+                // Show the alert dialog
+                AlertDialog.Builder(requireContext())
+                    .setTitle(getString(R.string.alert_popup))
+                    .setMessage(alertMessage)
+                    .setPositiveButton("OK") { dialog, _ ->
+                        dialog.dismiss()
+                        // Clear the alert after showing
+                        viewModel.clearAlert()
+                    }
+                    .setCancelable(false)
+                    .show()
+
+                // Log for debugging
+                Timber.d("Alert shown: $alertMessage")
+            }
+        }
+
+        viewModel.initErrorMessage.observe(viewLifecycleOwner) { message ->
+            message?.let { errorMessage ->
+                AlertDialog.Builder(requireContext())
+                    .setTitle(getString(R.string.alert_popup))
+                    .setMessage(errorMessage)
+                    .setPositiveButton(getString(R.string.ok_button)) { dialog, _ ->
+                        dialog.dismiss()
+                        viewModel.clearInitError()
+                        findNavController().navigateUp()
+                    }
+                    .setCancelable(false)
+                    .show()
+            }
+        }
+
+        // Observe navigation events
+        viewModel.navigateTo.observe(viewLifecycleOwner) { event ->
+            event?.let { navigationEvent ->
+                when (navigationEvent) {
+                    is PregnancyRegistrationFormViewModel.NavigationEvent.ToEligibleCouple -> {
+                        if (navigationEvent.showSuccessToast) {
+                            Toast.makeText(context, "Registration Successful", Toast.LENGTH_LONG).show()
+                        }
+                        findNavController().navigateUp()
+                        viewModel.clearNavigation()
+                    }
+
+                    is PregnancyRegistrationFormViewModel.NavigationEvent.NavigateUp -> {
+                        WorkerUtils.triggerPregnantWomanRegistrationSync(requireContext())
+                        if (isFromEligibleCoupleTracking()) {
+                            navigateToMaternalHealthFromEct()
+                        } else {
+                            findNavController().navigateUp()
+                        }
+                        viewModel.clearNavigation()
+                    }
+
+                    is PregnancyRegistrationFormViewModel.NavigationEvent.ToVitalsAndPrescription -> {
+                        findNavController().navigateUp()
+                        viewModel.clearNavigation()
+                    }
+
+                    is PregnancyRegistrationFormViewModel.NavigationEvent.ToVitalsActivity -> {
+                        WorkerUtils.triggerPregnantWomanRegistrationSync(requireContext())
+                        // Force content to be hidden during navigation to prevent flickering
+                        binding.llContent.visibility = View.GONE
+                        binding.pbForm.visibility = View.VISIBLE
+                        
+                        if (navigationEvent.showSuccessToast) {
+                            Toast.makeText(context, "Registration Successful", Toast.LENGTH_LONG).show()
+                        }
+                        
+                        val activity = requireActivity()
+                        if (activity is org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity) {
+                            // If already in EditPatientDetailsActivity, just navigate to the Vitals fragment
+                            val masterDb = org.piramalswasthya.cho.model.MasterDb(navigationEvent.benVisitInfo.patient.patientID).apply {
+                                visitMasterDb.category = "RMNCH"
+                                visitMasterDb.subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.careAndPreg
+                                visitMasterDb.reason = org.piramalswasthya.cho.ui.commons.DropdownConst.anc
+                            }
+                            findNavController().navigate(
+                                R.id.customVitalsFragment,
+                                Bundle().apply {
+                                    putSerializable("MasterDb", masterDb)
+                                }
+                            )
+                        } else {
+                            // Otherwise start the activity
+                            val intent = android.content.Intent(
+                                activity,
+                                org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity::class.java
+                            )
+                            intent.putExtra("benVisitInfo", navigationEvent.benVisitInfo)
+                            intent.putExtra("navigateTo", "VITALS")
+                            startActivity(intent)
+                        }
+                        viewModel.clearNavigation()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun submitRegistrationForm() {
+        if (validateForm()) {
+            viewModel.saveForm()
+        }
+    }
+
+    private fun validateForm(): Boolean {
+        val adapter = binding.form.rvInputForm.adapter as? FormInputAdapter
+        if (adapter == null) {
+            Timber.e("Form adapter is null")
+            return false
+        }
+
+        if (!viewModel.validateHeight()) {
+            val heightIndex = viewModel.getIndexOfHeight()
+            if (heightIndex >= 0) {
+                adapter.notifyItemChanged(heightIndex)
+                binding.form.rvInputForm.scrollToPosition(heightIndex)
+                return false
+            }
+        }
+
+        val result = adapter.validateInput(resources)
+        Timber.d("Validation result = $result")
+
+        return if (result == -1) {
+            true
+        } else {
+            binding.form.rvInputForm.scrollToPosition(result)
+            false
+        }
+    }
+    override fun onSubmitAction() {
+        submitRegistrationForm()
+    }
+
+    override fun onCancelAction() {
+        val fromVisitDetails = arguments?.getBoolean("fromVisitDetails", false) ?: false
+        if (fromVisitDetails) {
+            try {
+                findNavController().popBackStack(R.id.fhirVisitDetailsFragment, false)
+            } catch (e: Exception) {
+                Timber.e(e, "Navigation back to Visit Details failed")
+                if (!findNavController().navigateUp()) {
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+            }
+            return
+        }
+
+        if (isFromEligibleCoupleTracking()) {
+            navigateToMaternalHealthFromEct()
+            return
+        }
+
+        if (!findNavController().navigateUp()) {
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+    }
+
+    private fun isFromEligibleCoupleTracking(): Boolean {
+        if (arguments?.getBoolean("fromECT", false) == true) return true
+        return findNavController().currentBackStackEntry?.arguments?.getBoolean("fromECT", false) == true
+    }
+
+    private fun navigateToMaternalHealthFromEct() {
+        val activity = requireActivity()
+        if (activity is SubModuleActivity) {
+            activity.navigateToMaternalHealthCards()
+            return
+        }
+        val intent = SubModuleActivity.getIntent(requireContext(), MODULE_MATERNAL_HEALTH).apply {
+            flags = android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP or android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP
+        }
+        startActivity(intent)
+        activity.finish()
+    }
+
+    override fun getFragmentId(): Int = R.id.pregnantWomanRegistrationFragment
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormViewModal.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormViewModal.kt
new file mode 100644
index 000000000..9864e1eca
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/maternal_health/pwr/form/PregnancyRegistrationFormViewModal.kt
@@ -0,0 +1,305 @@
+package org.piramalswasthya.cho.ui.commons.maternal_health.pregnant_women_registration.form
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.configuration.PregnantWomanRegistrationDataset
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class PregnancyRegistrationFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val userRepo: UserRepo
+) : ViewModel() {
+    companion object {
+        private const val STATUS_PREGNANT_WOMAN = 2
+    }
+
+    enum class State {
+        IDLE, SAVING, SAVE_SUCCESS, SAVE_FAILED
+    }
+
+    // Add LiveData for showing alerts
+    private val _showAlert = MutableLiveData<String?>()
+    val showAlert: LiveData<String?> get() = _showAlert
+
+    // Add navigation events
+    private val _navigateTo = MutableLiveData<NavigationEvent?>()
+    val navigateTo: LiveData<NavigationEvent?> get() = _navigateTo
+
+    sealed class NavigationEvent {
+        data class ToEligibleCouple(val patientID: String, val showSuccessToast: Boolean = false) : NavigationEvent()
+        object ToVitalsAndPrescription : NavigationEvent()
+        data class ToVitalsActivity(
+            val benVisitInfo: org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo,
+            val showSuccessToast: Boolean = false
+        ) : NavigationEvent()
+        object NavigateUp : NavigationEvent()
+    }
+
+    val patientID: String? = savedStateHandle["patientID"]
+
+    private val _state = MutableLiveData(State.IDLE)
+    val state: LiveData<State>
+        get() = _state
+
+    private val _benName = MutableLiveData<String>()
+    val benName: LiveData<String>
+        get() = _benName
+
+    private val _benAgeGender = MutableLiveData<String>()
+    val benAgeGender: LiveData<String>
+        get() = _benAgeGender
+
+    private val _recordExists = MutableLiveData<Boolean>()
+    val recordExists: LiveData<Boolean>
+        get() = _recordExists
+
+    private val _isReadOnly = MutableLiveData<Boolean>(false)
+    val isReadOnly: LiveData<Boolean>
+        get() = _isReadOnly
+
+    private val _initErrorMessage = MutableLiveData<String?>()
+    val initErrorMessage: LiveData<String?> get() = _initErrorMessage
+
+    fun clearInitError() { _initErrorMessage.value = null }
+
+    private val dataset = PregnantWomanRegistrationDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+
+    private lateinit var registrationCache: PregnantWomanRegistrationCache
+
+    init {
+        viewModelScope.launch {
+            try {
+                val asha = userRepo.getLoggedInUser()
+                if (asha == null) {
+                    Timber.e("PregnancyRegistrationFormViewModel: no logged-in user found")
+                    _initErrorMessage.postValue(context.getString(R.string.form_session_expired))
+                    return@launch
+                }
+
+                val patientDeferred = async { patientID?.let { patientRepo.getPatientDisplay(it) } }
+                val recordDeferred = async { patientID?.let { maternalHealthRepo.getSavedRegistrationRecord(it) } }
+
+                val patient = patientDeferred.await()
+                val existingRecord = recordDeferred.await()
+
+                patient?.let { ben ->
+                    _benName.value = "${ben.patient.firstName} ${ben.patient.lastName ?: ""}"
+                    _benAgeGender.value = "${ben.patient.age} ${ben.ageUnit?.name} | ${ben.gender?.genderName}"
+
+                    if (existingRecord != null) {
+                        val completedAncRecords = maternalHealthRepo.getCompletedActiveAncRecords(patientID!!)
+                        val hasCompletedAnc = completedAncRecords.isNotEmpty()
+
+                        if (existingRecord.isFirstAncSubmitted && !hasCompletedAnc) {
+                            Timber.w("Validation Fixed: isFirstAncSubmitted was true but no ANC completed. Resetting flag.")
+                            existingRecord.isFirstAncSubmitted = false
+                            maternalHealthRepo.persistRegisterRecord(existingRecord)
+                        } else if (!existingRecord.isFirstAncSubmitted && hasCompletedAnc) {
+                            Timber.w("Validation Fixed: ANC completed but isFirstAncSubmitted was false. Setting flag.")
+                            existingRecord.isFirstAncSubmitted = true
+                            maternalHealthRepo.persistRegisterRecord(existingRecord)
+                        }
+
+                        // Use existing record
+                        registrationCache = existingRecord
+                        _recordExists.value = true
+                        Timber.d("Existing registration record found for patient: ${ben.patient.patientID}")
+                    } else {
+                        // Create new record
+                        registrationCache = createNewRegistrationCache(ben, asha.userName)
+                        _recordExists.value = false
+                        Timber.d("Creating new registration record for patient: ${ben.patient.patientID}")
+                    }
+
+                    // Setup dataset callbacks BEFORE setting up the page
+                    setupDatasetCallbacks()
+
+                    // Set up form dataset with all required parameters
+                    dataset.setUpPage(
+                        ben = ben,
+                        savedRecord = if (_recordExists.value == true) registrationCache else null
+                    )
+                    _isReadOnly.value = dataset.isFormReadOnly
+                } ?: run {
+                    Timber.e("Patient not found for ID: $patientID")
+                    _initErrorMessage.postValue(context.getString(R.string.form_patient_not_found))
+                    _recordExists.postValue(false)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing PregnancyRegistrationFormViewModel")
+                _initErrorMessage.postValue(context.getString(R.string.form_load_failed))
+                _recordExists.postValue(false)
+            }
+        }
+    }
+
+    /** True when form is locked (first ANC already submitted). Used for back navigation to home. */
+    fun isFormReadOnly(): Boolean = dataset.isFormReadOnly
+    
+    fun validateHeight(): Boolean = dataset.validateHeightStrict()
+
+    fun getIndexOfEdd(): Int = dataset.getIndexById(6)
+    fun getIndexOfGestationalAge(): Int = dataset.getIndexById(7)
+    fun getIndexOfTrimester(): Int = dataset.getIndexById(8)
+    fun getIndexOfPara(): Int = dataset.getIndexById(dataset.getParaId())
+    fun getIndexOfComplications(): Int = dataset.getIndexById(14)
+    fun getIndexOfPreExistingConditions(): Int = dataset.getIndexById(18)
+    fun getIndexOfBmi(): Int = dataset.getIndexById(dataset.getBmiId())
+    fun getIndexOfHeight(): Int = dataset.getIndexById(15)
+
+    // Helper method to get index of any test date by ID
+    fun getIndexOfTestDate(testDateId: Int): Int = dataset.getIndexById(testDateId)
+
+    private fun createNewRegistrationCache(ben: PatientDisplay, userName: String): PregnantWomanRegistrationCache {
+        // Use the dataset's helper method and update user fields
+        val cache = dataset.createDefaultRegistrationCache(ben)
+        cache.createdBy = userName
+        cache.updatedBy = userName
+        return cache
+    }
+
+    private fun setupDatasetCallbacks() {
+        // Setup alert callback
+        dataset.onShowAlert = { message ->
+            _showAlert.postValue(message)
+        }
+
+        // Setup navigation callbacks
+        dataset.onNavigateToEligibleCouple = {
+            patientID?.let { id ->
+                _navigateTo.postValue(NavigationEvent.ToEligibleCouple(patientID = id, showSuccessToast = true))
+            }
+        }
+
+        dataset.onNavigateToVitalsAndPrescription = {
+            _navigateTo.postValue(NavigationEvent.ToVitalsAndPrescription)
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        viewModelScope.launch {
+            try {
+                dataset.updateList(formId, index)
+
+                // Log specific form field changes for debugging
+                when (formId) {
+                    5 -> Timber.d("LMP field changed") // lmp.id
+                    10 -> Timber.d("Gravida field changed") // gravida.id
+                    14 -> Timber.d("Complications in previous pregnancy changed") // complicationsInPreviousPregnancy.id
+                    15, 16 -> Timber.d("Height or Weight changed") // height.id or weight.id
+                    18 -> Timber.d("Pre-existing conditions changed") // preExistingConditions.id
+                    19 -> Timber.d("VDRL/RPR result changed") // vdrlRprResult.id
+                    21 -> Timber.d("HIV result changed") // hivResult.id
+                    23 -> Timber.d("HBsAg result changed") // hbsAgResult.id
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error updating list on value changed")
+            }
+        }
+    }
+
+    fun saveForm() {
+        viewModelScope.launch {
+            try {
+                _state.postValue(State.SAVING)
+
+                // Check for UPT Negative Flow first
+                if (dataset.shouldNavigateToEligibleCouple()) {
+                    patientID?.let { id ->
+                        _navigateTo.postValue(NavigationEvent.ToEligibleCouple(patientID = id, showSuccessToast = true))
+                    }
+                    _state.postValue(State.IDLE) 
+                    return@launch
+                }
+
+                // Check if patientID is available
+                check(this@PregnancyRegistrationFormViewModel::registrationCache.isInitialized) {
+                    "Registration cache not initialized"
+                }
+
+                // Update timestamps
+                registrationCache.updatedDate = System.currentTimeMillis()
+
+                // If it's a new record, set created date
+                if (_recordExists.value != true) {
+                    registrationCache.createdDate = System.currentTimeMillis()
+                }
+
+                // Refresh isFirstAncSubmitted to avoid overwriting newer ANC state
+                maternalHealthRepo.getSavedRegistrationRecord(registrationCache.patientID)?.let { latest ->
+                    registrationCache.isFirstAncSubmitted = latest.isFirstAncSubmitted
+                }
+
+                // Map form values to cache
+                dataset.mapValues(registrationCache, 1) // Assuming pageNumber = 1
+                registrationCache.syncState = SyncState.UNSYNCED
+                registrationCache.processed =
+                    if (registrationCache.processed == "N") "N" else "U"
+
+                // Save to repository
+                maternalHealthRepo.persistRegisterRecord(registrationCache)
+                updatePatientStatusToPregnant(registrationCache.patientID)
+
+                Timber.d("Pregnancy registration saved successfully for patient: ${registrationCache.patientID}")
+
+                _recordExists.postValue(true)
+                _state.postValue(State.SAVE_SUCCESS)
+                _navigateTo.postValue(NavigationEvent.NavigateUp)
+            } catch (e: Exception) {
+                Timber.e(e, "Saving pregnancy registration data failed!!")
+                _state.postValue(State.SAVE_FAILED)
+            }
+        }
+    }
+
+    private suspend fun updatePatientStatusToPregnant(patientID: String) {
+        try {
+            val patient = patientRepo.getPatient(patientID)
+            if (patient.statusOfWomanID != STATUS_PREGNANT_WOMAN) {
+                patient.statusOfWomanID = STATUS_PREGNANT_WOMAN
+                patient.syncState = SyncState.UNSYNCED
+                patientRepo.updateRecord(patient)
+                Timber.d("Patient status updated to Pregnant Woman for patientId=$patientID")
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to update patient status to Pregnant Woman for patientId=$patientID")
+        }
+    }
+
+    fun setRecordExist(b: Boolean) {
+        _recordExists.value = b
+    }
+
+    // Clear alert after showing
+    fun clearAlert() {
+        _showAlert.value = null
+    }
+
+    // Clear navigation after handling
+    fun clearNavigation() {
+        _navigateTo.value = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsFragment.kt
index 2c757c9d5..e81e252ad 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsFragment.kt
@@ -2,6 +2,9 @@ package org.piramalswasthya.cho.ui.commons.personal_details
 
 import android.Manifest
 import android.app.AlertDialog
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
@@ -25,6 +28,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
 import android.widget.CheckBox
 import android.widget.EditText
 import android.widget.ImageView
@@ -33,12 +38,14 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.checkSelfPermission
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.bumptech.glide.Glide
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -49,14 +56,24 @@ import com.google.mediapipe.tasks.core.BaseOptions
 import com.google.mediapipe.tasks.vision.core.RunningMode
 import com.google.mediapipe.tasks.vision.facedetector.FaceDetector
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.adapter.PatientItemAdapter
 import org.piramalswasthya.cho.adapter.ApiSearchAdapter
 import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.database.room.dao.VillageMasterDao
+import org.piramalswasthya.cho.database.room.dao.StateMasterDao
+import org.piramalswasthya.cho.database.room.dao.DistrictMasterDao
+import org.piramalswasthya.cho.database.room.dao.BlockMasterDao
+import org.piramalswasthya.cho.model.VillageMaster
+import org.piramalswasthya.cho.model.StateMaster
+import org.piramalswasthya.cho.model.DistrictMaster
+import org.piramalswasthya.cho.model.BlockMaster
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.databinding.FragmentPersonalDetailsBinding
 import org.piramalswasthya.cho.facenet.FaceNetModel
@@ -72,14 +89,14 @@ import org.piramalswasthya.cho.repositories.CaseRecordeRepo
 import org.piramalswasthya.cho.repositories.VisitReasonsAndCategoriesRepo
 import org.piramalswasthya.cho.repositories.VitalsRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.ProcedureRepo
 import org.piramalswasthya.cho.repositories.UserRepo
-import org.piramalswasthya.cho.network.NetworkResult
 import org.piramalswasthya.cho.ui.abha_id_activity.AbhaIdActivity
 import org.piramalswasthya.cho.ui.commons.SpeechToTextContract
 import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity
 import org.piramalswasthya.cho.ui.home.HomeViewModel
 import org.piramalswasthya.cho.ui.register_patient_activity.RegisterPatientActivity
-import org.piramalswasthya.cho.ui.web_view_activity.WebViewActivity
+import org.piramalswasthya.cho.utils.ESanjeevaniLauncher
 import timber.log.Timber
 import org.json.JSONObject
 import org.json.JSONArray
@@ -110,7 +127,6 @@ class PersonalDetailsFragment : Fragment() {
     lateinit var amritApiService: AmritApiService
     private lateinit var viewModel: PersonalDetailsViewModel
     private lateinit var viewModelPatientDetails: PatientDetailsViewModel
-    private var patient = Patient()
     private lateinit var networkConnection: NetworkConnection
     private var isNetworkAvailable = false
     private var itemAdapter: PatientItemAdapter? = null
@@ -120,9 +136,15 @@ class PersonalDetailsFragment : Fragment() {
     private var errorEs: String = ""
     private var network: Boolean = false
     private var currentFileName: String? = null
-    private lateinit var photoURI: Uri
+    private var photoURI: Uri? = null
     private var currentPhotoPath: String? = null
     private var isShowingSearchResults: Boolean = false
+    private var currentSearchQuery: String = ""
+    private var searchJob: Job? = null
+    private var hasReceivedInitialPatientList = false
+    private var skeletonPulseAnimation: AlphaAnimation? = null
+
+    private val prescriptionChannelId = "prescription_download"
 
     //facenet
     private val useGpu = false
@@ -153,9 +175,29 @@ class PersonalDetailsFragment : Fragment() {
     @Inject
     lateinit var userRepo: UserRepo
 
+    @Inject
+    lateinit var procedureRepo: ProcedureRepo
+
+    @Inject
+    lateinit var villageMasterDao: VillageMasterDao
+
+    @Inject
+    lateinit var stateMasterDao: StateMasterDao
+
+    @Inject
+    lateinit var districtMasterDao: DistrictMasterDao
+
+    @Inject
+    lateinit var blockMasterDao: BlockMasterDao
+
     private var _binding: FragmentPersonalDetailsBinding? = null
     private var patientCount: Int = 0
 
+    private fun isDoctorWorkflowRoleForCardAccess(): Boolean {
+        return preferenceDao.isDoctorSelected() ||
+                (preferenceDao.isUserCHO() && preferenceDao.isNurseSelected())
+    }
+
     private val binding
         get() = _binding!!
 
@@ -166,17 +208,33 @@ class PersonalDetailsFragment : Fragment() {
             .create()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        photoURI?.let { outState.putParcelable("photoURI", it) }
+        outState.putString("currentFileName", currentFileName)
+        outState.putString("currentPhotoPath", currentPhotoPath)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
+        if (savedInstanceState != null) {
+            @Suppress("DEPRECATION")
+            photoURI = savedInstanceState.getParcelable("photoURI")
+            currentFileName = savedInstanceState.getString("currentFileName")
+            currentPhotoPath = savedInstanceState.getString("currentPhotoPath")
+        }
         HomeViewModel.resetSearchBool()
         _binding = FragmentPersonalDetailsBinding.inflate(inflater, container, false)
         return binding.root
     }
 
+
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        hasReceivedInitialPatientList = false
+        showCardSkeletonLoader()
 
         networkConnection = NetworkConnection(requireContext())
 
@@ -268,7 +326,8 @@ class PersonalDetailsFragment : Fragment() {
                                         // No-Op: Registrar sees nothing here for now
                                     }
 
-                                    benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 2 && preferenceDao.isDoctorSelected() -> {
+                                    benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 2 &&
+                                            isDoctorWorkflowRoleForCardAccess() -> {
 
                                         Toast.makeText(
                                             requireContext(),
@@ -277,28 +336,52 @@ class PersonalDetailsFragment : Fragment() {
                                         ).show()
                                     }
 
-                                    benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 9 && preferenceDao.isDoctorSelected() -> {
+                                    benVisitInfo.nurseFlag == 9 && benVisitInfo.doctorFlag == 9 &&
+                                            isDoctorWorkflowRoleForCardAccess() -> {
 
                                         var modifiedInfo = benVisitInfo
-                                        if (preferenceDao.isNurseSelected()) {
+                                        if (preferenceDao.isNurseSelected() && !preferenceDao.isUserCHO()) {
                                             modifiedInfo = PatientDisplayWithVisitInfo(benVisitInfo)
                                         }
+                                        val isPendingAtPharmacist = (benVisitInfo.pharmacist_flag ?: 0) == 1
+
+                                        val intent = Intent(
+                                            context, EditPatientDetailsActivity::class.java
+                                        ).apply {
+                                            putExtra("benVisitInfo", modifiedInfo)
+                                            // Pending pharmacist is not a closed case; keep editable doctor flow.
+                                            putExtra("viewRecord", !isPendingAtPharmacist)
+                                            putExtra("isFlowComplete", !isPendingAtPharmacist)
+                                        }
+                                        startActivity(intent)
+                                    }
+
+                                    // Lab + pharmacist done: open in view mode so case record shows correct UI (only Close, no plus, no refer)
+                                    benVisitInfo.nurseFlag == 9 && benVisitInfo.pharmacist_flag == 9 &&
+                                            isDoctorWorkflowRoleForCardAccess() -> {
+
+                                        var modifiedInfo = benVisitInfo
+                                        if (preferenceDao.isNurseSelected() && !preferenceDao.isUserCHO()) {
+                                            modifiedInfo = PatientDisplayWithVisitInfo(benVisitInfo)
+                                        }
+                                        val isDoctorLabReviewState =
+                                            benVisitInfo.doctorFlag == 3
 
                                         val intent = Intent(
                                             context, EditPatientDetailsActivity::class.java
                                         ).apply {
                                             putExtra("benVisitInfo", modifiedInfo)
                                             putExtra("viewRecord", true)
-                                            putExtra("isFlowComplete", true)
+                                            // doctorFlag=3 with pharmacist=9 is review/edit cycle, not fully closed.
+                                            putExtra("isFlowComplete", !isDoctorLabReviewState)
                                         }
                                         startActivity(intent)
-                                        requireActivity().finish()
                                     }
 
                                     else -> {
 
                                         var modifiedInfo = benVisitInfo
-                                        if (preferenceDao.isNurseSelected()) {
+                                        if (preferenceDao.isNurseSelected() && !preferenceDao.isUserCHO()) {
                                             modifiedInfo = PatientDisplayWithVisitInfo(benVisitInfo)
                                         }
 
@@ -310,7 +393,6 @@ class PersonalDetailsFragment : Fragment() {
                                             putExtra("isFlowComplete", false)
                                         }
                                         startActivity(intent)
-                                        requireActivity().finish()
                                     }
                                 }
 
@@ -326,12 +408,28 @@ class PersonalDetailsFragment : Fragment() {
 
                             }, { benVisitInfo ->
                                 openDialog(benVisitInfo)
+                            }, { benVisitInfo ->
+
+                                val intent = Intent(requireContext(), RegisterPatientActivity::class.java).apply {
+                                    putExtra("isEdit", true)
+                                    putExtra("patientInfo", benVisitInfo)
+                                }
+                                startActivity(intent)
                             }),
-                            showAbha = true
+                            showAbha = true,
+                            showEditButton = preferenceDao.isNurseSelected() || preferenceDao.isRegistrarSelected()
                         )
                     }
 
                     binding.patientListContainer.patientList.adapter = itemAdapter
+                    binding.patientListContainer.patientList.setHasFixedSize(true)
+                    binding.patientListContainer.patientList.itemAnimator = null
+                    binding.patientListContainer.patientList.setItemViewCacheSize(20)
+                    binding.patientListContainer.patientList.recycledViewPool.setMaxRecycledViews(0, 40)
+                    (binding.patientListContainer.patientList.layoutManager as? LinearLayoutManager)?.apply {
+                        initialPrefetchItemCount = 12
+                        isItemPrefetchEnabled = true
+                    }
 
                     apiSearchAdapter = ApiSearchAdapter(requireContext()) { selectedPatient ->
                         binding.search.text?.clear()
@@ -341,12 +439,12 @@ class PersonalDetailsFragment : Fragment() {
                         val currentCount = itemAdapter?.itemCount ?: patientCount
                         binding.patientListContainer.patientCount.text =
                             currentCount.toString() + getResultStr(currentCount)
-                        hitRegisterApi(selectedPatient)
+                        savePatientFromSearch(selectedPatient)
                     }
 
                     viewModelPatientDetails.isDataSaved.observe(viewLifecycleOwner) { state ->
                         if (state == true) {
-                            WorkerUtils.triggerAmritSyncWorker(requireContext())
+                            WorkerUtils.triggerBeneficiarySync(requireContext())
 
                             Toast.makeText(
                                 requireContext(),
@@ -358,75 +456,19 @@ class PersonalDetailsFragment : Fragment() {
 
                     when {
                         preferenceDao.isRegistrarSelected() || preferenceDao.isNurseSelected() -> {
-                            lifecycleScope.launch {
-                                viewModel.patientListForNurse?.collect {
-                                    itemAdapter?.submitList(it.sortedByDescending { item ->
-                                        item.patient.registrationDate
-                                    })
-                                    patientCount = it.size
-                                    withContext(Dispatchers.Main) {
-                                        if (!isShowingSearchResults) {
-                                            binding.patientListContainer.patientList.adapter = itemAdapter
-                                            binding.patientListContainer.patientCount.text =
-                                                it.size.toString() + getResultStr(it.size)
-                                        }
-                                    }
-                                }
-                            }
+                            observePatientList(viewModel.patientListForNurse)
                         }
 
                         preferenceDao.isDoctorSelected() -> {
-                            lifecycleScope.launch {
-                                viewModel.patientListForDoctor?.collect {
-                                    itemAdapter?.submitList(it.sortedByDescending { item ->
-                                        item.patient.registrationDate
-                                    })
-                                    patientCount = it.size
-                                    withContext(Dispatchers.Main) {
-                                        if (!isShowingSearchResults) {
-                                            binding.patientListContainer.patientList.adapter = itemAdapter
-                                            binding.patientListContainer.patientCount.text =
-                                                it.size.toString() + getResultStr(it.size)
-                                        }
-                                    }
-                                }
-                            }
+                            observePatientList(viewModel.patientListForDoctor)
                         }
 
                         preferenceDao.isLabSelected() -> {
-                            lifecycleScope.launch {
-                                viewModel.patientListForLab?.collect {
-                                    itemAdapter?.submitList(it.sortedByDescending { item ->
-                                        item.patient.registrationDate
-                                    })
-                                    patientCount = it.size
-                                    withContext(Dispatchers.Main) {
-                                        if (!isShowingSearchResults) {
-                                            binding.patientListContainer.patientList.adapter = itemAdapter
-                                            binding.patientListContainer.patientCount.text =
-                                                it.size.toString() + getResultStr(it.size)
-                                        }
-                                    }
-                                }
-                            }
+                            observePatientList(viewModel.patientListForLab)
                         }
 
                         preferenceDao.isPharmaSelected() -> {
-                            lifecycleScope.launch {
-                                viewModel.patientListForPharmacist?.collect {
-                                    itemAdapter?.submitList(it.sortedByDescending { item ->
-                                        item.patient.registrationDate
-                                    })
-                                    patientCount = it.size
-                                    withContext(Dispatchers.Main) {
-                                        if (!isShowingSearchResults) {
-                                            binding.patientListContainer.patientList.adapter = itemAdapter
-                                            binding.patientListContainer.patientCount.text =
-                                                itemAdapter?.itemCount.toString() + getResultStr(itemAdapter?.itemCount)
-                                        }
-                                    }
-                                }
-                            }
+                            observePatientList(viewModel.patientListForPharmacist)
                         }
                     }
 
@@ -465,249 +507,214 @@ class PersonalDetailsFragment : Fragment() {
         }
     }
 
+    private fun observePatientList(listFlow: Flow<List<PatientDisplayWithVisitInfo>>) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            listFlow.collectLatest { list ->
+                itemAdapter?.submitList(list)
+                patientCount = list.size
+                if (!hasReceivedInitialPatientList) {
+                    hideCardSkeletonLoader()
+                }
+                if (!isShowingSearchResults) {
+                    if (list.isEmpty()) {
+                        binding.patientListContainer.patientCount.visibility = View.VISIBLE
+                        binding.patientListContainer.patientCount.text = getString(R.string.no_record_found)
+                    } else {
+                        binding.patientListContainer.patientCount.text = ""
+                        binding.patientListContainer.patientCount.visibility = View.GONE
+                    }
+                }
+            }
+        }
+    }
+
+    private fun showCardSkeletonLoader() {
+        binding.patientListContainer.patientList.visibility = View.INVISIBLE
+        binding.patientListContainer.skeletonContainer.visibility = View.VISIBLE
 
-    private fun setLocationDetails(){
-        val locData = preferenceDao.getUserLocationData()
-        patient.stateID = locData?.stateId
-        patient.districtID = locData?.districtId
-        patient.blockID = locData?.blockId
-        patient.districtBranchID =
-            viewModelPatientDetails.selectedVillage?.districtBranchID?.toInt()
+        if (skeletonPulseAnimation == null) {
+            skeletonPulseAnimation = AlphaAnimation(0.45f, 1f).apply {
+                duration = 700
+                repeatMode = Animation.REVERSE
+                repeatCount = Animation.INFINITE
+            }
+        }
+        binding.patientListContainer.skeletonContainer.startAnimation(skeletonPulseAnimation)
+    }
 
+    private fun hideCardSkeletonLoader() {
+        hasReceivedInitialPatientList = true
+        binding.patientListContainer.skeletonContainer.clearAnimation()
+        binding.patientListContainer.skeletonContainer.visibility = View.GONE
+        binding.patientListContainer.patientList.visibility = View.VISIBLE
     }
 
-    private fun hitRegisterApi(apiPatient: PatientDisplayWithVisitInfo) {
+    private fun savePatientFromSearch(apiPatient: PatientDisplayWithVisitInfo) {
         lifecycleScope.launch {
             try {
-                val existingPatient = withContext(Dispatchers.IO) {
-                    apiPatient.patient.beneficiaryRegID?.let { benRegId ->
-                        patientRepo.getPatientByBenRegId(benRegId)
-                    }
-                }
-
-                if (existingPatient != null && existingPatient.syncState == SyncState.SYNCED) {
-                    withContext(Dispatchers.Main) {
-                        MaterialAlertDialogBuilder(requireContext())
-                            .setTitle("Patient Already Registered")
-                            .setMessage("This patient is already registered in the system.")
-                            .setPositiveButton("OK", null)
-                            .show()
-                    }
-                    return@launch
-                }
-
-                val patientExists = withContext(Dispatchers.IO) {
-                    apiPatient.patient.beneficiaryRegID?.let { benRegId ->
-                        patientDao.existsByBeneficiaryRegId(benRegId)
-                    } ?: false
-                }
-
-                if (patientExists && existingPatient == null) {
-                    val foundPatient = withContext(Dispatchers.IO) {
-                        apiPatient.patient.beneficiaryRegID?.let { benRegId ->
-                            patientRepo.getPatientByBenRegId(benRegId)
-                        }
+                val beneficiaryID = apiPatient.patient.beneficiaryID
+                if (beneficiaryID != null) {
+                    val existingPatient = withContext(Dispatchers.IO) {
+                        patientDao.getBen(beneficiaryID)
                     }
                     
-                    if (foundPatient != null) {
-                        patient = foundPatient.apply {
-                            firstName = apiPatient.patient.firstName
-                            lastName = apiPatient.patient.lastName
-                            beneficiaryRegID = apiPatient.patient.beneficiaryRegID
-                            phoneNo = apiPatient.patient.phoneNo
-                            genderID = apiPatient.patient.genderID
-                            dob = apiPatient.patient.dob
-                            age = apiPatient.patient.age
-                            ageUnitID = apiPatient.patient.ageUnitID
-                            maritalStatusID = apiPatient.patient.maritalStatusID
-                            spouseName = apiPatient.patient.spouseName
-                            parentName = apiPatient.patient.parentName
-                            stateID = apiPatient.patient.stateID
-                            districtID = apiPatient.patient.districtID
-                            blockID = apiPatient.patient.blockID
-                            districtBranchID = apiPatient.patient.districtBranchID
-                            syncState = SyncState.UNSYNCED
-                        }
-                    } else {
+                    if (existingPatient != null) {
                         withContext(Dispatchers.Main) {
                             MaterialAlertDialogBuilder(requireContext())
-                                .setTitle("Patient Already Exists")
-                                .setMessage("This patient already exists in the system. Please refresh the patient list.")
-                                .setPositiveButton("OK", null)
+                                .setTitle(getString(R.string.patient_already_exists))
+                                .setMessage(getString(R.string.patient_already_exists_message, beneficiaryID))
+                                .setPositiveButton(getString(R.string.ok_button), null)
                                 .show()
                         }
                         return@launch
                     }
-                } else {
-                    patient = existingPatient?.apply {
-                        firstName = apiPatient.patient.firstName
-                        lastName = apiPatient.patient.lastName
-                        beneficiaryRegID = apiPatient.patient.beneficiaryRegID
-                        phoneNo = apiPatient.patient.phoneNo
-                        genderID = apiPatient.patient.genderID
-                        dob = apiPatient.patient.dob
-                        age = apiPatient.patient.age
-                        ageUnitID = apiPatient.patient.ageUnitID
-                        maritalStatusID = apiPatient.patient.maritalStatusID
-                        spouseName = apiPatient.patient.spouseName
-                        parentName = apiPatient.patient.parentName
-                        stateID = apiPatient.patient.stateID
-                        districtID = apiPatient.patient.districtID
-                        blockID = apiPatient.patient.blockID
-                        districtBranchID = apiPatient.patient.districtBranchID
-                        syncState = SyncState.UNSYNCED
-                    } ?: Patient(
-                        patientID = generateUuid(),
-                        firstName = apiPatient.patient.firstName,
-                        lastName = apiPatient.patient.lastName,
-                        beneficiaryRegID = apiPatient.patient.beneficiaryRegID,
-                        syncState = SyncState.UNSYNCED,
-                        registrationDate = Date(),
-                        phoneNo = apiPatient.patient.phoneNo,
-                        genderID = apiPatient.patient.genderID,
-                        dob = apiPatient.patient.dob,
-                        age = apiPatient.patient.age,
-                        ageUnitID = apiPatient.patient.ageUnitID,
-                        maritalStatusID = apiPatient.patient.maritalStatusID,
-                        spouseName = apiPatient.patient.spouseName,
-                        parentName = apiPatient.patient.parentName,
-                        stateID = apiPatient.patient.stateID,
-                        districtID = apiPatient.patient.districtID,
-                        blockID = apiPatient.patient.blockID,
-                        districtBranchID = apiPatient.patient.districtBranchID
-                    )
-                }
-
-                val hasRequiredFields = patient.dob != null &&
-                                       patient.genderID != null && 
-                                       patient.districtBranchID != null
-
-                if (!hasRequiredFields) {
-                    withContext(Dispatchers.Main) {
-                        val missingFields = mutableListOf<String>()
-                        if (patient.dob == null) missingFields.add("DOB")
-                        if (patient.genderID == null) missingFields.add("Gender")
-                        if (patient.districtBranchID == null) missingFields.add("Village")
-                        
-                        MaterialAlertDialogBuilder(requireContext())
-                            .setTitle("Incomplete Data")
-                            .setMessage("Patient data is incomplete. Missing: ${missingFields.joinToString(", ")}")
-                            .setPositiveButton("OK", null)
-                            .show()
-                    }
-                    return@launch
                 }
                 
-                if (patient.districtBranchID == null) {
-                    setLocationDetails()
+                var stateID = apiPatient.patient.stateID
+                var districtID = apiPatient.patient.districtID
+                var blockID = apiPatient.patient.blockID
+                var districtBranchID = apiPatient.patient.districtBranchID
+                val villageName = apiPatient.villageName
+                
+                if (districtBranchID == null) {
+                    val locData = preferenceDao.getUserLocationData()
+                    stateID = locData?.stateId
+                    districtID = locData?.districtId
+                    blockID = locData?.blockId
+                    districtBranchID = viewModelPatientDetails.selectedVillage?.districtBranchID?.toInt()
                 }
-
-                withContext(Dispatchers.IO) {
-                    patient.beneficiaryRegID?.let { benRegId ->
-                        val existing = patientRepo.getPatientByBenRegId(benRegId)
-                        if (existing != null && existing.patientID != patient.patientID) {
-                            Timber.w("Found existing patient with same beneficiaryRegID: ${existing.patientID}, using it instead of ${patient.patientID}")
-                            patient.patientID = existing.patientID
+                
+                if (districtBranchID != null && blockID != null && districtID != null && stateID != null && !villageName.isNullOrBlank()) {
+                    withContext(Dispatchers.IO) {
+                        if (stateMasterDao.getStateById(stateID) == null) {
+                            stateMasterDao.insertStates(
+                                StateMaster(
+                                    stateID = stateID,
+                                    stateName = "",
+                                    govtLGDStateID = null
+                                )
+                            )
+                        }
+                        
+                        if (districtMasterDao.getDistrictById(districtID) == null) {
+                            districtMasterDao.insertDistrict(
+                                DistrictMaster(
+                                    districtID = districtID,
+                                    stateID = stateID,
+                                    govtLGDStateID = null,
+                                    govtLGDDistrictID = null,
+                                    districtName = ""
+                                )
+                            )
+                        }
+                        
+                        if (blockMasterDao.getBlockById(blockID) == null) {
+                            blockMasterDao.insertBlock(
+                                BlockMaster(
+                                    blockID = blockID,
+                                    districtID = districtID,
+                                    govtLGDDistrictID = null,
+                                    govLGDSubDistrictID = null,
+                                    blockName = ""
+                                )
+                            )
+                        }
+                        
+                        val existingVillage = villageMasterDao.getVillageById(districtBranchID)
+                        if (existingVillage == null || existingVillage.villageName.isNullOrBlank()) {
+                            villageMasterDao.insertVillage(
+                                VillageMaster(
+                                    districtBranchID = districtBranchID,
+                                    blockID = blockID,
+                                    govtLGDVillageID = null,
+                                    govtLGDSubDistrictID = null,
+                                    villageName = villageName
+                                )
+                            )
+                        } else if (existingVillage.villageName != villageName) {
+                            villageMasterDao.insertVillage(
+                                existingVillage.copy(villageName = villageName)
+                            )
                         }
                     }
-                    patientRepo.insertPatient(patient)
-                }
-
-                val patientDisplay = withContext(Dispatchers.IO) {
-                    patientRepo.getPatientDisplay(patient.patientID)
-                }
-
-                if (patientDisplay?.patient?.syncState == SyncState.SYNCING) {
-                    withContext(Dispatchers.Main) {
-                        MaterialAlertDialogBuilder(requireContext())
-                            .setTitle("Registration In Progress")
-                            .setMessage("This patient is already being registered. Please wait for the registration to complete.")
-                            .setPositiveButton("OK", null)
-                            .show()
-                    }
-                    return@launch
                 }
                 
-                if (patientDisplay?.patient?.syncState == SyncState.SYNCED) {
-                    withContext(Dispatchers.Main) {
-                        MaterialAlertDialogBuilder(requireContext())
-                            .setTitle("Patient Already Registered")
-                            .setMessage("This patient is already registered in the system.")
-                            .setPositiveButton("OK", null)
-                            .show()
+                val patientToSave = Patient(
+                    patientID = generateUuid(),
+                    firstName = apiPatient.patient.firstName,
+                    lastName = apiPatient.patient.lastName,
+                    beneficiaryRegID = apiPatient.patient.beneficiaryRegID,
+                    beneficiaryID = apiPatient.patient.beneficiaryID,
+                    syncState = SyncState.UNSYNCED,
+                    registrationDate = Date(),
+                    phoneNo = apiPatient.patient.phoneNo,
+                    genderID = apiPatient.patient.genderID,
+                    dob = apiPatient.patient.dob,
+                    age = apiPatient.patient.age,
+                    ageUnitID = apiPatient.patient.ageUnitID,
+                    maritalStatusID = apiPatient.patient.maritalStatusID,
+                    spouseName = apiPatient.patient.spouseName,
+                    parentName = apiPatient.patient.parentName,
+                    stateID = stateID,
+                    districtID = districtID,
+                    blockID = blockID,
+                    districtBranchID = districtBranchID,
+                    communityID = apiPatient.patient.communityID,
+                    religionID = apiPatient.patient.religionID,
+                    benImage = apiPatient.patient.benImage,
+                    isNewAbha = apiPatient.patient.isNewAbha,
+                    healthIdDetails = apiPatient.patient.healthIdDetails,
+                    faceEmbedding = apiPatient.patient.faceEmbedding
+                )
+                
+                var saveSuccess = false
+                try {
+                    withContext(Dispatchers.IO) {
+                        patientRepo.insertPatient(patientToSave)
                     }
-                    return@launch
-                }
-
-                val user = withContext(Dispatchers.IO) {
-                    userRepo.getLoggedInUser()
-                }
-
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(
-                        requireContext(),
-                        "Registering patient...",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-
-                val registrationResult = withContext(Dispatchers.IO) {
-                    patientRepo.registerNewPatient(patientDisplay, user)
-                }
-
-                when (registrationResult) {
-                    is NetworkResult.Success -> {
-                        withContext(Dispatchers.Main) {
-                            WorkerUtils.triggerAmritSyncWorker(requireContext())
-                            Toast.makeText(
-                                requireContext(),
-                                getString(R.string.patient_registered_successfully),
-                                Toast.LENGTH_SHORT
-                            ).show()
-
-                            binding.search.text?.clear()
-                            isShowingSearchResults = false
-                            viewModel.filterText("")
+                    saveSuccess = true
+                } catch (e: android.database.sqlite.SQLiteConstraintException) {
+                    val patientWithNullForeignKeys = patientToSave.copy(
+                        ageUnitID = null,
+                        maritalStatusID = null,
+                        communityID = null,
+                        religionID = null
+                    )
+                    
+                    try {
+                        withContext(Dispatchers.IO) {
+                            patientRepo.insertPatient(patientWithNullForeignKeys)
                         }
-                    }
-                    is NetworkResult.Error -> {
+                        saveSuccess = true
+                    } catch (e2: Exception) {
                         withContext(Dispatchers.Main) {
-                            if (registrationResult.message.contains("missing mandatory data")) {
-                                MaterialAlertDialogBuilder(requireContext())
-                                    .setTitle("Complete Registration")
-                                    .setMessage("Patient data is incomplete. Please complete the registration form with required information (DOB, Gender, Village).")
-                                    .setPositiveButton("Open Registration Form") { _, _ ->
-                                        val intent = Intent(requireContext(), RegisterPatientActivity::class.java)
-                                        intent.putExtra("patientId", patient.patientID)
-                                        startActivity(intent)
-                                    }
-                                    .setNegativeButton("Cancel", null)
-                                    .show()
-                            } else {
-                                Toast.makeText(
-                                    requireContext(),
-                                    "Registration failed: ${registrationResult.message}",
-                                    Toast.LENGTH_LONG
-                                ).show()
-                            }
+                            MaterialAlertDialogBuilder(requireContext())
+                                .setTitle(getString(R.string.error_saving_patient))
+                                .setMessage(getString(R.string.error_saving_patient_message))
+                                .setPositiveButton(getString(R.string.ok_button), null)
+                                .show()
                         }
+                        return@launch
                     }
-                    else -> {
-                        withContext(Dispatchers.Main) {
-                            Toast.makeText(
-                                requireContext(),
-                                "Registration failed. Please try again.",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
+                }
+                
+                if (saveSuccess) {
+                    withContext(Dispatchers.Main) {
+                        Toast.makeText(
+                            requireContext(),
+                            getString(R.string.patient_successfully_registered),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        
+                        viewModel.filterText("")
                     }
                 }
+                
             } catch (e: Exception) {
-                Timber.e(e, "Error in hitRegisterApi")
                 withContext(Dispatchers.Main) {
                     Toast.makeText(
                         requireContext(),
-                        "Error: ${e.message}",
+                        "Error saving patient: ${e.message}",
                         Toast.LENGTH_LONG
                     ).show()
                 }
@@ -770,10 +777,11 @@ class PersonalDetailsFragment : Fragment() {
         }
 
         photoFile?.also {
-            photoURI = FileProvider.getUriForFile(
+            val uri = FileProvider.getUriForFile(
                 requireContext(), requireContext().packageName + ".provider", it
             )
-            takePictureLauncher.launch(photoURI)
+            photoURI = uri
+            takePictureLauncher.launch(uri)
         }
     }
 
@@ -801,27 +809,40 @@ class PersonalDetailsFragment : Fragment() {
     private val takePictureLauncher =
         registerForActivityResult(ActivityResultContracts.TakePicture()) { result: Boolean ->
             if (result) {
+                val uri = photoURI
+                if (uri == null) {
+                    Toast.makeText(requireContext(), "Photo capture failed. Please try again.", Toast.LENGTH_SHORT).show()
+                    return@registerForActivityResult
+                }
                 try {
                     // Initialize MediaPipe Face Detector
                     val baseOptionsBuilder =
                         BaseOptions.builder().setModelAssetPath("blaze_face_short_range.tflite")
 
                     val options = FaceDetector.FaceDetectorOptions.builder()
-                        .setBaseOptions(baseOptionsBuilder.build()).setMinDetectionConfidence(0.5f)
+                        .setBaseOptions(baseOptionsBuilder.build()).setMinDetectionConfidence(0.75f)
                         .setRunningMode(RunningMode.IMAGE).build()
 
                     val faceDetector = FaceDetector.createFromOptions(requireContext(), options)
 
-                    // Load image from URI
+                    // Load image from URI, downsampled to avoid OOM on high-res cameras
+                    val maxDimension = 1024
                     val imageBitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                         val source =
-                            ImageDecoder.createSource(requireContext().contentResolver, photoURI)
-                        ImageDecoder.decodeBitmap(source).copy(Bitmap.Config.ARGB_8888, true)
+                            ImageDecoder.createSource(requireContext().contentResolver, uri)
+                        ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
+                            val size = info.size
+                            val sampleSize = maxOf(size.width, size.height) / maxDimension
+                            if (sampleSize > 1) {
+                                decoder.setTargetSampleSize(sampleSize)
+                            }
+                            decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+                        }
                     } else {
                         @Suppress("DEPRECATION") MediaStore.Images.Media.getBitmap(
-                            requireContext().contentResolver, photoURI
+                            requireContext().contentResolver, uri
                         )
-                    }
+                    }.copy(Bitmap.Config.ARGB_8888, true)
 
                     // Convert to MPImage
                     val mpImage = BitmapImageBuilder(imageBitmap).build()
@@ -863,11 +884,16 @@ class PersonalDetailsFragment : Fragment() {
                             val right = boundingBox.right.toInt().coerceAtMost(imageBitmap.width)
                             val bottom = boundingBox.bottom.toInt().coerceAtMost(imageBitmap.height)
 
-                            val width = (right - left).coerceAtLeast(1)
-                            val height = (bottom - top).coerceAtLeast(1)
-
-// No need to validate width/height again — coercion guarantees ≥ 1
+                            val width = right - left
+                            val height = bottom - top
 
+                            if (width <= 0 || height <= 0 || left >= imageBitmap.width || top >= imageBitmap.height) {
+                                Toast.makeText(
+                                    requireContext(), "Invalid face detection", Toast.LENGTH_SHORT
+                                ).show()
+                                faceDetector.close()
+                                return@registerForActivityResult
+                            }
 
                             // Crop face from image
                             val faceBitmap = Bitmap.createBitmap(
@@ -880,33 +906,18 @@ class PersonalDetailsFragment : Fragment() {
                             // Get face embeddings
                             embeddings = faceNetModel.getFaceEmbedding(faceBitmap)
 
+                            if (embeddings == null) {
+                                Toast.makeText(requireContext(), "Failed to generate face embeddings", Toast.LENGTH_SHORT).show()
+                                return@registerForActivityResult
+                            }
+
                             // Compare faces and find matching patient
                             lifecycleScope.launch {
                                 val matchedPatient = compareFacesL2Norm(embeddings!!)
                                 if (matchedPatient != null) {
-                                    val visitInfo = PatientVisitInfoSync()
-                                    val benVisitInfo = PatientDisplayWithVisitInfo(
-                                        matchedPatient,
-                                        genderName = null,
-                                        villageName = null,
-                                        ageUnit = null,
-                                        maritalStatus = null,
-                                        nurseDataSynced = visitInfo.nurseDataSynced,
-                                        doctorDataSynced = visitInfo.doctorDataSynced,
-                                        createNewBenFlow = visitInfo.createNewBenFlow,
-                                        prescriptionID = visitInfo.prescriptionID,
-                                        benVisitNo = visitInfo.benVisitNo,
-                                        visitCategory = visitInfo.visitCategory,
-                                        benFlowID = visitInfo.benFlowID,
-                                        nurseFlag = visitInfo.nurseFlag,
-                                        doctorFlag = visitInfo.doctorFlag,
-                                        labtechFlag = visitInfo.labtechFlag,
-                                        pharmacist_flag = visitInfo.pharmacist_flag,
-                                        visitDate = visitInfo.visitDate,
-                                        referDate = visitInfo.referDate,
-                                        referTo = visitInfo.referTo,
-                                        referralReason = visitInfo.referralReason
-                                    )
+                                    val benVisitInfo = withContext(Dispatchers.IO) {
+                                        patientDao.getPatientDisplayListForNurseByPatient(matchedPatient.patientID)
+                                    }
                                     itemAdapter?.submitList(listOf(benVisitInfo))
                                     binding.patientListContainer.patientCount.text =
                                         "1 Matched Patient"
@@ -975,12 +986,12 @@ class PersonalDetailsFragment : Fragment() {
     private val searchPrompt by lazy {
         MaterialAlertDialogBuilder(requireContext()).setTitle(getString(R.string.note_ben_reg))
             .setMessage(getString(R.string.no_patient_found))
-            .setPositiveButton("Search") { dialog, _ ->
+            .setPositiveButton(getString(R.string.search)) { dialog, _ ->
                 dialog.dismiss()
                 HomeViewModel.setSearchBool()
-            }.setNegativeButton("Proceed with Registration") { dialog, _ ->
+            }.setNegativeButton(getString(R.string.proceed_with_registration)) { dialog, _ ->
                 val intent = Intent(context, RegisterPatientActivity::class.java).apply {
-                    putExtra("photoUri", photoURI.toString())
+                    putExtra("photoUri", photoURI?.toString())
                     putExtra("facevector", embeddings)
                 }
                 startActivity(intent)
@@ -992,56 +1003,78 @@ class PersonalDetailsFragment : Fragment() {
     private suspend fun generatePDF(benVisitInfo: PatientDisplayWithVisitInfo) {
         val patientName =
             (benVisitInfo.patient.firstName ?: "") + " " + (benVisitInfo.patient.lastName ?: "")
-        val prescriptions = caseRecordeRepo.getPrescriptionCaseRecordeByPatientIDAndBenVisitNo(
-            patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo!!
-        )
-        val chiefComplaints = visitReasonsAndCategoriesRepo.getChiefComplaintDBByPatientId(
-            patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo
-        )
-        val vitals = vitalsRepo.getPatientVitalsByPatientIDAndBenVisitNo(
-            patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo
-        )
+        val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+        val fileName = "Prescription_$patientName" + "_${timeStamp}_.pdf"
+        val appContext = requireContext().applicationContext
 
-        val pdfDocument: PdfDocument = PdfDocument()
+        // Show "Downloading" notification immediately so user sees it while PDF is generated
+        showDownloadingNotification(fileName)
+
+        try {
+            val result = withContext(Dispatchers.IO) {
+                val prescriptions = caseRecordeRepo.getPrescriptionCaseRecordeByPatientIDAndBenVisitNo(
+                    patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo!!
+                )
+                val chiefComplaints = visitReasonsAndCategoriesRepo.getChiefComplaintDBByPatientId(
+                    patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo
+                )
+                val vitals = vitalsRepo.getPatientVitalsByPatientIDAndBenVisitNo(
+                    patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo
+                )
+                val labReports = procedureRepo.getProceduresWithComponent(
+                    patientID = benVisitInfo.patient.patientID, benVisitNo = benVisitInfo.benVisitNo
+                )
+
+                val pdfDocument: PdfDocument = PdfDocument()
 
         val heading: Paint = Paint()
         val content: Paint = Paint()
         val subheading: Paint = Paint()
 
-        val myPageInfo: PdfDocument.PageInfo? =
-            PdfDocument.PageInfo.Builder(pageWidth, pageHeight, 1).create()
-
-        val myPage: PdfDocument.Page = pdfDocument.startPage(myPageInfo)
-        val canvas: Canvas = myPage.canvas
-
         // Set up initial positions for the table
         val xPosition = 75F
         var y = 270F // Declare y as a var
         val rowHeight = 50F
         val leftSideX = 50F
         val extraSpace = 10F
+        val bottomMargin = 60F  // start a new page when y > pageHeight - bottomMargin
+        val topMarginNewPage = 50F
 
-        // Set up Paint for text
-        Paint().apply {
-            typeface = Typeface.create(Typeface.DEFAULT, Typeface.NORMAL)
-            textSize = 15F
-            color = ContextCompat.getColor(requireContext(), android.R.color.black)
-            textAlign = Paint.Align.LEFT
+        var pageNumber = 1
+        var currentPage: PdfDocument.Page = run {
+            val pi = PdfDocument.PageInfo.Builder(pageWidth, pageHeight, pageNumber++).create()
+            pdfDocument.startPage(pi)
         }
+        var canvas: Canvas = currentPage.canvas
+
+        // Checks if y is near the page bottom; if so, finishes the current page and starts a new one
+        fun checkPageBreak(currentY: Float): Pair<Canvas, Float> {
+            return if (currentY > pageHeight - bottomMargin) {
+                pdfDocument.finishPage(currentPage)
+                val pi = PdfDocument.PageInfo.Builder(pageWidth, pageHeight, pageNumber++).create()
+                currentPage = pdfDocument.startPage(pi)
+                canvas = currentPage.canvas
+                Pair(canvas, topMarginNewPage)
+            } else {
+                Pair(canvas, currentY)
+            }
+        }
+
+        // Set up Paint for text
 
         content.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL))
         content.textSize = 15F
-        content.color = ContextCompat.getColor(requireContext(), android.R.color.black)
-        content.textAlign = Paint.Align.CENTER
+        content.color = ContextCompat.getColor(appContext, android.R.color.black)
+        content.textAlign = Paint.Align.LEFT
 
         subheading.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD))
         subheading.textSize = 16F
-        subheading.color = ContextCompat.getColor(requireContext(), android.R.color.black)
+        subheading.color = ContextCompat.getColor(appContext, android.R.color.black)
         subheading.textAlign = Paint.Align.LEFT
 
         heading.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL))
         heading.textSize = 40F
-        heading.color = ContextCompat.getColor(requireContext(), android.R.color.black)
+        heading.color = ContextCompat.getColor(appContext, android.R.color.black)
         heading.textAlign = Paint.Align.CENTER
 
         val spaceAfterHeading = 20F
@@ -1076,10 +1109,10 @@ class PersonalDetailsFragment : Fragment() {
         val rightX = pageWidth - 300F
         var rightY = 180F
 
-        val rightLabels = listOf("Date:", "Beneficiary Reg ID:", "Consultation ID:")
+        val rightLabels = listOf("Date:", "Beneficiary ID:", "Consultation ID:")
         val rightValues = listOf(
             benVisitInfo.visitDate ?: "N/A",
-            "${benVisitInfo.patient.beneficiaryRegID}",
+            "${benVisitInfo.patient.beneficiaryID}",
             "${benVisitInfo.benVisitNo}"
         )
 
@@ -1095,13 +1128,14 @@ class PersonalDetailsFragment : Fragment() {
         val spaceAfterLine = 20F
 
         // Define fixed column widths
-        val columnWidth = 150F
+        val columnWidth = 135F
         y += spaceAfterLine
         y += 30
 
         val chiefComplaintHeader = "Chief Complaints"
         val chiefComplaintHeaderSize = 25F // Adjust the size as needed
         val chiefComplaintHeaderX = (pageWidth / 2).toFloat() // Center the heading
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
         canvas.drawText(chiefComplaintHeader, chiefComplaintHeaderX, y, subheading.apply {
             textSize = chiefComplaintHeaderSize
             textAlign = Paint.Align.CENTER
@@ -1111,14 +1145,20 @@ class PersonalDetailsFragment : Fragment() {
         y += rowHeight
 
 // Define fixed column widths for Chief Complaints
-        val chiefComplaintColumnWidth = 150F
+        val ccSnoWidth = 80F
+        val ccNameWidth = 200F
+        val ccDurationWidth = 130F
+        val ccUnitWidth = 150F
+        val ccDescWidth = 140F
 
 // Draw table header for Chief Complaints
-        canvas.drawText("S.No.", xPosition + extraSpace, y, subheading)
-        canvas.drawText("Chief Complaint", xPosition + chiefComplaintColumnWidth, y, subheading)
-        canvas.drawText("Duration", xPosition + 2 * chiefComplaintColumnWidth, y, subheading)
-        canvas.drawText("Duration Unit", xPosition + 3 * chiefComplaintColumnWidth, y, subheading)
-        canvas.drawText("Description", xPosition + 4 * chiefComplaintColumnWidth, y, subheading)
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+        subheading.textAlign = Paint.Align.LEFT
+        canvas.drawText("S.No.", xPosition, y, subheading)
+        canvas.drawText("Chief Complaint", xPosition + ccSnoWidth, y, subheading)
+        canvas.drawText("Duration", xPosition + ccSnoWidth + ccNameWidth, y, subheading)
+        canvas.drawText("Duration Unit", xPosition + ccSnoWidth + ccNameWidth + ccDurationWidth, y, subheading)
+        canvas.drawText("Description", xPosition + ccSnoWidth + ccNameWidth + ccDurationWidth + ccUnitWidth, y, subheading)
 
 // Move down to the first row
         y += rowHeight // Reassign y
@@ -1129,54 +1169,20 @@ class PersonalDetailsFragment : Fragment() {
             for (chiefComplaint in chiefComplaints) {
                 // Draw each field with a fixed width
                 if (chiefComplaint != null) {
+                    checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
                     chiefComplaintCount++
-                    drawTextWithWrapping(
-                        canvas,
-                        chiefComplaintCount.toString(),
-                        xPosition,
-                        y,
-                        chiefComplaintColumnWidth,
-                        content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        chiefComplaint.chiefComplaint ?: "",
-                        xPosition + chiefComplaintColumnWidth,
-                        y,
-                        chiefComplaintColumnWidth,
-                        content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        chiefComplaint.duration ?: "",
-                        xPosition + 2 * chiefComplaintColumnWidth,
-                        y,
-                        chiefComplaintColumnWidth,
-                        content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        chiefComplaint.durationUnit ?: "",
-                        xPosition + 3 * chiefComplaintColumnWidth,
-                        y,
-                        chiefComplaintColumnWidth,
-                        content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        chiefComplaint.description ?: "",
-                        xPosition + 4 * chiefComplaintColumnWidth,
-                        y,
-                        chiefComplaintColumnWidth,
-                        content
-                    )
-
+                    drawTextWithWrapping(canvas, chiefComplaintCount.toString(), xPosition, y, ccSnoWidth, content)
+                    drawTextWithWrapping(canvas, chiefComplaint.chiefComplaint ?: "", xPosition + ccSnoWidth, y, ccNameWidth, content)
+                    drawTextWithWrapping(canvas, chiefComplaint.duration ?: "", xPosition + ccSnoWidth + ccNameWidth, y, ccDurationWidth, content)
+                    drawTextWithWrapping(canvas, chiefComplaint.durationUnit ?: "", xPosition + ccSnoWidth + ccNameWidth + ccDurationWidth, y, ccUnitWidth, content)
+                    drawTextWithWrapping(canvas, chiefComplaint.description ?: "", xPosition + ccSnoWidth + ccNameWidth + ccDurationWidth + ccUnitWidth, y, ccDescWidth, content)
                     // Move down to the next row
                     y += rowHeight // Reassign y
                 }
             }
         }
 
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
         canvas.drawLine(leftSideX, y, pageWidth - leftSideX, y, subheading)
         y += spaceAfterLine
         y += 30
@@ -1185,6 +1191,7 @@ class PersonalDetailsFragment : Fragment() {
         val vitalsSectionHeader = "Vitals"
         val vitalsSectionHeaderSize = 25F
         val vitalsSectionHeaderX = (pageWidth / 2).toFloat()
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
         canvas.drawText(vitalsSectionHeader, vitalsSectionHeaderX, y, subheading.apply {
             textSize = vitalsSectionHeaderSize
             textAlign = Paint.Align.CENTER
@@ -1197,25 +1204,19 @@ class PersonalDetailsFragment : Fragment() {
         val vitalsColumnWidth = 200F
 
         // Draw table header for Vitals
-        canvas.drawText("Vitals Name", xPosition + leftSideX, y, subheading)
-        canvas.drawText("Vitals Value", xPosition + leftSideX + vitalsColumnWidth, y, subheading)
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+        subheading.textAlign = Paint.Align.LEFT
+        canvas.drawText("Vitals Name", xPosition, y, subheading)
+        canvas.drawText("Vitals Value", xPosition + vitalsColumnWidth, y, subheading)
 
         // Move down to the first row
         y += rowHeight
 
         // Function to draw Vitals Name and Value
         fun drawVitals(vitalsName: String, vitalsValue: String) {
-            drawTextWithWrapping(
-                canvas, vitalsName, xPosition + leftSideX, y, vitalsColumnWidth, content
-            )
-            drawTextWithWrapping(
-                canvas,
-                vitalsValue,
-                xPosition + leftSideX + vitalsColumnWidth,
-                y,
-                vitalsColumnWidth,
-                content
-            )
+            checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+            drawTextWithWrapping(canvas, vitalsName, xPosition, y, vitalsColumnWidth, content)
+            drawTextWithWrapping(canvas, vitalsValue, xPosition + vitalsColumnWidth, y, vitalsColumnWidth, content)
             y += rowHeight
         }
 
@@ -1234,19 +1235,87 @@ class PersonalDetailsFragment : Fragment() {
             this?.rbs?.let { drawVitals("RBS", it) }
         }
 
-// Draw heading for the next section
-        val nextSectionHeader = "Prescription" // Replace with your desired heading
-        val nextSectionHeaderSize = 25F // Adjust the size as needed
-        val nextSectionHeaderX = (pageWidth / 2).toFloat() // Center the heading
+        // Lab Test Results section
+        if (labReports.isNotEmpty()) {
+            checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+            canvas.drawLine(leftSideX, y, pageWidth - leftSideX, y, subheading)
+            y += spaceAfterLine
+            y += 30
+
+            val labSectionHeader = "Lab Test Results"
+            val labSectionHeaderSize = 25F
+            val labSectionHeaderX = (pageWidth / 2).toFloat()
+            checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+            canvas.drawText(labSectionHeader, labSectionHeaderX, y, subheading.apply {
+                textSize = labSectionHeaderSize
+                textAlign = Paint.Align.CENTER
+            })
+
+            y += rowHeight
+
+            val labColumnWidth = 125F
+            val labSnoWidth = 120F
+            val labRemarkWidth = 130F
+            val extraGap = 20F // Extra space between Result and Unit
+            checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+            subheading.textAlign = Paint.Align.LEFT
+            canvas.drawText("S.No.", xPosition, y, subheading)
+            canvas.drawText("Test Name", xPosition + labSnoWidth, y, subheading)
+            canvas.drawText("Result", xPosition + labSnoWidth + labColumnWidth, y, subheading)
+            canvas.drawText("Unit", xPosition + labSnoWidth + 2 * labColumnWidth + extraGap, y, subheading)
+            canvas.drawText("Remark", xPosition + labSnoWidth + 3 * labColumnWidth + extraGap, y, subheading)
+
+            y += rowHeight
+
+            var labSno = 0
+            for (labReport in labReports) {
+                val procedureName = labReport.procedure.procedureName ?: continue
+                val components = labReport.components
+                labSno++
+                if (components.isEmpty()) {
+                    checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+                    drawTextWithWrapping(canvas, labSno.toString(), xPosition, y, labSnoWidth, content)
+                    drawTextWithWrapping(canvas, procedureName, xPosition + labSnoWidth, y, labColumnWidth, content)
+                    drawTextWithWrapping(canvas, "Pending", xPosition + labSnoWidth + labColumnWidth, y, labColumnWidth, content)
+                    y += rowHeight
+                } else {
+                    for ((index, component) in components.withIndex()) {
+                        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+                        drawTextWithWrapping(canvas, if (index == 0) labSno.toString() else "", xPosition, y, labSnoWidth, content)
+                        drawTextWithWrapping(canvas, if (index == 0) procedureName else "", xPosition + labSnoWidth, y, labColumnWidth, content)
+                        val resultText = buildString {
+                            component.componentName?.let { append("$it: ") }
+                            append(component.testResultValue ?: "")
+                        }
+                        drawTextWithWrapping(canvas, resultText, xPosition + labSnoWidth + labColumnWidth, y, labColumnWidth, content)
+                        drawTextWithWrapping(canvas, component.testResultUnit ?: "", xPosition + labSnoWidth + 2 * labColumnWidth + extraGap, y, labColumnWidth, content)
+                        drawTextWithWrapping(canvas, component.remarks ?: "", xPosition + labSnoWidth + 3 * labColumnWidth + extraGap, y, labRemarkWidth, content)
+                        y += rowHeight
+                    }
+                }
+            }
+        }
+
+// Draw separator and heading for Prescription section
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+        canvas.drawLine(leftSideX, y, pageWidth - leftSideX, y, subheading)
+        y += spaceAfterLine
+        y += 30
+
+        val nextSectionHeader = "Prescription"
+        val nextSectionHeaderSize = 25F
+        val nextSectionHeaderX = (pageWidth / 2).toFloat()
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
         canvas.drawText(nextSectionHeader, nextSectionHeaderX, y, subheading.apply {
             textSize = nextSectionHeaderSize
             textAlign = Paint.Align.CENTER
         })
         y += rowHeight
 
-
         // Draw table header
-        canvas.drawText("S.No.", xPosition + extraSpace, y, subheading)
+        checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
+        subheading.textAlign = Paint.Align.LEFT
+        canvas.drawText("S.No.", xPosition, y, subheading)
         canvas.drawText("Medication", xPosition + columnWidth, y, subheading)
         canvas.drawText("Frequency", xPosition + 2 * columnWidth, y, subheading)
         canvas.drawText("Duration", xPosition + 3 * columnWidth, y, subheading)
@@ -1261,91 +1330,67 @@ class PersonalDetailsFragment : Fragment() {
             for (prescription in prescriptions) {
                 // Draw each field with a fixed width
                 if (prescription != null) {
+                    checkPageBreak(y).also { (c, newY) -> canvas = c; y = newY }
                     count++
-                    drawTextWithWrapping(
-                        canvas, count.toString(), xPosition, y, columnWidth, content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        prescription.itemName,
-                        xPosition + columnWidth,
-                        y,
-                        columnWidth,
-                        content
-                    )
-                    drawTextWithWrapping(
-                        canvas,
-                        prescription.frequency ?: "",
-                        xPosition + 2 * columnWidth,
-                        y,
-                        columnWidth,
-                        content
-                    )
+                    drawTextWithWrapping(canvas, count.toString(), xPosition, y, columnWidth, content)
+                    drawTextWithWrapping(canvas, prescription.itemName, xPosition + columnWidth, y, columnWidth, content)
+                    drawTextWithWrapping(canvas, prescription.frequency ?: "", xPosition + 2 * columnWidth, y, columnWidth, content)
                     if (prescription.unit.isNullOrEmpty()) {
-                        drawTextWithWrapping(
-                            canvas,
-                            (prescription.duration) ?: "",
-                            xPosition + 3 * columnWidth,
-                            y,
-                            columnWidth,
-                            content
-                        )
+                        drawTextWithWrapping(canvas, (prescription.duration) ?: "", xPosition + 3 * columnWidth, y, columnWidth, content)
                     } else {
-                        drawTextWithWrapping(
-                            canvas,
-                            (prescription.duration + " " + prescription.unit),
-                            xPosition + 3 * columnWidth,
-                            y,
-                            columnWidth,
-                            content
-                        )
+                        drawTextWithWrapping(canvas, (prescription.duration + " " + prescription.unit), xPosition + 3 * columnWidth, y, columnWidth, content)
                     }
-
-                    drawTextWithWrapping(
-                        canvas,
-                        prescription.instructions,
-                        xPosition + 4 * columnWidth,
-                        y,
-                        columnWidth,
-                        content
-                    )
-
+                    drawTextWithWrapping(canvas, prescription.instructions, xPosition + 4 * columnWidth, y, columnWidth, content)
                     // Move down to the next row
                     y += rowHeight // Reassign y
                 }
             }
         }
 
-        pdfDocument.finishPage(myPage)
-
-        val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-        val fileName: String = "Prescription_$patientName" + "_${timeStamp}_.pdf"
-
-        val outputStream: OutputStream
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            outputStream = createPdfForApi33(fileName)
-        } else {
-            val downloadsDirectory: File =
-                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-            val file = File(downloadsDirectory, fileName)
+        pdfDocument.finishPage(currentPage)
 
-            outputStream = FileOutputStream(file)
+                val outputStream: OutputStream
+                var pdfUri: Uri? = null
+                var file: File? = null
 
-        }
-
-        try {
-            pdfDocument.writeTo(outputStream)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    val streamAndUri = createPdfForApi33(appContext, fileName)
+                    outputStream = streamAndUri.first
+                    pdfUri = streamAndUri.second
+                } else {
+                    val downloadsDirectory: File =
+                        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                    file = File(downloadsDirectory, fileName)
+                    outputStream = FileOutputStream(file)
+                }
 
-            Toast.makeText(
-                requireContext(), "PDF file generated for Prescription.", Toast.LENGTH_SHORT
-            ).show()
+                try {
+                    pdfDocument.writeTo(outputStream)
+                    outputStream.close()
+
+                    if (pdfUri == null && file != null) {
+                        pdfUri = FileProvider.getUriForFile(
+                            appContext,
+                            appContext.packageName + ".provider",
+                            file
+                        )
+                    }
+                    Pair(fileName, pdfUri)
+                } finally {
+                    pdfDocument.close()
+                }
+            }
+            dismissNotification(0)
+            result.second?.let { uri ->
+                showDownloadCompleteNotification(result.first, uri)
+                Toast.makeText(requireContext(), "Prescription PDF downloaded successfully", Toast.LENGTH_SHORT).show()
+            }
         } catch (e: Exception) {
             e.printStackTrace()
-
+            dismissNotification(0)
             Toast.makeText(requireContext(), "Failed to generate PDF file", Toast.LENGTH_SHORT)
                 .show()
         }
-        pdfDocument.close()
     }
 
     private fun drawTextWithWrapping(
@@ -1379,20 +1424,87 @@ class PersonalDetailsFragment : Fragment() {
         return result
     }
 
-    private fun createPdfForApi33(fileName: String): OutputStream {
-        val outst: OutputStream
+    private fun createPdfForApi33(context: Context, fileName: String): Pair<OutputStream, Uri> {
         val contentValues = ContentValues().apply {
             put(MediaStore.Downloads.DISPLAY_NAME, fileName)
             put(MediaStore.Downloads.MIME_TYPE, "application/pdf")
             put(MediaStore.Downloads.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
         }
 
-        val pdfUri: Uri? = requireContext().contentResolver.insert(
+        val pdfUri: Uri? = context.contentResolver.insert(
             MediaStore.Files.getContentUri("external"), contentValues
         )
-        outst = pdfUri?.let { requireContext().contentResolver.openOutputStream(it) }!!
+        val outst = pdfUri?.let { context.contentResolver.openOutputStream(it) }!!
         Objects.requireNonNull(outst)
-        return outst
+        Objects.requireNonNull(pdfUri)
+        return Pair(outst, pdfUri)
+    }
+
+    private fun showDownloadingNotification(fileName: String) {
+        val notificationManager =
+            requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                prescriptionChannelId,
+                "Prescription Download",
+                NotificationManager.IMPORTANCE_HIGH
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        val notification = NotificationCompat.Builder(requireContext(), prescriptionChannelId)
+            .setContentTitle("Downloading Prescription")
+            .setContentText("Generating PDF: $fileName")
+            .setSmallIcon(R.drawable.ic_download)
+            .setProgress(100, 0, true)
+            .setOngoing(true)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .build()
+
+        notificationManager.notify(0, notification)
+    }
+
+    private fun showDownloadCompleteNotification(fileName: String, uri: Uri) {
+        val notificationManager =
+            requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                prescriptionChannelId,
+                "Prescription Download",
+                NotificationManager.IMPORTANCE_HIGH
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        val notification = NotificationCompat.Builder(requireContext(), prescriptionChannelId)
+            .setContentTitle("Download Complete")
+            .setContentText("Prescription PDF: $fileName")
+            .setSmallIcon(R.drawable.ic_download)
+            .setAutoCancel(true)
+            .setOngoing(false)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setContentIntent(
+                PendingIntent.getActivity(
+                    requireContext(),
+                    0,
+                    Intent(Intent.ACTION_VIEW).apply {
+                        setDataAndType(uri, "application/pdf")
+                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    },
+                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+                )
+            )
+            .build()
+
+        notificationManager.notify(1, notification)
+    }
+
+    private fun dismissNotification(notificationId: Int) {
+        val notificationManager =
+            requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationManager.cancel(notificationId)
     }
 
     private val searchTextWatcher = object : TextWatcher {
@@ -1407,6 +1519,8 @@ class PersonalDetailsFragment : Fragment() {
         @RequiresApi(Build.VERSION_CODES.O)
         override fun afterTextChanged(p0: Editable?) {
             val query = p0?.toString()?.trim().orEmpty()
+            searchJob?.cancel()
+            currentSearchQuery = query
 
             if (query.isBlank()) {
                 isShowingSearchResults = false
@@ -1418,7 +1532,7 @@ class PersonalDetailsFragment : Fragment() {
                 return
             }
 
-            lifecycleScope.launch(Dispatchers.IO) {
+            searchJob = lifecycleScope.launch(Dispatchers.IO) {
 
                 val local = patientDao.getPatientList()
                 val localMatches = local.filter {
@@ -1431,15 +1545,19 @@ class PersonalDetailsFragment : Fragment() {
                             rid.contains(query)
                 }
 
-                if (!isNetworkAvailable) {
-                    Timber.d("Offline search → skipping API")
+                val canUseApi =
+                    isNetworkAvailable &&
+                            (preferenceDao.isNurseSelected() || preferenceDao.isRegistrarSelected())
 
+                if (!canUseApi) {
                     withContext(Dispatchers.Main) {
-                        isShowingSearchResults = false
-                        viewModel.filterText(query)
-                        binding.patientListContainer.patientList.adapter = itemAdapter
-                        binding.patientListContainer.patientCount.text =
-                            localMatches.size.toString() + getResultStr(localMatches.size)
+                        if (currentSearchQuery == query) {
+                            isShowingSearchResults = false
+                            viewModel.filterText(query)
+                            binding.patientListContainer.patientList.adapter = itemAdapter
+                            binding.patientListContainer.patientCount.text =
+                                localMatches.size.toString() + getResultStr(localMatches.size)
+                        }
                     }
                     return@launch
                 }
@@ -1455,11 +1573,13 @@ class PersonalDetailsFragment : Fragment() {
 
                     if (dataArr.length() == 0) {
                         withContext(Dispatchers.Main) {
-                            isShowingSearchResults = false
-                            viewModel.filterText(query)
-                            binding.patientListContainer.patientList.adapter = itemAdapter
-                            binding.patientListContainer.patientCount.text =
-                                localMatches.size.toString() + getResultStr(localMatches.size)
+                            if (currentSearchQuery == query) {
+                                isShowingSearchResults = false
+                                viewModel.filterText(query)
+                                binding.patientListContainer.patientList.adapter = itemAdapter
+                                binding.patientListContainer.patientCount.text =
+                                    localMatches.size.toString() + getResultStr(localMatches.size)
+                            }
                         }
                         return@launch
                     }
@@ -1472,6 +1592,19 @@ class PersonalDetailsFragment : Fragment() {
                         val lastName = obj.optString("lastName")
                         val beneficiaryRegID = obj.optLong("beneficiaryRegID")
 
+                        var beneficiaryID: Long? = null
+                        if (obj.has("beneficiaryID") && !obj.isNull("beneficiaryID")) {
+                            try {
+                                beneficiaryID = if (obj.opt("beneficiaryID") is String) {
+                                    obj.optString("beneficiaryID").toLongOrNull()
+                                } else {
+                                    obj.optLong("beneficiaryID")
+                                }
+                            } catch (e: Exception) {
+                                Timber.e(e, "Error parsing beneficiaryID")
+                            }
+                        }
+
                         var dob: Date? = null
                         if (obj.has("dob") && !obj.isNull("dob")) {
                             val dobString = obj.optString("dob", "")
@@ -1551,6 +1684,7 @@ class PersonalDetailsFragment : Fragment() {
                             firstName = firstName,
                             lastName = lastName,
                             beneficiaryRegID = beneficiaryRegID,
+                            beneficiaryID = beneficiaryID,
                             syncState = SyncState.UNSYNCED,
                             dob = dob,
                             genderID = genderID,
@@ -1591,22 +1725,26 @@ class PersonalDetailsFragment : Fragment() {
                     }
 
                     withContext(Dispatchers.Main) {
-                        isShowingSearchResults = true
-                        apiSearchAdapter?.submitList(list)
-                        binding.patientListContainer.patientList.adapter = apiSearchAdapter
-                        binding.patientListContainer.patientCount.text =
-                            list.size.toString() + getResultStr(list.size)
+                        if (currentSearchQuery == query) {
+                            isShowingSearchResults = true
+                            apiSearchAdapter?.submitList(list)
+                            binding.patientListContainer.patientList.adapter = apiSearchAdapter
+                            binding.patientListContainer.patientCount.text =
+                                list.size.toString() + getResultStr(list.size)
+                        }
                     }
 
                 } catch (e: Exception) {
                     Timber.e(e, "API error → fallback to local")
 
                     withContext(Dispatchers.Main) {
-                        isShowingSearchResults = false
-                        viewModel.filterText(query)
-                        binding.patientListContainer.patientList.adapter = itemAdapter
-                        binding.patientListContainer.patientCount.text =
-                            localMatches.size.toString() + getResultStr(localMatches.size)
+                        if (currentSearchQuery == query) {
+                            isShowingSearchResults = false
+                            viewModel.filterText(query)
+                            binding.patientListContainer.patientList.adapter = itemAdapter
+                            binding.patientListContainer.patientCount.text =
+                                localMatches.size.toString() + getResultStr(localMatches.size)
+                        }
                     }
                 }
             }
@@ -1648,8 +1786,8 @@ class PersonalDetailsFragment : Fragment() {
             val dialogView =
                 LayoutInflater.from(context).inflate(R.layout.dialog_esanjeevani_login, null)
             val dialog = context?.let {
-                MaterialAlertDialogBuilder(it).setTitle("eSanjeevani Login").setView(dialogView)
-                    .setNegativeButton("Cancel") { dialog, _ ->
+                MaterialAlertDialogBuilder(it).setTitle(getString(R.string.esanjeevani_login)).setView(dialogView)
+                    .setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
                         dialog.dismiss()
                     }.create()
             }
@@ -1688,7 +1826,7 @@ class PersonalDetailsFragment : Fragment() {
                 } else {
                     viewModel.forgetUserEsanjeevani()
                 }
-                CoroutineScope(Dispatchers.Main).launch {
+                lifecycleScope.launch {
                     try {
                         var passWord =
                             encryptSHA512(encryptSHA512(passwordEs) + encryptSHA512("token"))
@@ -1710,11 +1848,12 @@ class PersonalDetailsFragment : Fragment() {
                                 if (token != null) {
                                     TokenESanjeevaniInterceptor.setToken(token)
                                 }
-                                val intent = Intent(context, WebViewActivity::class.java)
-                                intent.putExtra("patientId", benVisitInfo.patient.patientID)
-                                intent.putExtra("usernameEs", usernameEs)
-                                intent.putExtra("passwordEs", passwordEs)
-                                context?.startActivity(intent)
+                                context?.let { ctx ->
+                                    ESanjeevaniLauncher.launch(
+                                        ctx, patientDao, apiService,
+                                        benVisitInfo.patient.patientID, usernameEs, passwordEs
+                                    )
+                                }
                                 dialog?.dismiss()
                             } else {
                                 errorEs = responseToken.message
@@ -1747,6 +1886,8 @@ class PersonalDetailsFragment : Fragment() {
     }
 
     override fun onDestroyView() {
+        binding.patientListContainer.skeletonContainer.clearAnimation()
+        skeletonPulseAnimation = null
         super.onDestroyView()
         _binding = null
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsViewModel.kt
index 2b6cae001..4f192373e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/personal_details/PersonalDetailsViewModel.kt
@@ -8,18 +8,15 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
-import org.piramalswasthya.cho.model.BenFlow
-
-import org.piramalswasthya.cho.model.BenHealthIdDetails
-import org.piramalswasthya.cho.model.PatientDisplay
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
-import org.piramalswasthya.cho.model.PatientVisitInfoSyncWithPatient
-import org.piramalswasthya.cho.repositories.BenFlowRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
 import org.piramalswasthya.cho.utils.filterBenList
@@ -37,21 +34,53 @@ class PersonalDetailsViewModel @Inject constructor(
     private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo
 ) : ViewModel() {
     private val filter = MutableStateFlow("")
-
-    var patientListForNurse : Flow<List<PatientDisplayWithVisitInfo>>? =patientRepo.getPatientDisplayListForNurse().combine(filter){
-        list, filter -> filterBenList(list, filter)
-    }
-
-    var patientListForDoctor : Flow<List<PatientDisplayWithVisitInfo>>? = patientRepo.getPatientDisplayListForDoctor().combine(filter){
-            list, filter -> filterBenList(list, filter)
+    private val listUpdateDebounceMs = 250L
+
+    private fun buildPatientListFlow(
+        source: Flow<List<PatientDisplayWithVisitInfo>>,
+        transform: (List<PatientDisplayWithVisitInfo>) -> List<PatientDisplayWithVisitInfo>
+    ): Flow<List<PatientDisplayWithVisitInfo>> {
+        return source
+            .map(transform)
+            .combine(filter) { list, query ->
+                filterBenList(list, query)
+            }
+            .debounce(listUpdateDebounceMs)
+            .distinctUntilChanged()
+            .flowOn(Dispatchers.Default)
     }
 
-    var patientListForLab : Flow<List<PatientDisplayWithVisitInfo>>? = patientVisitInfoSyncRepo.getPatientDisplayListForLab().combine(filter){
-            list, filter -> filterBenList(list, filter)
-    }
-    var patientListForPharmacist : Flow<List<PatientDisplayWithVisitInfo>>? =patientVisitInfoSyncRepo.getPatientListFlowForPharmacist().combine(filter){
-            list, filter -> filterBenList(list, filter)
-    }
+    // One card per patient/beneficiary (latest visit only); no duplicate cards with same beneficiary key.
+    val patientListForPharmacist: Flow<List<PatientDisplayWithVisitInfo>> =
+        buildPatientListFlow(
+            source = patientVisitInfoSyncRepo.getPatientListFlowForPharmacist(),
+            transform = { list ->
+                val key: (PatientDisplayWithVisitInfo) -> String = { info ->
+                    info.patient.beneficiaryRegID?.toString() ?: info.patient.patientID
+                }
+                // Source query is already ordered by latest medicine assignment first.
+                // Keep the first card per beneficiary to avoid duplicates while preserving order.
+                list.distinctBy(key)
+            }
+        )
+
+    val patientListForNurse: Flow<List<PatientDisplayWithVisitInfo>> =
+        buildPatientListFlow(
+            source = patientRepo.getPatientDisplayListForNurse(),
+            transform = { list -> list }
+        )
+
+    val patientListForDoctor: Flow<List<PatientDisplayWithVisitInfo>> =
+        buildPatientListFlow(
+            source = patientRepo.getPatientDisplayListForDoctor(),
+            transform = { list -> list }
+        )
+
+    val patientListForLab: Flow<List<PatientDisplayWithVisitInfo>> =
+        buildPatientListFlow(
+            source = patientVisitInfoSyncRepo.getPatientDisplayListForLab(),
+            transform = { list -> list }
+        )
 
     var count : Int = 0
     private val _abha = MutableLiveData<String?>()
@@ -89,10 +118,7 @@ class PersonalDetailsViewModel @Inject constructor(
     }
 
     fun filterText(text: String) {
-        viewModelScope.launch {
-            filter.emit(text)
-        }
-
+        filter.value = text
     }
 
     fun fetchAbha(benId: Long) {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormFragment.kt
index b23c027b5..827ab47fd 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormFragment.kt
@@ -2,12 +2,14 @@ package org.piramalswasthya.cho.ui.commons.pharmacist
 
 
 
-import android.content.Intent
+
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -23,13 +25,14 @@ import org.piramalswasthya.cho.databinding.AlertAbhaCcMappingBinding
 import org.piramalswasthya.cho.databinding.AlertCcMappingBinding
 import org.piramalswasthya.cho.databinding.FragmentPharmacistFormBinding
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.PrescriptionBatchDTO
 import org.piramalswasthya.cho.model.PrescriptionDTO
 import org.piramalswasthya.cho.model.PrescriptionItemDTO
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity
 import org.piramalswasthya.cho.ui.home.HomeViewModel
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.ui.register_patient_activity.RegisterPatientActivity
 import org.piramalswasthya.cho.work.WorkerUtils
 import timber.log.Timber
@@ -60,6 +63,7 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
     private var dtos: PrescriptionDTO? = null
 
     private var itemAdapter : PharmacistItemAdapter? = null
+    private val pendingBatchSelections = mutableMapOf<Long, List<PrescriptionBatchDTO>>()
 
     private lateinit var benVisitInfo : PatientDisplayWithVisitInfo
     private var patientCount : Int = 0
@@ -86,36 +90,70 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         benVisitInfo = requireActivity().intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo
-        dtos?.issueType = "System Issue"
         viewModel = ViewModelProvider(this).get(PharmacistFormViewModel::class.java)
+        findNavController().currentBackStackEntry?.savedStateHandle
+            ?.getLiveData<String>("selected_batch_item")
+            ?.observe(viewLifecycleOwner) { json ->
+                val updatedItem = Gson().fromJson(json, PrescriptionItemDTO::class.java)
+                pendingBatchSelections[updatedItem.id] = updatedItem.batchList
+                val currentList = dtos?.itemList?.toMutableList() ?: return@observe
+                val index = currentList.indexOfFirst { it.id == updatedItem.id }
+                if (index >= 0) {
+                    currentList[index] = currentList[index].copy(batchList = updatedItem.batchList)
+                    dtos?.itemList = currentList
+                    itemAdapter?.submitList(currentList)
+                }
+                findNavController().currentBackStackEntry?.savedStateHandle?.remove<String>("selected_batch_item")
+            }
         viewModel.prescriptionObserver.observe(viewLifecycleOwner) { state ->
             when (state!!) {
                 PharmacistFormViewModel.NetworkState.SUCCESS -> {
+                    val currentIssueType =
+                        if (binding.btnManualIssue.isChecked) "Manual Issue" else "System Issue"
                     itemAdapter = context?.let { it ->
                         PharmacistItemAdapter(
                             it,
-                            dtos?.issueType ?: "",
-                            clickListener = PharmacistItemAdapter.PharmacistClickListener(clickedSelectBatch = { it
+                            currentIssueType,
+                            networkAvailabilityCheck = { viewModel.isNetworkAvailable() },
+                            clickListener = PharmacistItemAdapter.PharmacistClickListener(clickedSelectBatch = { prescription ->
                                 val bundle = Bundle()
-                                bundle.putString("prescriptionItemDTO", Gson().toJson(it))
-                                if(it.batchList!= null && it.batchList.isNotEmpty()){
-                                    bundle.putString("batchList", Gson().toJson(it.batchList))
-
-                                    bundle.putString("prescriptionDTO", Gson().toJson(dtos))
-                                    bundle.putSerializable("benVisitInfo", benVisitInfo)
-
-                                    val batchFragment = PrescriptionBatchFormFragment()
-                                    batchFragment.arguments = bundle
-                                    findNavController().navigate(
-                                        R.id.action_pharmacistFormFragment_to_selectBatchFragment, bundle
-                                    )
-                                }
-                                else{
-                                    Toast.makeText(requireContext(), "Medicine not available", Toast.LENGTH_SHORT).show()
+                                bundle.putString("prescriptionItemDTO", Gson().toJson(prescription))
+
+                                // Use real-time batch fetching instead of relying on existing batchList
+                                lifecycleScope.launch {
+                                    try {
+                                        val availableBatches = viewModel.getBatchesForMedicine(prescription.drugID)
+
+                                        if (availableBatches.isNotEmpty()) {
+                                            bundle.putString("batchList", Gson().toJson(availableBatches))
+                                            bundle.putString("prescriptionDTO", Gson().toJson(dtos))
+                                            bundle.putSerializable("benVisitInfo", benVisitInfo)
+
+                                            findNavController().navigate(
+                                                R.id.action_pharmacistFormFragment_to_selectBatchFragment, bundle
+                                            )
+                                        } else if (!viewModel.isNetworkAvailable()) {
+                                            Toast.makeText(
+                                                requireContext(),
+                                                getString(R.string.network_required_manual_batch),
+                                                Toast.LENGTH_LONG
+                                            ).show()
+                                        } else {
+                                            Toast.makeText(
+                                                requireContext(),
+                                                getString(R.string.no_batches_available),
+                                                Toast.LENGTH_LONG
+                                            ).show()
+                                        }
+                                    } catch (e: Exception) {
+                                        Toast.makeText(requireContext(), "Error loading batch data. Please try again.", Toast.LENGTH_SHORT).show()
+                                    }
                                 }
-
                             },
                                 clickedViewBatch = { prescription ->
+                                    // View Batch functionality is commented out for System Issue mode
+                                    // This was the original implementation for System Issue
+                                    /*
                                     val bundle = Bundle()
                                     bundle.putString("prescriptionItemDTO", Gson().toJson(prescription))
                                     if(prescription.batchList!= null && prescription.batchList.isNotEmpty()){
@@ -129,8 +167,14 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
                                         )
                                     }
                                     else{
-                                        Toast.makeText(requireContext(), "Medicine not available", Toast.LENGTH_SHORT).show()
+                                        Toast.makeText(requireContext(), getString(R.string.medicine_not_available), Toast.LENGTH_SHORT).show()
                                     }
+                                    */
+
+                                    // For now, just show a message that this feature is disabled
+                                    Toast.makeText(requireContext(),
+                                        "View Batch is disabled in System Issue mode",
+                                        Toast.LENGTH_SHORT).show()
                                 }
                             )
                         )
@@ -140,15 +184,24 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
                             binding.btnManualIssue.id -> {
                                 dtos?.issueType = "Manual Issue"
                                 itemAdapter?.updateIssueType("Manual Issue")
-
+                                // Check network availability and show message if needed
+                                if (!viewModel.isNetworkAvailable()) {
+                                    Toast.makeText(requireContext(),
+                                        getString(R.string.network_required_manual_batch) + ". Please connect to internet.",
+                                        Toast.LENGTH_LONG).show()
+                                }
                             }
                             binding.btnSystemIssue.id -> {
                                 dtos?.issueType = "System Issue"
                                 itemAdapter?.updateIssueType("System Issue")
-
+                                Toast.makeText(requireContext(),
+                                    getString(R.string.system_issue_auto_allocation),
+                                    Toast.LENGTH_SHORT).show()
                             }
                         }
                     }
+
+
                     binding.pharmacistListContainer.pharmacistList.adapter = itemAdapter
                     lifecycleScope.launch {
                         viewModel.downloadPrescription(benVisitInfo = benVisitInfo)
@@ -159,18 +212,39 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
                     viewModel.prescriptions.observe(viewLifecycleOwner) {
                         dtos = viewModel.prescriptions?.value
                         viewModel.prescriptions?.value?.let {it->
+                            if (it.issueType.isNullOrBlank()) {
+                                it.issueType =
+                                    if (binding.btnManualIssue.isChecked) "Manual Issue" else "System Issue"
+                            }
                             binding.consultantValue.text = it.consultantName
-                            binding.visitCodeValue.text = it.visitCode.toString()
+                            val patientName = listOf(
+                                benVisitInfo.patient.firstName,
+                                benVisitInfo.patient.lastName
+                            ).filter { name -> !name.isNullOrBlank() }.joinToString(" ")
+                            val patientAge =
+                                "${benVisitInfo.patient.age ?: ""} ${benVisitInfo.ageUnit ?: ""}".trim()
+                            binding.visitCodeValue.text = listOf(
+                                patientName,
+                                patientAge,
+                                benVisitInfo.genderName ?: ""
+                            ).filter { part -> part.isNotBlank() }.joinToString(", ")
                             binding.prescriptionIdValue.text = it.prescriptionID.toString()
 
                             visitCode = it.visitCode
 
-                            it.itemList.let { it ->
-                                itemAdapter?.submitList(it)
-                                binding.pharmacistListContainer.prescriptionCount.text =
-                                    itemAdapter?.itemCount.toString() + getResultStr(itemAdapter?.itemCount)
-                                if (it != null) {
-                                    patientCount = it.size
+                            it.itemList.let { items ->
+                                val mergedItems = items.map { item ->
+                                    val updatedBatches = pendingBatchSelections[item.id]
+                                    if (updatedBatches != null) {
+                                        item.copy(batchList = updatedBatches)
+                                    } else {
+                                        item
+                                    }
+                                }
+                                dtos?.itemList = mergedItems
+                                itemAdapter?.submitList(mergedItems)
+                                if (items != null) {
+                                    patientCount = items.size
                                 }
                             }
                         }
@@ -187,37 +261,47 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
 
     }
 
-    fun getResultStr(count:Int?):String{
-        if(count==1||count==0){
-            return " Prescription"
-        }
-        return " Prescriptions"
-    }
-
     override fun getFragmentId(): Int {
         return R.id.fragment_pharmacist_form;
     }
 
     override fun onSubmitAction() {
         Timber.d("submit button", dtos)
+        if (!isManualIssueReadyForSubmit(dtos)) {
+            Toast.makeText(requireContext(), getString(R.string.no_batch_selected), Toast.LENGTH_SHORT).show()
+            return
+        }
+        activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = false
+        viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
         viewModel.savePharmacistData(dtos, benVisitInfo)
         viewModel.isDataSaved.observe(viewLifecycleOwner){ state ->
             when (state!!) {
                 true -> {
+                    viewModel.isDataSaved.removeObservers(viewLifecycleOwner)
                     careContextPrompt.show()
 //                    navigateNext()
                 }
-                else -> {}
+                else -> {
+                    activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
+                }
             }
         }
     }
 
     override fun onCancelAction() {
-        val intent = Intent(context, HomeActivity::class.java)
-        startActivity(intent)
         requireActivity().finish()
     }
 
+    private fun isManualIssueReadyForSubmit(dtos: PrescriptionDTO?): Boolean {
+        if (dtos?.issueType != "Manual Issue") return true
+        val items = dtos.itemList ?: return false
+        return items.all { item ->
+            val batches = item.batchList
+            if (batches.isNullOrEmpty()) return@all false
+            batches.any { it.isSelected && it.dispenseQuantity > 0 }
+        }
+    }
+
     private val careContextPrompt by lazy {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.info))
@@ -323,7 +407,7 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
             viewModel.isOtpGenerated.observe(viewLifecycleOwner) { state ->
                 ccMappingAlertBinding.btnGenerate.isEnabled = true
                 alert.dismiss()
-                Toast.makeText(requireContext(), "Please Wait...", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), getString(R.string.processing), Toast.LENGTH_SHORT).show()
                 when(state!!) {
                     true -> {
                         otpSentDialog.show()
@@ -365,7 +449,7 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
 
                 viewModel.isOtpVerified.observe(viewLifecycleOwner) { state ->
                     alert.dismiss()
-                    Toast.makeText(requireContext(), "Please Wait...", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.processing), Toast.LENGTH_SHORT).show()
                     when(state!!) {
                         true -> {
                             otpVerifiedDialog
@@ -386,9 +470,7 @@ class PharmacistFormFragment : Fragment(R.layout.fragment_pharmacist_form), Navi
     }
 
     fun navigateNext() {
-        val intent = Intent(context, HomeActivity::class.java)
-        startActivity(intent)
         requireActivity().finish()
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormViewModel.kt
index e4c785b93..ec4aadb48 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PharmacistFormViewModel.kt
@@ -2,6 +2,9 @@ package org.piramalswasthya.cho.ui.commons.pharmacist
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import androidx.lifecycle.LiveData
@@ -16,7 +19,10 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.room.dao.BatchDao
+import org.piramalswasthya.cho.database.room.dao.PrescriptionDao
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.PrescribedDrugsBatch
+import org.piramalswasthya.cho.model.PrescriptionBatchDTO
 import org.piramalswasthya.cho.model.PrescriptionDTO
 import org.piramalswasthya.cho.model.ProcedureDTO
 import org.piramalswasthya.cho.network.BenHealthDetails
@@ -29,8 +35,13 @@ import org.piramalswasthya.cho.repositories.BenFlowRepo
 import org.piramalswasthya.cho.repositories.BenVisitRepo
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.PatientVisitInfoSyncRepo
+import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.work.WorkerUtils
 import timber.log.Timber
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
 import javax.inject.Inject
 
 @HiltViewModel
@@ -41,7 +52,10 @@ class PharmacistFormViewModel @Inject constructor(
     private val patientVisitInfoSyncRepo: PatientVisitInfoSyncRepo,
     private val benFlowRepo: BenFlowRepo,
     private val patientRepo: PatientRepo,
-    private val batchDao: BatchDao
+    private val batchDao: BatchDao,
+    private val prescriptionDao: PrescriptionDao,
+    private val userRepo: UserRepo,
+    private val caseClosureManager: org.piramalswasthya.cho.helpers.CaseClosureManager
 ) : ViewModel() {
 
 
@@ -147,17 +161,43 @@ class PharmacistFormViewModel @Inject constructor(
 
     suspend fun downloadPrescription(benVisitInfo : PatientDisplayWithVisitInfo) {
         withContext(Dispatchers.IO) {
-            benFlowRepo.pullPrescriptionListData(benVisitInfo)
+            // Preserve local doctor-updated prescription rows; fetch from API only when local is empty.
+            val localPrescription = patientRepo.getPrescriptions(benVisitInfo)
+            if (localPrescription.isNullOrEmpty()) {
+                benFlowRepo.pullPrescriptionListData(benVisitInfo)
+            }
         }
     }
 
     suspend fun getPrescription(benVisitInfo : PatientDisplayWithVisitInfo) {
         withContext(Dispatchers.IO) {
-            val listPrescription = patientRepo.getPrescriptions(benVisitInfo)
-            Log.d("MyPrescription", "Prescription ${listPrescription}")
-            if(listPrescription!=null && listPrescription.size>0){
-                Log.d("MyPrescription", "inside")
-                _prescriptions.postValue(listPrescription.get(0) ?: null)
+            if (isNetworkAvailable()) {
+                refreshBatchData()
+            }
+            var listPrescription = patientRepo.getPrescriptions(benVisitInfo)
+            if (listPrescription.isNullOrEmpty()) {
+                // For unsynced local doctor submissions, pharmacist data may still exist only in case-record tables.
+                benFlowRepo.copyPrescriptionFromCaseRecordToPharmacistTable(benVisitInfo)
+                listPrescription = patientRepo.getPrescriptions(benVisitInfo)
+            }
+            if (listPrescription.isNullOrEmpty()) {
+                benFlowRepo.pullPrescriptionListData(benVisitInfo)
+                listPrescription = patientRepo.getPrescriptions(benVisitInfo)
+            }
+            val latest = listPrescription?.firstOrNull()
+            if (latest != null && isHeaderMissing(latest) && isNetworkAvailable()) {
+                when (benFlowRepo.refreshPrescriptionHeaderOnly(benVisitInfo)) {
+                    is NetworkResult.Success -> {
+                        listPrescription = patientRepo.getPrescriptions(benVisitInfo)
+                    }
+                    else -> {
+                        // keep existing local data
+                    }
+                }
+            }
+            Log.d("MyPrescription", "Prescription $listPrescription")
+            if (listPrescription != null && listPrescription.isNotEmpty()) {
+                _prescriptions.postValue(listPrescription[0])
             }
         }
     }
@@ -167,47 +207,89 @@ class PharmacistFormViewModel @Inject constructor(
             benFlowRepo.getAllocationItemForPharmacist(prescriptionDTO)
         }
     }
-//
+    //
     @SuppressLint("StaticFieldLeak")
     val context: Context = application.applicationContext
-//
+    //
     val state = savedStateHandle
     fun savePharmacistData(dtos: PrescriptionDTO?, benVisitInfo: PatientDisplayWithVisitInfo) {
-        try {
-
-            viewModelScope.launch {
-
-               if(dtos!=null && dtos.itemList!=null){
-                   dtos.itemList.forEach { item->
-                       if(item.batchList!=null && item.batchList.isNotEmpty()){
-                           val firstBatch = item.batchList.first()
-                           Log.d("WU", "Batch1 ${firstBatch} ")
-                           val availableBatch =  batchDao.getBatchByStockEntityId(firstBatch.itemStockEntryID.toLong())
-                           Log.d("WU", "Batch2 ${availableBatch} ")
-                           if(availableBatch!=null) {
-                               val updatedBatch = availableBatch.copy(
-                                   quantityInHand = availableBatch.quantityInHand - item.qtyPrescribed!!
-                               )
-                               Log.d("WU", "Batch3 ${updatedBatch}")
-                               if(updatedBatch.quantityInHand<=0){
-                                   batchDao.deleteBatch(availableBatch)
-                               }else{
-                                   batchDao.updateBatch(updatedBatch)
-                               }
-                           }
-                       }else{
-                           Toast.makeText(context, "Medicine not available", Toast.LENGTH_SHORT).show()
-                       }
-                   }
-               }
-                patientVisitInfoSyncRepo.updatePharmacistFlag(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo!!)
-                patientVisitInfoSyncRepo.updatePharmacistDataSyncState(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo, SyncState.UNSYNCED)
+        _isDataSaved.value = false
+        viewModelScope.launch {
+            try {
+                val visitNo = benVisitInfo.benVisitNo ?: run {
+                    _isDataSaved.value = false
+                    return@launch
+                }
+
+                if(dtos!=null && dtos.itemList!=null){
+                    dtos.itemList.forEach { item->
+                        val dispensedBatches = mutableListOf<PrescribedDrugsBatch>()
+                        if(item.batchList!=null && item.batchList.isNotEmpty()){
+                            val prescribedQty = item.qtyPrescribed ?: 0
+                            var remainingQty = prescribedQty
+                            item.batchList.forEach { batch ->
+                                if (remainingQty <= 0) return@forEach
+                                Log.d("WU", "Batch1 ${batch} ")
+                                val availableBatch =  batchDao.getBatchByStockEntityId(batch.itemStockEntryID.toLong())
+                                Log.d("WU", "Batch2 ${availableBatch} ")
+                                if(availableBatch!=null) {
+                                    val dispenseQty = minOf(availableBatch.quantityInHand, remainingQty)
+                                    if (dispenseQty > 0) {
+                                        dispensedBatches += PrescribedDrugsBatch(
+                                            drugID = item.id,
+                                            expiryDate = batch.expiryDate,
+                                            expiresIn = batch.expiresIn,
+                                            batchNo = batch.batchNo,
+                                            itemStockEntryID = batch.itemStockEntryID,
+                                            qty = dispenseQty
+                                        )
+                                    }
+                                    val updatedBatch = availableBatch.copy(
+                                        quantityInHand = availableBatch.quantityInHand - dispenseQty
+                                    )
+                                    Log.d("WU", "Batch3 ${updatedBatch}")
+                                    if(updatedBatch.quantityInHand<=0){
+                                        batchDao.deleteBatch(availableBatch)
+                                    }else{
+                                        batchDao.updateBatch(updatedBatch)
+                                    }
+                                    remainingQty -= dispenseQty
+                                }
+                            }
+                        }else{
+                            Toast.makeText(context, "Medicine not available", Toast.LENGTH_SHORT).show()
+                        }
+                        persistDispensedBatches(item.id, dispensedBatches)
+                    }
+                }
+                patientVisitInfoSyncRepo.markPharmacistDispensedLocally(
+                    benVisitInfo.patient.patientID,
+                    visitNo
+                )
+                val latestVisitSnapshot = getLatestVisitSnapshot(benVisitInfo, visitNo)
 
                 dtos?.let { prescriptionDTO ->
-                    if(benVisitInfo.benVisitNo!=null){
-                        val prescription = patientRepo.getPrescription(benVisitInfo.patient.patientID, benVisitInfo.benVisitNo, prescriptionDTO.prescriptionID)
-                        prescription.issueType = dtos.issueType
-                        patientRepo.updatePrescription(prescription)
+                    if(visitNo > 0){
+                        val prescription = try {
+                            if (prescriptionDTO.prescriptionID > 0) {
+                                patientRepo.getPrescription(
+                                    benVisitInfo.patient.patientID,
+                                    visitNo,
+                                    prescriptionDTO.prescriptionID
+                                )
+                            } else {
+                                null
+                            }
+                        } catch (e: Exception) {
+                            null
+                        } ?: patientRepo.getLatestPrescription(
+                            benVisitInfo.patient.patientID,
+                            visitNo
+                        )
+                        prescription?.let {
+                            it.issueType = dtos.issueType
+                            patientRepo.updatePrescription(it)
+                        }
                     }
                 }
                 WorkerUtils.pharmacistPushWorker(context)
@@ -224,22 +306,36 @@ class PharmacistFormViewModel @Inject constructor(
 //                    Toast.makeText(context, "Error occured while saving request", Toast.LENGTH_SHORT).show()
 //                }
 
+                // Check if case should auto-close after medicine dispensed
+                val shouldAutoClose = caseClosureManager.shouldAutoClose(latestVisitSnapshot)
+                if (shouldAutoClose) {
+                    Timber.d("Auto-closing case after medicine dispensed: ${benVisitInfo.patient.patientID}/${benVisitInfo.benVisitNo}")
+                    // For pharmacist auto-close cases, doctor state has already been submitted.
+                    // Only pharmacist sync should remain pending here.
+                }
+
                 _isDataSaved.value = true
 
+            } catch (e: Exception) {
+                _isDataSaved.value = false
+                Timber.e(e, "Error saving pharmacist data")
             }
-
-        } catch (e: Exception) {
-            Timber.d("error saving lab records due to $e")
         }
     }
 
     fun savePharmacistDataforManual(dtos: PrescriptionDTO?, benVisitInfo: PatientDisplayWithVisitInfo) {
-        try {
-            viewModelScope.launch {
+        _isDataSaved.value = false
+        viewModelScope.launch {
+            try {
+                val visitNo = benVisitInfo.benVisitNo ?: run {
+                    _isDataSaved.value = false
+                    return@launch
+                }
 
                 dtos?.itemList?.forEach { item ->
                     val prescribedQty = item.qtyPrescribed ?: 0
                     var remainingQty = prescribedQty
+                    val dispensedBatches = mutableListOf<PrescribedDrugsBatch>()
 
                     val selectedBatches = item.batchList?.filter { it.isSelected && it.dispenseQuantity > 0 } ?: emptyList()
 
@@ -248,58 +344,218 @@ class PharmacistFormViewModel @Inject constructor(
                             if (remainingQty <= 0) return@forEach
 
                             val availableBatch = batchDao.getBatchByStockEntityId(batch.itemStockEntryID.toLong())
-                            availableBatch?.let {
-                                val dispenseQty = minOf(batch.dispenseQuantity, remainingQty)
-                                val updatedQty = it.quantityInHand - dispenseQty
+                            availableBatch?.let { dbBatch ->
+                                val dispenseQty = minOf(batch.dispenseQuantity, remainingQty, dbBatch.quantityInHand)
+                                if (dispenseQty > 0) {
+                                    dispensedBatches += PrescribedDrugsBatch(
+                                        drugID = item.id,
+                                        expiryDate = batch.expiryDate,
+                                        expiresIn = batch.expiresIn,
+                                        batchNo = batch.batchNo,
+                                        itemStockEntryID = batch.itemStockEntryID,
+                                        qty = dispenseQty
+                                    )
+                                }
+                                val updatedQty = dbBatch.quantityInHand - dispenseQty
 
                                 if (updatedQty <= 0) {
-                                    batchDao.deleteBatch(it)
+                                    batchDao.deleteBatch(dbBatch)
                                 } else {
-                                    batchDao.updateBatch(it.copy(quantityInHand = updatedQty))
+                                    batchDao.updateBatch(dbBatch.copy(quantityInHand = updatedQty))
                                 }
 
                                 remainingQty -= dispenseQty
+                            } ?: run {
+                                Log.w("PharmacistVM", "Batch not found in database: ${batch.itemStockEntryID}")
                             }
                         }
 
                         if (remainingQty > 0) {
-                            Toast.makeText(context, "Insufficient stock for ${item.genericDrugName}", Toast.LENGTH_SHORT).show()
+                            withContext(Dispatchers.Main) {
+                                Toast.makeText(context, "Insufficient stock for ${item.genericDrugName}. Only ${prescribedQty - remainingQty} units dispensed.", Toast.LENGTH_LONG).show()
+                            }
                         }
-
+                    } else {
+                        Log.w("PharmacistVM", "No batches selected for ${item.genericDrugName}")
                     }
 
-                }
+                    persistDispensedBatches(item.id, dispensedBatches)
 
-                patientVisitInfoSyncRepo.updatePharmacistFlag(
-                    benVisitInfo.patient.patientID,
-                    benVisitInfo.benVisitNo!!
-                )
+                }
 
-                patientVisitInfoSyncRepo.updatePharmacistDataSyncState(
+                patientVisitInfoSyncRepo.markPharmacistDispensedLocally(
                     benVisitInfo.patient.patientID,
-                    benVisitInfo.benVisitNo,
-                    SyncState.UNSYNCED
+                    visitNo
                 )
+                val latestVisitSnapshot = getLatestVisitSnapshot(benVisitInfo, visitNo)
 
                 dtos.let { prescriptionDTO ->
-                    if (benVisitInfo.benVisitNo != null) {
-                        val prescription = patientRepo.getPrescription(
+                    if (visitNo > 0) {
+                        val prescription = try {
+                            if ((prescriptionDTO?.prescriptionID ?: 0L) > 0L) {
+                                patientRepo.getPrescription(
+                                    benVisitInfo.patient.patientID,
+                                    visitNo,
+                                    prescriptionDTO!!.prescriptionID
+                                )
+                            } else {
+                                null
+                            }
+                        } catch (e: Exception) {
+                            null
+                        } ?: patientRepo.getLatestPrescription(
                             benVisitInfo.patient.patientID,
-                            benVisitInfo.benVisitNo,
-                            prescriptionDTO!!.prescriptionID
+                            visitNo
                         )
-                        prescription.issueType = dtos?.issueType
-                        patientRepo.updatePrescription(prescription)
+                        prescription?.let {
+                            it.issueType = dtos?.issueType
+                            patientRepo.updatePrescription(it)
+                        }
                     }
                 }
 
                 WorkerUtils.pharmacistPushWorker(context)
 
+                // Check if case should auto-close after medicine dispensed
+                val shouldAutoClose = caseClosureManager.shouldAutoClose(latestVisitSnapshot)
+                if (shouldAutoClose) {
+                    Timber.d("Auto-closing case after medicine dispensed (manual): ${benVisitInfo.patient.patientID}/${benVisitInfo.benVisitNo}")
+                    // For pharmacist auto-close cases, doctor state has already been submitted.
+                    // Only pharmacist sync should remain pending here.
+                }
+
                 _isDataSaved.value = true
+            } catch (e: Exception) {
+                _isDataSaved.value = false
+                Timber.e(e, "Error saving pharmacist data")
+            }
+        }
+    }
+
+    private suspend fun getLatestVisitSnapshot(
+        benVisitInfo: PatientDisplayWithVisitInfo,
+        visitNo: Int
+    ): PatientDisplayWithVisitInfo {
+        val latestVisit = patientVisitInfoSyncRepo.getPatientVisitInfoSyncByPatientIdAndBenVisitNo(
+            benVisitInfo.patient.patientID,
+            visitNo
+        )
+        return if (latestVisit != null) {
+            benVisitInfo.copy(
+                nurseFlag = latestVisit.nurseFlag,
+                doctorFlag = latestVisit.doctorFlag,
+                labtechFlag = latestVisit.labtechFlag,
+                pharmacist_flag = latestVisit.pharmacist_flag
+            )
+        } else {
+            benVisitInfo.copy(pharmacist_flag = 9)
+        }
+    }
+
+    private suspend fun persistDispensedBatches(
+        prescribedDrugId: Long,
+        dispensedBatches: List<PrescribedDrugsBatch>
+    ) {
+        prescriptionDao.deletePrescribedDrugsBatchByDrugId(prescribedDrugId)
+        dispensedBatches.forEach { prescriptionDao.insert(it) }
+    }
+
+    private fun isHeaderMissing(dto: PrescriptionDTO): Boolean {
+        return dto.prescriptionID <= 0 ||
+            dto.visitCode <= 0 ||
+            dto.consultantName.isNullOrBlank()
+    }
+
+    suspend fun refreshBatchData(): Boolean {
+        return try {
+            val facilityID = userRepo.getLoggedInUser()?.facilityID ?: return false
+            val result = benFlowRepo.getStockDetailsOfSubStore(facilityID)
+            result is NetworkResult.Success
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    suspend fun getBatchesForMedicine(drugID: Long): List<PrescriptionBatchDTO> {
+        return try {
+            // First try to get batches from local database
+            var batches = batchDao.getBatchesByItemID(drugID.toInt())
+
+            // If no batches found locally, try to refresh from server
+            if (batches.isEmpty()) {
+                val refreshSuccess = refreshBatchData()
+                if (refreshSuccess) {
+                    batches = batchDao.getBatchesByItemID(drugID.toInt())
+                }
+            }
+
+            // Convert to PrescriptionBatchDTO format
+            batches.filter { batch ->
+                // Only include non-expired batches with available quantity
+                val expiryDays = calculateExpiryInDays(batch.expiryDate)
+                expiryDays > 0 && batch.quantityInHand > 0
+            }.map { batch ->
+                PrescriptionBatchDTO(
+                    expiresIn = calculateExpiryInDays(batch.expiryDate),
+                    batchNo = batch.batchNo,
+                    expiryDate = convertDateFormat(batch.expiryDate),
+                    itemStockEntryID = batch.stockEntityId.toInt(),
+                    qty = batch.quantityInHand,
+                    isSelected = false,
+                    dispenseQuantity = 0
+                )
+            }
+        } catch (e: Exception) {
+            emptyList()
+        }
+    }
+
+    private fun calculateExpiryInDays(expiryDate: String): Int {
+        return try {
+            val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+            val expiry = sdf.parse(expiryDate)
+            val today = Date()
+            val diffInMillis = expiry?.time?.minus(today.time) ?: 0
+            (diffInMillis / (1000 * 60 * 60 * 24)).toInt()
+        } catch (e: Exception) {
+            0
+        }
+    }
+
+    private fun convertDateFormat(dateString: String): String {
+        return try {
+            val inputFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+            val outputFormat = SimpleDateFormat("dd-MM-yyyy", Locale.US).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+            val date = inputFormat.parse(dateString)
+            outputFormat.format(date ?: Date())
+        } catch (e: Exception) {
+            dateString
+        }
+    }
+
+    fun isNetworkAvailable(): Boolean {
+        return try {
+            val connectivityManager = application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                val network = connectivityManager.activeNetwork ?: return false
+                val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
+                return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
+                        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
+                        networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)
+            } else {
+                @Suppress("DEPRECATION")
+                val networkInfo = connectivityManager.activeNetworkInfo
+                return networkInfo?.isConnected == true
             }
         } catch (e: Exception) {
-            Timber.e(e, "Error saving pharmacist data")
+            false
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PrescriptionBatchFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PrescriptionBatchFormFragment.kt
index 40bc310d1..e26eb61b4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PrescriptionBatchFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/PrescriptionBatchFormFragment.kt
@@ -64,7 +64,7 @@ class PrescriptionBatchFormFragment : Fragment(R.layout.fragment_prescription_ba
         super.onViewCreated(view, savedInstanceState)
         val data = arguments?.getString("batchList")
         if(data==null){
-            Toast.makeText(requireContext(), "Medicine not available", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), getString(R.string.medicine_not_available), Toast.LENGTH_SHORT).show()
         }
         val data2 = arguments?.getString("prescriptionDTO")
         val data3 = arguments?.getString("prescriptionItemDTO")
@@ -77,11 +77,11 @@ class PrescriptionBatchFormFragment : Fragment(R.layout.fragment_prescription_ba
         binding.prescriptionIdValue.text = prescriptionDTO.prescriptionID.toString()
 
         binding.prescribedValue.text = prescriptionItemDTO.qtyPrescribed.toString()
-        binding.dispensedValue.text = prescriptionItemDTO.qtyPrescribed.toString()
+        binding.dispensedValue.text = "0"
         if(batch!=null){
             binding.batchValue.text = batch.batchNo
             binding.quantityInHandValue.text = batch.qty.toString()
-            binding.dispensedQuantityValue.text = prescriptionItemDTO.qtyPrescribed.toString()
+            binding.dispensedQuantityValue.text = "0"
             binding.expiryDateValue.text = batch.expiryDate
         }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/SelectBatchFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/SelectBatchFragment.kt
index 0a10977fd..8b6d713bd 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/SelectBatchFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/commons/pharmacist/SelectBatchFragment.kt
@@ -73,29 +73,41 @@ class SelectBatchFragment : Fragment(R.layout.fragment_select_batch), Navigation
 
         data = arguments?.getString("batchList")
         if(data==null){
-            Toast.makeText(requireContext(), "Medicine not available", Toast.LENGTH_SHORT).show()
+            Toast.makeText(requireContext(), "No batch data received. Please try refreshing.", Toast.LENGTH_LONG).show()
+            findNavController().popBackStack()
+            return
         }
+
         val data2 = arguments?.getString("prescriptionDTO")
         val data3 = arguments?.getString("prescriptionItemDTO")
-         benVisitInfo = arguments?.getSerializable("benVisitInfo") as PatientDisplayWithVisitInfo
+        benVisitInfo = arguments?.getSerializable("benVisitInfo") as PatientDisplayWithVisitInfo
+
+        prescriptionDTO = Gson().fromJson(data2, PrescriptionDTO::class.java)
+        prescriptionItemDTO = Gson().fromJson(data3, PrescriptionItemDTO::class.java)
+
+        try {
+            val batchType = object : TypeToken<List<PrescriptionBatchDTO>>() {}.type
+            batch = Gson().fromJson(data, batchType)
+
+            if (batch.isEmpty()) {
+                Toast.makeText(requireContext(), "No batches available for this medicine.", Toast.LENGTH_LONG).show()
+                findNavController().popBackStack()
+                return
+            }
+
+        } catch (e: Exception) {
+            Toast.makeText(requireContext(), "Error loading batch data. Please try again.", Toast.LENGTH_LONG).show()
+            findNavController().popBackStack()
+            return
+        }
 
-         prescriptionDTO = Gson().fromJson(data2, PrescriptionDTO::class.java)
-         prescriptionItemDTO = Gson().fromJson(data3, PrescriptionItemDTO::class.java)
-        val batchType = object : TypeToken<List<PrescriptionBatchDTO>>() {}.type
-         batch = Gson().fromJson(data, batchType)
         binding.prescribedValue.text = prescriptionItemDTO?.qtyPrescribed.toString()
-        Log.d("BatchJSON", (batch ?: "Data is null").toString())
-        Log.d("BatchJSON", (prescriptionItemDTO ?: "Data is null").toString())
+
         itemAdapter = context?.let { it ->
-            SelectBatchAdapter(
-                it
-            )
+            SelectBatchAdapter(it)
         }
         binding.rvBatch.adapter = itemAdapter
-
         itemAdapter?.submitList(batch)
-
-
     }
 
     fun getResultStr(count:Int?):String{
@@ -114,7 +126,7 @@ class SelectBatchFragment : Fragment(R.layout.fragment_select_batch), Navigation
             .show()
     }
     fun navigateNext() {
-        requireActivity().finish()
+        findNavController().popBackStack()
     }
 
     override fun getFragmentId(): Int {
@@ -124,25 +136,51 @@ class SelectBatchFragment : Fragment(R.layout.fragment_select_batch), Navigation
     override fun onSubmitAction() {
         val selectedBatches = batch.filter { it.isSelected }
         val totalDispensed = selectedBatches.sumOf { it.dispenseQuantity }
-        val prescribedQty = prescriptionItemDTO?.qtyPrescribed!!
+        val prescribedQty = prescriptionItemDTO?.qtyPrescribed ?: 0
+
+        activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = false
+
         when {
+            selectedBatches.isEmpty() -> {
+                showErrorDialog(requireContext(), "No Selection", "Please select at least one batch to dispense.")
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
+            }
+            totalDispensed <= 0 -> {
+                showErrorDialog(requireContext(), "Invalid Quantity", "Please enter a valid dispense quantity for selected batches.")
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
+            }
             totalDispensed > prescribedQty -> {
-                showErrorDialog(requireContext(),"Warning","Dispense quantity can not be more than total quantity prescribed")
+                showErrorDialog(requireContext(), "Quantity Exceeded", "Total dispense quantity ($totalDispensed) cannot exceed prescribed quantity ($prescribedQty).")
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
             }
             selectedBatches.any { it.dispenseQuantity > it.qty } -> {
-                showErrorDialog(requireContext(),"Warning","One or more batches exceed quantity in hand")
-
+                val exceededBatch = selectedBatches.first { it.dispenseQuantity > it.qty }
+                showErrorDialog(requireContext(), "Stock Exceeded", "Batch ${exceededBatch.batchNo} has only ${exceededBatch.qty} units available, but ${exceededBatch.dispenseQuantity} units requested.")
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
+            }
+            selectedBatches.any { it.dispenseQuantity <= 0 } -> {
+                showErrorDialog(requireContext(), "Invalid Quantity", "All selected batches must have a dispense quantity greater than 0.")
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
             }
             else -> {
-                viewModel.savePharmacistDataforManual(prescriptionDTO, benVisitInfo)
-                viewModel.isDataSaved.observe(viewLifecycleOwner){ state ->
-                    when (state!!) {
-                        true -> {
-                            navigateNext()
-                        }
-                        else -> {}
+                // Update the prescription item with selected batches
+                val updatedItem = prescriptionItemDTO?.copy(batchList = batch)
+                prescriptionItemDTO = updatedItem
+                prescriptionDTO?.let { dto ->
+                    val currentList = dto.itemList.toMutableList()
+                    val index = updatedItem?.let { item -> currentList.indexOfFirst { it.id == item.id } } ?: -1
+                    if (index >= 0 && updatedItem != null) {
+                        currentList[index] = updatedItem
+                        dto.itemList = currentList
                     }
                 }
+                updatedItem?.let { item ->
+                    findNavController().previousBackStackEntry
+                        ?.savedStateHandle
+                        ?.set("selected_batch_item", Gson().toJson(item))
+                }
+                activity?.findViewById<View>(R.id.btnSubmit)?.isEnabled = true
+                navigateNext()
             }
         }
     }
@@ -154,4 +192,4 @@ class SelectBatchFragment : Fragment(R.layout.fragment_select_batch), Navigation
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsActivity.kt
index dd37b14cb..72b56c922 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsActivity.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsActivity.kt
@@ -1,11 +1,14 @@
 package org.piramalswasthya.cho.ui.edit_patient_details_activity
 
-import android.content.Intent
 import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.EntryPoint
@@ -20,8 +23,9 @@ import org.piramalswasthya.cho.databinding.ActivityEditPatientDetailsBinding
 import org.piramalswasthya.cho.helpers.MyContextWrapper
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.ui.commons.patient_home.PatientHomeFragmentDirections
+import timber.log.Timber
 import javax.inject.Inject
 
 
@@ -74,155 +78,281 @@ class EditPatientDetailsActivity: AppCompatActivity() {
 
         viewModel = ViewModelProvider(this).get(EditPatientDetailsViewModel::class.java)
 
-        if(preferenceDao.isDoctorSelected()){
-//            navHostFragment = supportFragmentManager.findFragmentById(binding.onlyDoctor.id) as NavHostFragment
-//            binding.patientDetalis.visibility= View.GONE
-//            binding.onlyDoctor.visibility=View.VISIBLE
-//            if ((intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo).doctorFlag == 9) {
-//                binding.bottomNavigation.visibility = View.GONE
-//            }
-            val viewRecord = intent?.getBooleanExtra("viewRecord", false) ?: false
-            val isFlowComplete = intent?.getBooleanExtra("isFlowComplete", false) ?: false
-            val isFollowupVisit = intent?.getBooleanExtra("isFollowupVisit", false) ?: false
-            navHostFragment = supportFragmentManager.findFragmentById(binding.patientDetalis.id) as NavHostFragment
-            navHostFragment.navController
-                .navigate(
-                    R.id.action_patientHomeFragment_to_caseRecordCustom, Bundle().apply {
-                        putBoolean("viewRecord", viewRecord)
-                        putBoolean("isFlowComplete", isFlowComplete)
-                        putBoolean("isFollowupVisit", isFollowupVisit)
-                        putSerializable("benVisitInfo", (intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo))
-                    }
-                )
-        }
-        else if(preferenceDao.isLabSelected()){
-            navHostFragment = supportFragmentManager.findFragmentById(binding.patientDetalis.id) as NavHostFragment
-            navHostFragment.navController
-                .navigate(PatientHomeFragmentDirections.actionPatientHomeFragmentToLabTechnicianFormFragment(
-                    (intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo)
-                ))
+        navHostFragment = supportFragmentManager.findFragmentById(binding.patientDetalis.id) as NavHostFragment
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigation) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                bottomMargin = systemBars.bottom
+            }
+            insets
         }
-        else if(preferenceDao.isPharmaSelected()){
-            navHostFragment = supportFragmentManager.findFragmentById(binding.patientDetalis.id) as NavHostFragment
-            navHostFragment.navController
-                .navigate(PatientHomeFragmentDirections.actionPatientHomeFragmentToPharmacistFormFragment(
-                    (intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo)
-                ))
+        if(savedInstanceState == null) {
+            handleInitialNavigation()
         }
-        else{
-            navHostFragment = supportFragmentManager.findFragmentById(binding.patientDetalis.id) as NavHostFragment
-            navHostFragment.navController
-                .navigate(PatientHomeFragmentDirections.actionPatientHomeFragmentToFhirVisitDetailsFragment(
-                    (intent?.getSerializableExtra("benVisitInfo") as PatientDisplayWithVisitInfo)
-                ))
+        setupNavigationListener()
+        setupUIListeners()
+    }
+
+    private fun showBottomActions(submitTextRes: Int, cancelTextRes: Int = R.string.cancel) {
+        binding.bottomNavigation.visibility = View.VISIBLE
+        binding.linearLayout.visibility = View.VISIBLE
+        binding.btnSubmit.visibility = View.VISIBLE
+        binding.btnCancel.visibility = View.VISIBLE
+        binding.btnSubmit.isEnabled = true
+        binding.btnSubmit.text = resources.getString(submitTextRes)
+        binding.btnCancel.text = resources.getString(cancelTextRes)
+    }
+
+    private fun showCancelOnlyAction(cancelTextRes: Int = R.string.close) {
+        binding.bottomNavigation.visibility = View.VISIBLE
+        binding.linearLayout.visibility = View.VISIBLE
+        binding.btnSubmit.visibility = View.GONE
+        binding.btnCancel.visibility = View.VISIBLE
+        binding.btnCancel.text = resources.getString(cancelTextRes)
+    }
+
+    private fun hideBottomActions() {
+        binding.bottomNavigation.visibility = View.GONE
+        binding.linearLayout.visibility = View.GONE
+    }
+
+    private fun handleInitialNavigation() {
+        val navigateTo = intent.getStringExtra("navigateTo")
+        when {
+            navigateTo == "ANC" -> {
+                val patientID = intent.getStringExtra("patientID") ?: ""
+                val visitNumber = intent.getIntExtra("visitNumber", 1)
+                val isOldVisit = intent.getBooleanExtra("isOldVisit", false)
+
+                navHostFragment.navController.navigate(
+                    R.id.pwAncFormFragment,
+                    Bundle().apply {
+                        putString("patientID", patientID)
+                        putInt("visitNumber", visitNumber)
+                        putBoolean("isOldVisit", isOldVisit)
+                    }
+                )
+            }
+
+            navigateTo == "PNC" -> {
+                val patientID = intent.getStringExtra("patientID") ?: ""
+                val visitNumber = intent.getIntExtra("visitNumber", 1)
+
+                navHostFragment.navController.navigate(
+                    R.id.pncFormFragment,
+                    Bundle().apply {
+                        putString("patientID", patientID)
+                        putInt("visitNumber", visitNumber)
+                    }
+                )
+            }
+
+            (preferenceDao.isDoctorSelected() && !preferenceDao.isUserCHO()) -> {
+                val viewRecord = intent?.getBooleanExtra("viewRecord", false) ?: false
+                val isFlowComplete = intent?.getBooleanExtra("isFlowComplete", false) ?: false
+                val isFollowupVisit = intent?.getBooleanExtra("isFollowupVisit", false) ?: false
+                navHostFragment.navController
+                    .navigate(
+                        R.id.caseRecordCustom, Bundle().apply {
+                            putBoolean("viewRecord", viewRecord)
+                            putBoolean("isFlowComplete", isFlowComplete)
+                            putBoolean("isFollowupVisit", isFollowupVisit)
+                            putSerializable(
+                                "benVisitInfo",
+                                (intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo)
+                            )
+                        }
+                    )
+            }
+
+            preferenceDao.isLabSelected() -> {
+                (intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo)?.let {
+                    navHostFragment.navController.navigate(
+                        PatientHomeFragmentDirections.actionPatientHomeFragmentToLabTechnicianFormFragment(
+                            it
+                        )
+                    )
+                }
+            }
+
+            preferenceDao.isPharmaSelected() -> {
+                (intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo)?.let {
+                    navHostFragment.navController.navigate(
+                        PatientHomeFragmentDirections.actionPatientHomeFragmentToPharmacistFormFragment(
+                            it
+                        )
+                    )
+                }
+            }
+
+            navigateTo == "VITALS" -> {
+                val benVisitInfo =
+                    intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
+                if (benVisitInfo != null) {
+                    val masterDb =
+                        org.piramalswasthya.cho.model.MasterDb(benVisitInfo.patient.patientID).apply {
+                            visitMasterDb.category = "RMNCH"
+                            visitMasterDb.subCategory =
+                                org.piramalswasthya.cho.ui.commons.DropdownConst.careAndPreg
+                            visitMasterDb.reason =
+                                org.piramalswasthya.cho.ui.commons.DropdownConst.anc
+                        }
+                    navHostFragment.navController.navigate(
+                        R.id.customVitalsFragment,
+                        Bundle().apply {
+                            putSerializable("MasterDb", masterDb)
+                        }
+                    )
+                }
+            }
+
+            else -> {
+                val benVisitInfo =
+                    intent?.getSerializableExtra("benVisitInfo") as? PatientDisplayWithVisitInfo
+                if (benVisitInfo != null) {
+                    navHostFragment.navController.navigate(
+                        PatientHomeFragmentDirections.actionPatientHomeFragmentToFhirVisitDetailsFragment(
+                            benVisitInfo
+                        )
+                    )
+                } else {
+                    Timber.e("No benVisitInfo provided for navigation")
+                }
+            }
         }
+    }
 
+    private fun setupNavigationListener() {
         navHostFragment.navController.addOnDestinationChangedListener { controller, destination, arguments ->
+            viewModel.setBottomActionsVisible(true)
             when (destination.id) {
                 R.id.fhirVisitDetailsFragment -> {
-                    binding.bottomNavigation.visibility = View.GONE
+                    showBottomActions(R.string.next)
                     binding.headerTextRegisterPatient.text =
                         resources.getString(R.string.visit_details)
-                    binding.btnSubmit.text = resources.getString(R.string.next)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
                 }
+
                 R.id.customVitalsFragment -> {
-                    binding.bottomNavigation.visibility = View.VISIBLE
-                    binding.headerTextRegisterPatient.text = resources.getString(R.string.vitals_text)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.vitals_text)
                     if (preferenceDao.isUserCHO()) {
-                        binding.btnSubmit.text = resources.getString(R.string.next)
-                    }
-                    else {
-                        binding.btnSubmit.text =
-                            resources.getString(R.string.submit_to_doctor_text)
+                        showBottomActions(R.string.next)
+                    } else {
+                        showBottomActions(R.string.submit_to_doctor_text)
                     }
                 }
+
+                R.id.pregnantWomanRegistrationFragment, R.id.pregnancyRegistrationFormFragment -> {
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.title_register_pregnancy)
+                    hideBottomActions()
+                }
+
                 R.id.cbacFragment -> {
                     binding.headerTextRegisterPatient.text = resources.getString(R.string.cbac)
-                    binding.bottomNavigation.visibility = View.GONE
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    hideBottomActions()
                 }
+
                 R.id.pwAncFormFragment -> {
                     binding.headerTextRegisterPatient.text = resources.getString(R.string.anc)
-                    binding.bottomNavigation.visibility = View.VISIBLE
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    showBottomActions(R.string.submit)
                 }
+
                 R.id.pncFormFragment -> {
                     binding.headerTextRegisterPatient.text = resources.getString(R.string.pnc)
-                    binding.bottomNavigation.visibility = View.VISIBLE
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    showBottomActions(R.string.submit)
                 }
+
                 R.id.immunizationFormFragment -> {
-                    binding.headerTextRegisterPatient.text = resources.getString(R.string.immunization)
-                    binding.bottomNavigation.visibility = View.VISIBLE
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.immunization)
+                    showBottomActions(R.string.submit)
                 }
+
                 R.id.eligibleCoupleTrackingFormFragment -> {
-                    binding.headerTextRegisterPatient.text = resources.getString(R.string.eligible_couple_tracking)
-                    binding.bottomNavigation.visibility = View.VISIBLE
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.eligible_couple_tracking)
+                    hideBottomActions()
                 }
 
                 R.id.caseRecordCustom -> {
-                    binding.headerTextRegisterPatient.text = resources.getString(R.string.case_record_text)
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.case_record_text)
+                    val navArgs = controller.currentBackStackEntry?.arguments ?: arguments
+                    val isClosedViewOnly =
+                        navArgs?.getBoolean("viewRecord", false) == true &&
+                            navArgs.getBoolean("isFlowComplete", false)
+                    if (isClosedViewOnly) {
+                        showCancelOnlyAction(R.string.close)
+                    } else {
+                        showBottomActions(R.string.submit)
+                    }
                 }
+
                 R.id.labTechnicianFormFragment -> {
                     binding.headerTextRegisterPatient.text =
                         resources.getString(R.string.lab_record_text)
-                    binding.btnSubmit.text = resources.getString(R.string.submit)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    showBottomActions(R.string.submit)
                 }
+
                 R.id.selectBatchFragment -> {
-                    binding.headerTextRegisterPatient.text = "Batch Selection"
-                    binding.btnSubmit.text = resources.getString(R.string.save)
-                    binding.btnCancel.text = resources.getString(R.string.cancel)
+                    binding.headerTextRegisterPatient.text = getString(R.string.batch_selection)
+                    showBottomActions(R.string.save)
                 }
+
                 R.id.pharmacistFormFragment -> {
                     binding.headerTextRegisterPatient.text =
                         resources.getString(R.string.pharmacist_record_text)
+                    showBottomActions(R.string.submit)
+                }
+
+                R.id.ophthalmicScreeningFragment -> {
+                    binding.headerTextRegisterPatient.text =
+                        resources.getString(R.string.ophthalmic_screening_title)
+                    binding.bottomNavigation.visibility = View.GONE
                     binding.btnSubmit.text = resources.getString(R.string.submit)
                     binding.btnCancel.text = resources.getString(R.string.cancel)
                 }
             }
         }
+    }
 
-
+    private fun setupUIListeners() {
         binding.homeButton.setOnClickListener {
-            val intent = Intent(this, HomeActivity::class.java)
-            startActivity(intent)
             this.finish()
         }
 
         binding.btnSubmit.setOnClickListener {
-            binding.btnSubmit.visibility = View.VISIBLE
-            currFragment = navHostFragment.childFragmentManager.primaryNavigationFragment as NavigationAdapter
+            currFragment =
+                navHostFragment.childFragmentManager.primaryNavigationFragment as NavigationAdapter
             currFragment.onSubmitAction()
         }
 
         binding.btnCancel.setOnClickListener {
-            binding.btnSubmit.visibility = View.VISIBLE
-            currFragment = navHostFragment.childFragmentManager.primaryNavigationFragment as NavigationAdapter
+            currFragment =
+                navHostFragment.childFragmentManager.primaryNavigationFragment as NavigationAdapter
             currFragment.onCancelAction()
         }
 
         viewModel.submitActive.observe(this) {
             binding.btnSubmit.isEnabled = it
         }
-    }
 
+        viewModel.bottomActionsVisible.observe(this) { visible ->
+            if (visible) {
+                binding.bottomNavigation.visibility = View.VISIBLE
+                binding.linearLayout.visibility = View.VISIBLE
+            } else {
+                binding.bottomNavigation.visibility = View.GONE
+                binding.linearLayout.visibility = View.GONE
+            }
+        }
+    }
 
     override fun onDestroy() {
         super.onDestroy()
         _binding = null
         (application as CHOApplication).activityList.remove(this)
     }
-
 }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsViewModel.kt
index 09607dfa8..80796fcf7 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/edit_patient_details_activity/EditPatientDetailsViewModel.kt
@@ -18,6 +18,10 @@ class EditPatientDetailsViewModel : ViewModel() {
     val submitActive: LiveData<Boolean>
         get() = _submitActive
 
+    private val _bottomActionsVisible = MutableLiveData(true)
+    val bottomActionsVisible: LiveData<Boolean>
+        get() = _bottomActionsVisible
+
     private var patientDetails: PatientDetails? = null
 
     fun savePatientDetails(firstName: String, lastName: String, contactNo: String, gender: String, age: String) {
@@ -43,4 +47,8 @@ class EditPatientDetailsViewModel : ViewModel() {
             _submitActive.postValue(boolean)
 
     }
+
+    fun setBottomActionsVisible(visible: Boolean) {
+        _bottomActionsVisible.value = visible
+    }
 }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormFragment.kt
new file mode 100644
index 000000000..9e6e1c02a
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormFragment.kt
@@ -0,0 +1,85 @@
+package org.piramalswasthya.cho.ui.elder_health
+import android.app.AlertDialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.databinding.FragmentElderlyHealthAssessmentFormBinding
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.work.WorkerUtils
+
+
+@AndroidEntryPoint
+class ElderlyHealthAssessmentFormFragment : BaseAssessmentFormFragment<ElderlyHealthAssessmentFormViewModel>() {
+
+    private var _binding: FragmentElderlyHealthAssessmentFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: ElderlyHealthAssessmentFormViewModel by viewModels()
+
+    override val inputFormRecyclerView: RecyclerView get() = binding.form.rvInputForm
+    override val contentLayout: View get() = binding.llContent
+    override val progressBar: View get() = binding.pbForm
+    override val benNameTextView: TextView get() = binding.tvBenName
+    override val ageGenderTextView: TextView get() = binding.tvAgeGender
+    override val submitButton: View get() = binding.btnSubmit
+    override val cancelButton: View get() = binding.btnCancel
+
+    override fun getFormTitle(): String = getString(R.string.title_elderly_health_assessment)
+    override fun getSaveSuccessMessage(): String = getString(R.string.elderly_health_assessment_saved)
+    override fun getFormFlow(): Flow<List<FormElement>> = viewModel.formList
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+    override fun onSaveForm() = viewModel.saveForm()
+    override fun getFragmentId(): Int = R.id.fragment_elderly_health_assessment_form
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentElderlyHealthAssessmentFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        // Preserve our explicit null-user error crash fix fallback 
+        viewModel.error.observe(viewLifecycleOwner) { errorMessage ->
+            errorMessage?.let {
+                Toast.makeText(requireContext(), it, Toast.LENGTH_LONG).show()
+                findNavController().navigateUp()
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    // Stamp Elderly Health Assessment metadata onto MasterDb from arguments and navigate to the vitals screen.
+    override fun onSaveSuccess() {
+        WorkerUtils.elderlyPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.elderlyHealthAssessment,
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormViewModel.kt
new file mode 100644
index 000000000..281df5542
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/ElderlyHealthAssessmentFormViewModel.kt
@@ -0,0 +1,139 @@
+package org.piramalswasthya.cho.ui.elder_health
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.repositories.ElderlyHealthRepo
+import org.piramalswasthya.cho.model.ElderlyHealthAssessment
+import org.piramalswasthya.cho.configuration.ElderlyHealthAssessmentDataset
+import timber.log.Timber
+import javax.inject.Inject
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+
+@HiltViewModel
+class ElderlyHealthAssessmentFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val elderlyHealthRepo: ElderlyHealthRepo
+) : BaseFormViewModel() {
+
+    /* -------------------- BEN DETAILS -------------------- */
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val _error = MutableLiveData<String?>()
+    val error: LiveData<String?> get() = _error
+
+    private val dataset =
+        ElderlyHealthAssessmentDataset(context, preferenceDao.getCurrentLanguage())
+
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: ElderlyHealthAssessment
+
+
+    init {
+        viewModelScope.launch {
+            try {
+                val user = userRepo.getLoggedInUser()
+                if (user == null) {
+                    Timber.e("No logged in user found")
+                    _error.postValue("No logged in user found")
+                    return@launch
+                }
+
+                val patient = patientID?.let { patientRepo.getPatientDisplay(it) }
+                if (patient == null) {
+                    Timber.e("Patient not found for ID: $patientID")
+                    _error.postValue("Patient not found")
+                    return@launch
+                }
+
+                _benName.value =
+                    "${patient.patient.firstName} ${patient.patient.lastName ?: ""}"
+
+                _benAgeGender.value =
+                    "${patient.patient.age} ${patient.ageUnit?.name ?: ""} | ${patient.gender?.genderName ?: ""}"
+
+                val existingRecord = benVisitNo?.let {
+                    elderlyHealthRepo.getAssessment(patient.patient.patientID, it)
+                }
+
+                if (existingRecord != null) {
+                    assessmentCache = existingRecord
+                } else {
+                    val latestRecord = elderlyHealthRepo.getAssessmentByPatientId(patient.patient.patientID)
+                    if (latestRecord != null) {
+                        assessmentCache = latestRecord.copy(
+                            assessmentId = 0L,
+                            benVisitNo = benVisitNo ?: 0
+                        )
+                    } else {
+                        assessmentCache = ElderlyHealthAssessment(
+                            patientId = patient.patient.patientID,
+                            benVisitNo = benVisitNo ?: 0,
+                        geriatricComplaints = null,
+                        multipleChronicConditions = null,
+                        recentFalls = null,
+                        difficultyWalkingBalance = null,
+                        visualHearingDifficulty = null,
+                        functionalDecline = null,
+                        memoryLoss = null
+                    )
+                }
+                }
+
+                setupDatasetCallbacks()
+
+                dataset.setUpPage(
+                    savedRecord = assessmentCache,
+                    patientAge = patient.patient.age
+                )
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing ElderlyHealthAssessmentFormViewModel")
+            }
+        }
+    }
+
+
+    private fun setupDatasetCallbacks() {
+        dataset.onShowAlert = { message ->
+            Timber.d("Dataset requested alert: $message")
+            _showAlert.postValue(message)
+        }
+    }
+
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        Timber.d("updateListOnValueChanged: formId=$formId, index=$index")
+        launchUpdateList(dataset, formId, index, "Error updating elderly assessment form")
+    }
+
+
+    fun saveForm() {
+        launchSave("Saving Elderly Health Assessment failed") {
+            check(this@ElderlyHealthAssessmentFormViewModel::assessmentCache.isInitialized) {
+                "Assessment cache not initialized"
+            }
+
+            dataset.mapValues(assessmentCache, 1)
+
+            elderlyHealthRepo.saveAssessment(assessmentCache)
+
+            Timber.d("Elderly Health Assessment saved")
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormFragment.kt
new file mode 100644
index 000000000..cf30c4ec9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormFragment.kt
@@ -0,0 +1,71 @@
+package org.piramalswasthya.cho.ui.elder_health
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentPainSymptomAssessmentFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import android.os.Bundle
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class PainAndSymptomAssessmentFormFragment :
+    BaseAssessmentFormFragment<PainAndSymptomAssessmentFormViewModel>() {
+
+    private var _binding: FragmentPainSymptomAssessmentFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: PainAndSymptomAssessmentFormViewModel by viewModels()
+
+    // ── View references ───────────────────────────────────────────────────────
+
+    override val inputFormRecyclerView: RecyclerView get() = binding.form.rvInputForm
+    override val contentLayout: View get() = binding.llContent
+    override val progressBar: View get() = binding.pbForm
+    override val benNameTextView: TextView get() = binding.tvBenName
+    override val ageGenderTextView: TextView get() = binding.tvAgeGender
+    override val submitButton: View get() = binding.btnSubmit
+    override val cancelButton: View get() = binding.btnCancel
+
+    // ── Form-specific values ──────────────────────────────────────────────────
+
+    override fun getFormTitle(): String = getString(R.string.title_pain_symptom_assessment)
+    override fun getSaveSuccessMessage(): String = getString(R.string.pain_symptom_assessment_saved)
+    override fun getFormFlow(): Flow<List<FormElement>> = viewModel.formList
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+    override fun onSaveForm() = viewModel.saveForm()
+    override fun getFragmentId(): Int = R.id.fragment_pain_symptom_assessment_form
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentPainSymptomAssessmentFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()  // shows bottom_navigation
+        _binding = null
+    }
+
+    // Stamp Pain & Symptom Assessment metadata onto MasterDb from arguments and navigate to the vitals screen.
+    override fun onSaveSuccess() {
+        WorkerUtils.painAssessmentPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.persistentPain,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormViewModel.kt
new file mode 100644
index 000000000..e398b3532
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PainAndSymptomAssessmentFormViewModel.kt
@@ -0,0 +1,78 @@
+package org.piramalswasthya.cho.ui.elder_health
+
+import android.content.Context
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.PainAndSymptomAssessmentDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PainAndSymptomAssessment
+import org.piramalswasthya.cho.repositories.PainAndSymptomAssessmentRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class PainAndSymptomAssessmentFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val painAssessmentRepo: PainAndSymptomAssessmentRepo
+) : BaseFormViewModel() {
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val dataset =
+        PainAndSymptomAssessmentDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: PainAndSymptomAssessment
+
+    init {
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    painAssessmentRepo.getAssessmentByPatientIdAndVisitNo(
+                        patient.patient.patientID, benVisitNo
+                    )
+                } else {
+                    painAssessmentRepo.getAssessmentByPatientId(patient.patient.patientID)
+                }
+
+                assessmentCache = existingRecord ?: PainAndSymptomAssessment(
+                    patientID = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                dataset.onShowAlert = { _showAlert.postValue(it) }
+
+                dataset.setUpPage(savedRecord = existingRecord)
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing PainAndSymptomAssessmentFormViewModel")
+            }
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(dataset, formId, index, "Error updating Pain & Symptom form")
+    }
+
+    fun saveForm() {
+        launchSave("Saving Pain & Symptom Assessment failed") {
+            check(::assessmentCache.isInitialized) { "Assessment cache not initialized" }
+            dataset.mapValues(assessmentCache, 1)
+            painAssessmentRepo.saveAssessment(assessmentCache)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormFragment.kt
new file mode 100644
index 000000000..67f2cfecf
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormFragment.kt
@@ -0,0 +1,95 @@
+package org.piramalswasthya.cho.ui.elder_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentPsychosocialCaregiverSupportFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class PsychosocialCaregiverSupportFormFragment :
+    BaseAssessmentFormFragment<PsychosocialCaregiverSupportFormViewModel>() {
+
+    private var _binding: FragmentPsychosocialCaregiverSupportFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: PsychosocialCaregiverSupportFormViewModel by viewModels()
+
+    // ── View references ───────────────────────────────────────────────────────
+
+    override val inputFormRecyclerView: RecyclerView
+        get() = binding.form.rvInputForm
+
+    override val contentLayout: View
+        get() = binding.llContent
+
+    override val progressBar: View
+        get() = binding.pbForm
+
+    override val benNameTextView: TextView
+        get() = binding.tvBenName
+
+    override val ageGenderTextView: TextView
+        get() = binding.tvAgeGender
+
+    override val submitButton: View
+        get() = binding.btnSubmit
+
+    override val cancelButton: View
+        get() = binding.btnCancel
+
+    // ── Form-specific configuration ──────────────────────────────────────────
+
+    override fun getFormTitle(): String =
+        getString(R.string.title_psychosocial_caregiver_support)
+
+    override fun getSaveSuccessMessage(): String =
+        getString(R.string.psychosocial_caregiver_support_saved)
+
+    override fun getFormFlow(): Flow<List<FormElement>> =
+        viewModel.formList
+
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+
+    override fun onSaveForm() =
+        viewModel.saveForm()
+
+    override fun getFragmentId(): Int =
+        R.id.fragment_psychosocial_caregiver_support_form
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding =
+            FragmentPsychosocialCaregiverSupportFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()   // restores bottom navigation
+        _binding = null
+    }
+
+    // Stamp Psychosocial Caregiver Support metadata onto MasterDb from arguments and navigate to the vitals screen.
+    override fun onSaveSuccess() {
+        WorkerUtils.psychosocialCaregiverSupport(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.psychosocialCaregiverSupport,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormViewModel.kt
new file mode 100644
index 000000000..5b981679b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/elder_health/PsychosocialCaregiverSupportFormViewModel.kt
@@ -0,0 +1,91 @@
+package org.piramalswasthya.cho.ui.elder_health
+
+import android.content.Context
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.PsychosocialCaregiverSupportDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PsychosocialCaregiverSupport
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.PsychosocialCaregiverSupportRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class PsychosocialCaregiverSupportFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val psychosocialRepo: PsychosocialCaregiverSupportRepo
+) : BaseFormViewModel() {
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val dataset =
+        PsychosocialCaregiverSupportDataset(context, preferenceDao.getCurrentLanguage())
+
+    val formList = dataset.listFlow
+
+    private lateinit var assessmentCache: PsychosocialCaregiverSupport
+
+    init {
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    psychosocialRepo.getAssessmentByPatientIdAndVisitNo(
+                        patient.patient.patientID,
+                        benVisitNo
+                    )
+                } else {
+                    psychosocialRepo.getAssessmentByPatientId(
+                        patient.patient.patientID
+                    )
+                }
+
+                assessmentCache = existingRecord ?: PsychosocialCaregiverSupport(
+                    patientId = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                dataset.setUpPage(savedRecord = existingRecord)
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing PsychosocialCaregiverSupportFormViewModel")
+            }
+        }
+    }
+
+    // ── Form Updates ──────────────────────────────────────────────────────────
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(
+            dataset,
+            formId,
+            index,
+            "Error updating Psychosocial & Caregiver Support form"
+        )
+    }
+
+    // ── Save ──────────────────────────────────────────────────────────────────
+
+    fun saveForm() {
+        launchSave("Saving Psychosocial & Caregiver Support failed") {
+            check(::assessmentCache.isInitialized) {
+                "Assessment cache not initialized"
+            }
+            dataset.mapValues(assessmentCache, 1)
+            psychosocialRepo.saveAssessment(assessmentCache)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeFragment.kt
index dfcfba276..9fc93b192 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeFragment.kt
@@ -10,12 +10,14 @@ import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.CHOApplication
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.databinding.FragmentHomeBinding
@@ -24,7 +26,6 @@ import org.piramalswasthya.cho.repositories.MaleMasterDataRepository
 import org.piramalswasthya.cho.repositories.RegistrarMasterDataRepo
 import org.piramalswasthya.cho.repositories.VaccineAndDoseTypeRepo
 import org.piramalswasthya.cho.ui.commons.personal_details.PersonalDetailsFragment
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
 import org.piramalswasthya.cho.ui.home_activity.HomeActivityViewModel
 import org.piramalswasthya.cho.ui.register_patient_activity.RegisterPatientActivity
 import org.piramalswasthya.cho.work.WorkerUtils
@@ -60,7 +61,8 @@ class HomeFragment : Fragment() {
             .setTitle(resources.getString(R.string.exit_application))
             .setMessage(resources.getString(R.string.do_you_want_to_exit_application))
             .setPositiveButton(resources.getString(R.string.yes)) { _, _ ->
-                activity?.finish()
+                (requireActivity().application as CHOApplication).closeAllActivities()
+                System.exit(0)
             }
             .setNegativeButton(resources.getString(R.string.no)) { d, _ ->
                 d.dismiss()
@@ -69,6 +71,9 @@ class HomeFragment : Fragment() {
     }
 
 
+    private val activityViewModel by activityViewModels<HomeActivityViewModel>()
+    private var lastObservedRole: String? = null
+
     private lateinit var viewModel: HomeViewModel
 
     private val onBackPressedCallback by lazy {
@@ -85,11 +90,11 @@ class HomeFragment : Fragment() {
         MaterialAlertDialogBuilder(requireContext())
             .setTitle(getString(R.string.note_ben_reg))
             .setMessage(getString(R.string.please_search_for_beneficiary))
-            .setPositiveButton("Search") { dialog, _ ->
+            .setPositiveButton(getString(R.string.search)) { dialog, _ ->
                 dialog.dismiss()
                 HomeViewModel.setSearchBool()
             }
-            .setNegativeButton("Proceed with Registration"){dialog, _->
+            .setNegativeButton(getString(R.string.proceed_with_registration)) { dialog, _ ->
                 val intent = Intent(context, RegisterPatientActivity::class.java)
                 startActivity(intent)
                 dialog.dismiss()
@@ -165,21 +170,22 @@ class HomeFragment : Fragment() {
 
 //        activity?.onBackPressedDispatcher?.addCallback(viewLifecycleOwner, onBackPressedCallback)
         super.onViewCreated(view, savedInstanceState)
-        val fragmentVisitDetails = PersonalDetailsFragment()
-
-        childFragmentManager.beginTransaction().replace(binding.patientListFragment.id, fragmentVisitDetails).commit()
-
-        if(preferenceDao.isNurseSelected() || preferenceDao.isRegistrarSelected()){
-            binding.registration.visibility = View.VISIBLE
-            binding.registration.isEnabled = preferenceDao.isNurseSelected() || preferenceDao.isRegistrarSelected()
-        }
-        else{
-            binding.registration.visibility = View.GONE
+        activityViewModel.currentRole.observe(viewLifecycleOwner) { role ->
+            if (role != lastObservedRole) {
+                lastObservedRole = role
+                childFragmentManager.beginTransaction()
+                    .replace(binding.patientListFragment.id, PersonalDetailsFragment())
+                    .commit()
+            }
+            val showReg = preferenceDao.isNurseSelected() || preferenceDao.isRegistrarSelected()
+            binding.registration.visibility = if (showReg) View.VISIBLE else View.GONE
+            binding.registration.isEnabled = showReg
         }
 
         WorkerUtils.totalPercentageCompleted.observe(viewLifecycleOwner){
             if(it > 0){
                 binding.tvLoadProgress.text = getString(R.string.downloading) + " " + it.toString() + "%"
+                binding.pbLoadProgress.progress = it
             }
         }
         binding.registration.bringToFront()
@@ -237,7 +243,7 @@ class HomeFragment : Fragment() {
         }
         if(preferenceDao.isUserCHO() || preferenceDao.isUserRegistrar()){
             val nurseItem = binding.bottomNavigation.menu.findItem(R.id.nav_nurse)
-            nurseItem?.title = "CHO"
+            nurseItem?.title = getString(R.string.cho_role)
             val choDrawable = context?.let { ContextCompat.getDrawable(it, R.drawable.ic_medical_briefcase) } // R.drawable.cho
 
             // Set the icon using the retrieved Drawable
@@ -289,32 +295,29 @@ class HomeFragment : Fragment() {
 
         if(preferenceDao.isUserCHO()){
             nurseItem?.isChecked = true
-            preferenceDao.setSwitchRoles("Nurse")
+            activityViewModel.switchRole("Nurse")
         }
 //        else if(preferenceDao.isUserRegistrar()){
 //            registrarItem?.isChecked = true
-//            preferenceDao.setSwitchRoles("Registrar")
+//            activityViewModel.switchRole("Registrar")
 //        }
         else if(preferenceDao.isUserStaffNurseOrNurse()){
             nurseItem?.isChecked = true
-            preferenceDao.setSwitchRoles("Nurse")
+            activityViewModel.switchRole("Nurse")
         }
         else if(preferenceDao.isUserDoctorOrMO()){
             docItem?.isChecked = true
-            preferenceDao.setSwitchRoles("Doctor")
+            activityViewModel.switchRole("Doctor")
         }
         else if(preferenceDao.isUserLabTechnician()){
             labItem?.isChecked = true
-            preferenceDao.setSwitchRoles("Lab Technician")
+            activityViewModel.switchRole("Lab Technician")
         }
         else if(preferenceDao.isUserPharmacist()){
             phItem?.isChecked = true
-            preferenceDao.setSwitchRoles("Pharmacist")
+            activityViewModel.switchRole("Pharmacist")
         }
 
-        val refresh = Intent(requireContext(), HomeActivity::class.java)
-        startActivity(refresh)
-
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -326,33 +329,23 @@ class HomeFragment : Fragment() {
         binding.bottomNavigation.setOnNavigationItemSelectedListener { menuItem ->
             when (menuItem.itemId) {
 //                R.id.nav_registrar -> {
-//                    preferenceDao.setSwitchRoles("Registrar")
-//                    val refresh = Intent(requireContext(), HomeActivity::class.java)
-//                    startActivity(refresh)
+//                    activityViewModel.switchRole("Registrar")
 //                    true
 //                }
                 R.id.nav_nurse -> {
-                    preferenceDao.setSwitchRoles("Nurse")
-                    val refresh = Intent(requireContext(), HomeActivity::class.java)
-                    startActivity(refresh)
+                    activityViewModel.switchRole("Nurse")
                     true
                 }
                 R.id.nav_doctor -> {
-                    preferenceDao.setSwitchRoles("Doctor")
-                    val refresh = Intent(requireContext(), HomeActivity::class.java)
-                    startActivity(refresh)
+                    activityViewModel.switchRole("Doctor")
                     true
                 }
                 R.id.nav_lab_technician -> {
-                    preferenceDao.setSwitchRoles("Lab Technician")
-                    val refresh = Intent(requireContext(), HomeActivity::class.java)
-                    startActivity(refresh)
+                    activityViewModel.switchRole("Lab Technician")
                     true
                 }
                 R.id.nav_pharmacist -> {
-                    preferenceDao.setSwitchRoles("Pharmacist")
-                    val refresh = Intent(requireContext(), HomeActivity::class.java)
-                    startActivity(refresh)
+                    activityViewModel.switchRole("Pharmacist")
                     true
                 }
                 else -> {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeViewModel.kt
index c2579a16c..5b204be39 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/HomeViewModel.kt
@@ -66,7 +66,8 @@ class HomeViewModel @Inject constructor(
 
     }
     init {
-      masterVillageName = pref.getLoggedInUser()?.masterVillageName.toString()
+//      masterVillageName = pref.getLoggedInUser()?.masterVillageName.toString()
+        masterVillageName = pref.getLoggedInUser()?.name.toString()
     }
     val scope: CoroutineScope
         get() = viewModelScope
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/ProgressDialogFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/ProgressDialogFragment.kt
index 46ef86916..5ace80c51 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home/ProgressDialogFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/ProgressDialogFragment.kt
@@ -34,9 +34,9 @@ class ProgressDialogFragment : DialogFragment() {
 
     fun updateProgress(filesSent: Int, totalFiles: Int, progress: Int) {
        binding.apply{
-            tvRecordsTransferred.text = "Records Transferred: $filesSent/$totalFiles"
+            tvRecordsTransferred.text = getString(R.string.records_transferred_format, filesSent, totalFiles)
             progressBar.progress = progress
-            tvProgressPercentage.text = "$progress%"
+            tvProgressPercentage.text = getString(R.string.progress_percentage_format, progress)
         }
     }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/RMNCHAFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/RMNCHAFragment.kt
new file mode 100644
index 000000000..65ca25963
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/RMNCHAFragment.kt
@@ -0,0 +1,118 @@
+package org.piramalswasthya.cho.ui.home
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.GridLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.IconGridAdapter
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset
+import org.piramalswasthya.cho.databinding.RvIconGridBinding
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * RMNCHA+ Dashboard Fragment
+ * Displays RMNCHA+ service modules including:
+ * - Maternal Health (Pregnancy, ANC, PNC, Delivery)
+ * - Child Care (Infant, Child, Adolescent)
+ * - Eligible Couple Management
+ * - Family Planning Services
+ * - And other RMNCHA+ services
+ */
+@AndroidEntryPoint
+class RMNCHAFragment : Fragment() {
+
+    @Inject
+    lateinit var iconDataset: RMNCHAIconDataset
+
+    private var _binding: RvIconGridBinding? = null
+    private val binding: RvIconGridBinding
+        get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = RvIconGridBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpRMNCHAIconAdapter()
+    }
+
+    private fun setUpRMNCHAIconAdapter() {
+        val rvLayoutManager = GridLayoutManager(
+            context,
+            requireContext().resources.getInteger(R.integer.icon_grid_span)
+        )
+        binding.rvIconGrid.layoutManager = rvLayoutManager
+        
+        val rvAdapter = IconGridAdapter(
+            IconGridAdapter.GridIconClickListener { navDirections ->
+                // Skip navigation for placeholder entries (actionId == 0)
+                if (navDirections.actionId == 0) {
+                    return@GridIconClickListener
+                }
+
+                try {
+                    // Check if this module has sub-modules
+                    val moduleType = navDirections.arguments.getString(
+                        RMNCHAIconDataset.MODULE_TYPE_KEY
+                    )
+
+                    // Check for direct fragment navigation
+                    val showECTracking = navDirections.arguments.getBoolean(
+                        RMNCHAIconDataset.SHOW_EC_TRACKING_KEY, false
+                    )
+                    val showAdolescentList = navDirections.arguments.getBoolean(
+                        RMNCHAIconDataset.SHOW_ADOLESCENT_LIST_KEY, false
+                    )
+
+                    when {
+                        moduleType != null -> {
+                            // Navigate to SubModuleActivity for modules with sub-cards
+                            val intent = org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity.getIntent(
+                                requireContext(),
+                                moduleType
+                            )
+                            startActivity(intent)
+                        }
+                        showECTracking -> {
+                            // Navigate directly to EC Tracking
+                            val intent = org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity.getDirectFragmentIntent(
+                                requireContext(),
+                                RMNCHAIconDataset.SHOW_EC_TRACKING_KEY
+                            )
+                            startActivity(intent)
+                        }
+                        showAdolescentList -> {
+                            // Navigate directly to Adolescent List
+                            val intent = org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity.getDirectFragmentIntent(
+                                requireContext(),
+                                RMNCHAIconDataset.SHOW_ADOLESCENT_LIST_KEY
+                            )
+                            startActivity(intent)
+                        }
+                    }
+                    Timber.d("RMNCHA+ icon clicked: ${navDirections.actionId}")
+                } catch (e: Exception) {
+                    Timber.e(e, "Navigation failed")
+                }
+            }
+        )
+        
+        binding.rvIconGrid.adapter = rvAdapter
+        rvAdapter.submitList(iconDataset.getRMNCHAIconDataset(resources))
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/SyncViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/SyncViewModel.kt
index da2589e74..73ed4224c 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home/SyncViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/SyncViewModel.kt
@@ -1,16 +1,200 @@
 package org.piramalswasthya.cho.ui.home
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import org.piramalswasthya.cho.database.room.SyncModuleIds
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.DeliveryOutcomeDao
+import org.piramalswasthya.cho.database.room.dao.EcrDao
 import org.piramalswasthya.cho.database.room.dao.PatientVisitInfoSyncDao
+import org.piramalswasthya.cho.model.ChildRegDomain
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.model.SyncStatusCache
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.PncRepo
 import javax.inject.Inject
+import java.util.concurrent.TimeUnit
 
 @HiltViewModel
 class SyncViewModel @Inject constructor(
     patientVisitInfoSyncDao: PatientVisitInfoSyncDao,
-) : ViewModel(){
+    private val ecrDao: EcrDao,
+    private val deliveryOutcomeDao: DeliveryOutcomeDao,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val pncRepo: PncRepo,
+    private val infantRegRepo: InfantRegRepo,
+    private val patientRepo: PatientRepo,
+) : ViewModel() {
 
-    val syncStatus = patientVisitInfoSyncDao.getSyncStatus()
+    private val choSyncStatus: Flow<List<SyncStatusCache>> = patientVisitInfoSyncDao.getSyncStatus()
 
-}
\ No newline at end of file
+    private val rmnchSyncStatus: Flow<List<SyncStatusCache>> = combineStatusFlows(
+        ecrDao.getEligibleCoupleTrackingSyncStatus(),
+        pwrSyncStatus(),
+        ancSyncStatus(),
+        deliveryOutcomeDao.getDeliveryOutcomeSyncStatus(),
+        pncSyncStatus(),
+        infantSyncStatus(),
+        childSyncStatus(),
+        abortionSyncStatus(),
+        adolescentSyncStatus(),
+    )
+
+    val syncStatus: Flow<List<SyncStatusCache>> = combine(choSyncStatus, rmnchSyncStatus) { cho, rmnch ->
+        (cho + rmnch).sortedBy { it.id }
+    }
+
+    private fun pwrSyncStatus(): Flow<List<SyncStatusCache>> {
+        return maternalHealthRepo.getAllPatientsWithPWR().map { patients ->
+            val visibleRows = patients.map { it.asDomainModel() }
+                .filter { it.isVisibleForPwr() }
+            listOf(
+                buildStatus(
+                    id = 7,
+                    name = "PW Registration",
+                    syncStates = visibleRows.mapNotNull { it.pwr?.syncState }
+                )
+            )
+        }
+    }
+
+    private fun ancSyncStatus(): Flow<List<SyncStatusCache>> {
+        return maternalHealthRepo.getAllPatientsWithANC().map { patients ->
+            val visibleRows = patients.map { it.asDomainModel() }
+                .filter { it.isVisibleForAnc() }
+            listOf(
+                buildStatus(
+                    id = 8,
+                    name = "PW ANC",
+                    syncStates = visibleRows.mapNotNull { it.lastAnc?.syncState }
+                )
+            )
+        }
+    }
+
+    private fun pncSyncStatus(): Flow<List<SyncStatusCache>> {
+        return pncRepo.getAllPNCMothers().map { patients ->
+            val visibleRows = patients.map { it.asDomainModel() }
+            listOf(
+                buildStatus(
+                    id = SyncModuleIds.PNC,
+                    name = "PNC",
+                    syncStates = visibleRows.mapNotNull { it.syncState }
+                )
+            )
+        }
+    }
+
+    private fun infantSyncStatus(): Flow<List<SyncStatusCache>> {
+        return infantRegRepo.getListForInfantReg().map { infants ->
+            val visibleRows = infants.filter { it.isRegistered() }
+            listOf(
+                buildStatus(
+                    id = SyncModuleIds.INFANT_REG,
+                    name = "Infant Reg.",
+                    syncStates = visibleRows.mapNotNull { it.syncState }
+                )
+            )
+        }
+    }
+
+    private fun childSyncStatus(): Flow<List<SyncStatusCache>> {
+        return infantRegRepo.getRegisteredInfants().map { children ->
+            val visibleRows = children
+                .groupBy { it.motherPatient.patientID to it.infant.babyIndex }
+                .map { (_, rows) ->
+                    rows.maxWithOrNull(
+                        compareBy<ChildRegDomain> { it.isChildRegistered() }
+                            .thenByDescending { maxOf(it.infant.updatedDate, it.infant.createdDate) }
+                    ) ?: rows.first()
+                }
+                .filter { it.isChildRegistered() }
+                .sortedWith(
+                    compareBy<ChildRegDomain> { it.isChildRegistered() }
+                        .thenByDescending { maxOf(it.infant.updatedDate, it.infant.createdDate) }
+                        .thenByDescending { it.infant.updatedDate }
+                )
+
+            listOf(
+                buildStatus(
+                    id = SyncModuleIds.CHILD_REG,
+                    name = "Child Reg.",
+                    syncStates = visibleRows.mapNotNull { it.syncState }
+                )
+            )
+        }
+    }
+
+    private fun abortionSyncStatus(): Flow<List<SyncStatusCache>> {
+        return maternalHealthRepo.getAbortionPregnantWomanList().map { abortingWomen ->
+            listOf(
+                buildStatus(
+                    id = 13,
+                    name = "Abortion List",
+                    syncStates = abortingWomen.mapNotNull { it.syncState }
+                )
+            )
+        }
+    }
+
+    private fun adolescentSyncStatus(): Flow<List<SyncStatusCache>> {
+        return patientRepo.getAdolescentList().map { adolescents ->
+            listOf(
+                buildStatus(
+                    id = 14,
+                    name = "Adolescent List",
+                    syncStates = adolescents.mapNotNull { it.patient.syncState }
+                )
+            )
+        }
+    }
+
+    private fun buildStatus(
+        id: Int,
+        name: String,
+        syncStates: Iterable<SyncState?>
+    ): SyncStatusCache {
+        val stateList = syncStates.toList()
+        return SyncStatusCache(
+            id = id,
+            name = name,
+            synced = stateList.count { it == SyncState.SYNCED },
+            notSynced = stateList.count { it == SyncState.UNSYNCED },
+            syncing = stateList.count { it == SyncState.SYNCING }
+        )
+    }
+
+    private fun combineStatusFlows(vararg flows: Flow<List<SyncStatusCache>>): Flow<List<SyncStatusCache>> {
+        return combine(flows.toList()) { statusGroups: Array<out List<SyncStatusCache>> ->
+            statusGroups.asList()
+                .flatten()
+                .sortedBy { it.id }
+        }
+    }
+
+    private fun PatientWithPwrDomain.isVisibleForPwr(): Boolean {
+        val isFemale = patient.genderID == 2
+        val age = patient.age ?: 0
+        val isReproductiveAge = age in 15..49
+        val isPostnatal = patient.statusOfWomanID == 3
+        return pwr != null && isFemale && isReproductiveAge && !isPostnatal
+    }
+
+    private fun PatientWithPwrDomain.isVisibleForAnc(): Boolean {
+        val hasActivePWR = pwr != null && isActive()
+        val isFemale = patient.genderID == 2
+        val age = patient.age ?: 0
+        val isReproductiveAge = age in 15..49
+        val minAncDays = 5L * 7L
+        val isEligibleForANC = pwr?.lmpDate?.let { lmpDate ->
+            val daysSinceLMP = TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - lmpDate)
+            daysSinceLMP >= minAncDays
+        } ?: false
+        return hasActivePWR && isFemale && isReproductiveAge && isEligibleForANC
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleActivity.kt
new file mode 100644
index 000000000..303b79258
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleActivity.kt
@@ -0,0 +1,115 @@
+package org.piramalswasthya.cho.ui.home.rmncha
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.MODULE_MATERNAL_HEALTH
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.MODULE_TYPE_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_EC_TRACKING_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ADOLESCENT_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ANC_VISITS_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ABORTION_LIST_KEY
+import org.piramalswasthya.cho.databinding.ActivitySubModuleBinding
+
+/**
+ * Activity to host sub-module fragments for RMNCHA+ modules
+ */
+@AndroidEntryPoint
+class SubModuleActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivitySubModuleBinding
+
+    companion object {
+        private const val DIRECT_FRAGMENT_KEY = "direct_fragment_key"
+
+        fun getIntent(context: Context, moduleType: String): Intent {
+            return Intent(context, SubModuleActivity::class.java).apply {
+                putExtra(MODULE_TYPE_KEY, moduleType)
+            }
+        }
+
+        fun getDirectFragmentIntent(context: Context, fragmentKey: String): Intent {
+            return Intent(context, SubModuleActivity::class.java).apply {
+                putExtra(DIRECT_FRAGMENT_KEY, fragmentKey)
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySubModuleBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        val moduleType = intent.getStringExtra(MODULE_TYPE_KEY)
+        val directFragmentKey = intent.getStringExtra(DIRECT_FRAGMENT_KEY)
+
+        // Set up toolbar
+        setSupportActionBar(binding.toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        if (savedInstanceState == null) {
+            when {
+                directFragmentKey != null -> {
+                    // Direct fragment loading (EC Tracking, Adolescent List)
+                    supportActionBar?.title = getDirectFragmentTitle(directFragmentKey)
+                    val fragment = when (directFragmentKey) {
+                        SHOW_EC_TRACKING_KEY -> org.piramalswasthya.cho.ui.home.rmncha.eligible_couple.EligibleCoupleTrackingFragment()
+                        SHOW_ADOLESCENT_LIST_KEY -> org.piramalswasthya.cho.ui.home.rmncha.child_care.AdolescentListFragment()
+                        SHOW_ANC_VISITS_KEY -> org.piramalswasthya.cho.ui.home.rmncha.maternal_health.ANCVisitsFragment()
+                        SHOW_ABORTION_LIST_KEY -> org.piramalswasthya.cho.ui.home.rmncha.maternal_health.AbortionListFragment()
+                        else -> null
+                    }
+                    fragment?.let {
+                        supportFragmentManager.beginTransaction()
+                            .replace(R.id.fragment_container, it)
+                            .commit()
+                    }
+                }
+                moduleType != null -> {
+                    // Sub-module grid loading
+                    supportActionBar?.title = getModuleTitle(moduleType)
+                    supportFragmentManager.beginTransaction()
+                        .replace(
+                            R.id.fragment_container,
+                            SubModuleFragment.newInstance(moduleType)
+                        )
+                        .commit()
+                }
+            }
+        }
+    }
+
+    private fun getModuleTitle(moduleType: String?): String {
+        return when (moduleType) {
+            MODULE_MATERNAL_HEALTH -> getString(R.string.maternal_health)
+            else -> getString(R.string.app_name)
+        }
+    }
+
+    private fun getDirectFragmentTitle(fragmentKey: String): String {
+        return when (fragmentKey) {
+            SHOW_EC_TRACKING_KEY -> getString(R.string.eligible_couple_tracking)
+            SHOW_ADOLESCENT_LIST_KEY -> getString(R.string.adolescent_list)
+            SHOW_ANC_VISITS_KEY -> getString(R.string.anc_visits)
+            SHOW_ABORTION_LIST_KEY -> getString(R.string.abortion_list)
+            else -> getString(R.string.app_name)
+        }
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed()
+        return true
+    }
+
+    fun navigateToMaternalHealthCards() {
+        supportFragmentManager.popBackStackImmediate(null, androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE)
+        supportFragmentManager.commit {
+            replace(R.id.fragment_container, SubModuleFragment.newInstance(MODULE_MATERNAL_HEALTH))
+        }
+        supportActionBar?.title = getString(R.string.maternal_health)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleFragment.kt
new file mode 100644
index 000000000..9756dafa7
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/SubModuleFragment.kt
@@ -0,0 +1,231 @@
+package org.piramalswasthya.cho.ui.home.rmncha
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.recyclerview.widget.GridLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.IconGridAdapter
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.MODULE_MATERNAL_HEALTH
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.MODULE_TYPE_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_EC_TRACKING_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_PWR_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ANC_VISITS_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_DELIVERY_OUTCOME_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_NEONATAL_OUTCOME_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_PNC_MOTHER_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_E_PMSMA_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ABORTION_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_INFANT_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_CHILD_LIST_KEY
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ADOLESCENT_LIST_KEY
+import org.piramalswasthya.cho.databinding.RvIconGridBinding
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SubModuleFragment : Fragment() {
+
+    @Inject
+    lateinit var iconDataset: RMNCHAIconDataset
+
+    private var _binding: RvIconGridBinding? = null
+    private val binding: RvIconGridBinding
+        get() = _binding!!
+
+    private var moduleType: String? = null
+
+    companion object {
+        fun newInstance(moduleType: String): SubModuleFragment {
+            return SubModuleFragment().apply {
+                arguments = Bundle().apply {
+                    putString(MODULE_TYPE_KEY, moduleType)
+                }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        moduleType = arguments?.getString(MODULE_TYPE_KEY)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = RvIconGridBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpSubModuleIconAdapter()
+    }
+
+    private fun setUpSubModuleIconAdapter() {
+        val rvLayoutManager = GridLayoutManager(
+            context,
+            requireContext().resources.getInteger(R.integer.icon_grid_span)
+        )
+        binding.rvIconGrid.layoutManager = rvLayoutManager
+        
+        val rvAdapter = IconGridAdapter(
+            IconGridAdapter.GridIconClickListener { navDirections ->
+                // Skip navigation for placeholder entries (actionId == 0)
+                if (navDirections.actionId == 0) {
+                    return@GridIconClickListener
+                }
+                
+                try {
+                    // Check if this is a direct list navigation
+                    val showECTracking = navDirections.arguments.getBoolean(SHOW_EC_TRACKING_KEY, false)
+                    val showPWR = navDirections.arguments.getBoolean(SHOW_PWR_KEY, false)
+                    val showANCVisits = navDirections.arguments.getBoolean(SHOW_ANC_VISITS_KEY, false)
+                    val showDeliveryOutcome = navDirections.arguments.getBoolean(SHOW_DELIVERY_OUTCOME_KEY, false)
+                    val showNeonatalOutcome = navDirections.arguments.getBoolean(SHOW_NEONATAL_OUTCOME_KEY, false)
+                    val showPNCMotherList = navDirections.arguments.getBoolean(SHOW_PNC_MOTHER_LIST_KEY, false)
+                    val showEPmsmaList = navDirections.arguments.getBoolean(SHOW_E_PMSMA_LIST_KEY, false)
+                    val showAbortionList = navDirections.arguments.getBoolean(SHOW_ABORTION_LIST_KEY, false)
+                    val showInfantList = navDirections.arguments.getBoolean(SHOW_INFANT_LIST_KEY, false)
+                    val showChildList = navDirections.arguments.getBoolean(SHOW_CHILD_LIST_KEY, false)
+                    val showAdolescentList = navDirections.arguments.getBoolean(SHOW_ADOLESCENT_LIST_KEY, false)
+                    
+                    when {
+                        showECTracking -> {
+                            // Navigate to Eligible Couple Tracking List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.eligible_couple.EligibleCoupleTrackingFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showPWR -> {
+                            // Navigate to Maternal Health Nav Host (which uses nav_maternal_health.xml)
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.MaternalHealthNavHostFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showANCVisits -> {
+                            // Navigate to ANC Visits List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.ANCVisitsFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showDeliveryOutcome -> {
+                            // Navigate to Delivery Outcome List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.DeliveryOutcomeFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showNeonatalOutcome -> {
+                            // Navigate to Neonatal Outcome List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.NeonatalOutcomeFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showPNCMotherList -> {
+                            // Navigate to PNC Mother List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.PNCMotherListFragment()
+                            requireActivity().supportFragmentManager.beginTransaction()
+                                .replace(R.id.fragment_container, fragment)
+                                .addToBackStack(null)
+                                .commit()
+                        }
+                        showEPmsmaList -> {
+                            // Navigate to e-PMSMA List Fragment (high-risk ANC women)
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.EPmsmaListFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showAbortionList -> {
+                            // Navigate to Abortion List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.maternal_health.AbortionListFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showInfantList -> {
+                            // Navigate to Infant List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.child_care.InfantListFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showChildList -> {
+                            // Navigate to Child Registration list (registered infants)
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.child_care.ChildRegistrationListFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        showAdolescentList -> {
+                            // Navigate to Adolescent List Fragment
+                            val fragment = org.piramalswasthya.cho.ui.home.rmncha.child_care.AdolescentListFragment()
+                            requireActivity().supportFragmentManager.commit {
+                                replace(R.id.fragment_container, fragment)
+                                addToBackStack(null)
+                            }
+                        }
+                        else -> {
+                            // Other sub-modules - placeholder
+                            Toast.makeText(
+                                requireContext(),
+                                "List view coming soon",
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                    Timber.d("Sub-module icon clicked: ${navDirections.actionId}")
+                } catch (e: Exception) {
+                    Timber.e(e, "Navigation failed")
+                }
+            }
+        )
+        
+        binding.rvIconGrid.adapter = rvAdapter
+        
+        // Load appropriate dataset based on module type
+        val iconList = when (moduleType) {
+            MODULE_MATERNAL_HEALTH -> iconDataset.getMaternalHealthDataset(resources)
+            else -> emptyList()
+        }
+        
+        rvAdapter.submitList(iconList)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val titleRes = when (moduleType) {
+            MODULE_MATERNAL_HEALTH -> R.string.maternal_health
+            else -> null
+        }
+        titleRes?.let {
+            (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title = getString(it)
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/AdolescentListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/AdolescentListFragment.kt
new file mode 100644
index 000000000..6c7ebf44f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/AdolescentListFragment.kt
@@ -0,0 +1,145 @@
+package org.piramalswasthya.cho.ui.home.rmncha.child_care
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import android.widget.Toast
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.AdolescentListAdapter
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.FragmentAdolescentListBinding
+import org.piramalswasthya.cho.model.PatientDisplay
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.filterPatientsByQuery
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of adolescents (age 10-19 years)
+ * Shows all registered adolescents for child care services
+ */
+@AndroidEntryPoint
+class AdolescentListFragment : Fragment() {
+
+    @Inject
+    lateinit var patientRepo: PatientRepo
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: FragmentAdolescentListBinding? = null
+    private val binding get() = _binding!!
+    
+    private lateinit var adapter: AdolescentListAdapter
+    private var allAdolescents: List<PatientDisplay> = emptyList()
+    private var filteredAdolescents: List<PatientDisplay> = emptyList()
+
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            onSpeechResult = { text -> binding.searchBarInclude.search.setText(text) },
+            onFaceMatchResult = { matchedPatient ->
+                if (matchedPatient != null) {
+                    filteredAdolescents = allAdolescents.filter { it.patient.patientID == matchedPatient.patientID }
+                    updateUI()
+                    if (filteredAdolescents.isNotEmpty()) {
+                        Toast.makeText(requireContext(), "1 matching record found", Toast.LENGTH_SHORT).show()
+                    } else {
+                        Toast.makeText(requireContext(), "Patient not found in this Adolescent list", Toast.LENGTH_LONG).show()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "No matching patient found", Toast.LENGTH_SHORT).show()
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentAdolescentListBinding.inflate(inflater, container, false)
+        faceSearchHelper
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        setupRecyclerView()
+        setupSearch()
+        observeAdolescents()
+    }
+
+    private fun setupRecyclerView() {
+        adapter = AdolescentListAdapter(
+            AdolescentListAdapter.ClickListener { patient ->
+                // Handle click - navigate to adolescent details/form
+                // TODO: Navigate to adolescent form or details screen
+            }
+        )
+
+        binding.rvAdolescentList.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvAdolescentList.adapter = adapter
+    }
+
+    private fun setupSearch() {
+        binding.searchBarInclude.search.setupSearchTextWatcher { query ->
+            filterAdolescents(query)
+        }
+        binding.searchBarInclude.searchTil.setEndIconOnClickListener {
+            faceSearchHelper.launchSpeechToText()
+        }
+        binding.searchBarInclude.cameraIcon.setOnClickListener {
+            faceSearchHelper.launchCameraSearch()
+        }
+    }
+
+    private fun observeAdolescents() {
+        lifecycleScope.launch {
+            patientRepo.getAdolescentList().collectLatest { adolescentsList ->
+                allAdolescents = adolescentsList.sortedByDescending { it.patient.dob?.time ?: 0L }
+                filteredAdolescents = allAdolescents
+                updateUI()
+            }
+        }
+    }
+
+    private fun filterAdolescents(query: String) {
+        filteredAdolescents = allAdolescents.filterPatientsByQuery(query) { it.patient }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        adapter.submitList(filteredAdolescents)
+        updateListUI(
+            filteredList = filteredAdolescents,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvAdolescentList,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying adolescents"
+        )
+    }
+    
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title = getString(R.string.adolescent_list)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildBeneficiaryRegistrationFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildBeneficiaryRegistrationFragment.kt
new file mode 100644
index 000000000..ceaefe6d5
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildBeneficiaryRegistrationFragment.kt
@@ -0,0 +1,373 @@
+package org.piramalswasthya.cho.ui.home.rmncha.child_care
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.configuration.ChildBeneficiaryRegistrationDataset
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.databinding.FragmentNeonatalOutcomeBinding
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.utils.generateUuid
+import timber.log.Timber
+import java.util.Date
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChildBeneficiaryRegistrationFragment : Fragment() {
+
+    @Inject
+    lateinit var infantRegRepo: InfantRegRepo
+
+    @Inject
+    lateinit var deliveryOutcomeRepo: DeliveryOutcomeRepo
+
+    @Inject
+    lateinit var patientRepo: PatientRepo
+
+    @Inject
+    lateinit var userRepo: UserRepo
+
+    @Inject
+    lateinit var preferenceDao: PreferenceDao
+
+    private var _binding: FragmentNeonatalOutcomeBinding? = null
+    private val binding get() = _binding!!
+
+    private val motherPatientID: String? by lazy {
+        arguments?.getString(ChildRegistrationListFragment.ARG_MOTHER_PATIENT_ID)
+            ?: arguments?.getString("patientID")
+    }
+    private val babyIndex: Int by lazy {
+        arguments?.getInt(ChildRegistrationListFragment.ARG_BABY_INDEX, 0)
+            ?: arguments?.getInt("babyIndex", 0)
+            ?: 0
+    }
+    private val childPatientIDArg: String? by lazy {
+        arguments?.getString(ChildRegistrationListFragment.ARG_CHILD_PATIENT_ID)
+    }
+
+    private lateinit var dataset: ChildBeneficiaryRegistrationDataset
+    private lateinit var formAdapter: FormInputAdapter
+
+    private var currentInfantReg: InfantRegCache? = null
+    private var motherPatient: Patient? = null
+    private var deliveryOutcome: DeliveryOutcomeCache? = null
+    private var existingChildPatient: Patient? = null
+    private var isViewOnlyMode: Boolean = false
+    private var isFormReadOnly: Boolean = false
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNeonatalOutcomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        dataset = ChildBeneficiaryRegistrationDataset(
+            requireContext(),
+            preferenceDao.getCurrentLanguage()
+        )
+
+        formAdapter = createFormAdapter(readOnly = false)
+
+        binding.rvForm.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvForm.adapter = formAdapter
+
+        dataset.listFlow.asLiveData().observe(viewLifecycleOwner) { elements ->
+            formAdapter.submitList(elements)
+        }
+
+        binding.btnSave.setOnClickListener { saveForm() }
+        binding.btnCancel.setOnClickListener { parentFragmentManager.popBackStack() }
+
+        loadData()
+    }
+
+    private fun loadData() {
+        val motherId = motherPatientID
+        if (motherId.isNullOrBlank()) {
+            showError("Missing mother patient ID")
+            return
+        }
+
+        lifecycleScope.launch {
+            try {
+                binding.progressBar.visibility = View.VISIBLE
+
+                val mother = getPatientOrNull(motherId)
+                if (mother == null) {
+                    showError("Mother record not found")
+                    return@launch
+                }
+                val delivery = deliveryOutcomeRepo.getDeliveryOutcome(motherId)
+                val infantReg = infantRegRepo.getInfantReg(motherId, babyIndex)
+
+                if (delivery == null) {
+                    showError("Delivery outcome not found")
+                    return@launch
+                }
+                if (infantReg == null) {
+                    showError("Infant registration not found")
+                    return@launch
+                }
+
+                val childPatientID = childPatientIDArg ?: infantReg.childPatientID
+                val existingChild = childPatientID?.let { getPatientOrNull(it) }
+                isViewOnlyMode = (existingChild != null) || infantReg.processed == "C"
+
+                motherPatient = mother
+                deliveryOutcome = delivery
+                currentInfantReg = infantReg
+                existingChildPatient = existingChild
+
+                applyScreenMode(isViewOnlyMode)
+
+                dataset.setUpPage(
+                    motherPatient = mother,
+                    deliveryOutcomeCache = delivery,
+                    infantRegCache = infantReg,
+                    existingChild = existingChild
+                )
+
+                binding.progressBar.visibility = View.GONE
+            } catch (e: Exception) {
+                Timber.e(e, "Error loading child beneficiary registration")
+                showError("Error loading data: ${e.message}")
+            }
+        }
+    }
+
+    private fun createFormAdapter(readOnly: Boolean): FormInputAdapter {
+        return FormInputAdapter(
+            formValueListener = if (readOnly) null else FormInputAdapter.FormValueListener { id, index ->
+                lifecycleScope.launch { dataset.updateList(id, index) }
+            },
+            isEnabled = !readOnly
+        )
+    }
+
+    private fun applyScreenMode(isViewOnly: Boolean) {
+        binding.btnSave.visibility = if (isViewOnly) View.GONE else View.VISIBLE
+
+        (binding.btnCancel.layoutParams as? ConstraintLayout.LayoutParams)?.let { params ->
+            if (isViewOnly) {
+                params.endToStart = ConstraintLayout.LayoutParams.UNSET
+                params.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID
+            } else {
+                params.endToStart = R.id.btnSave
+                params.endToEnd = ConstraintLayout.LayoutParams.UNSET
+            }
+            binding.btnCancel.layoutParams = params
+        }
+
+        if (isFormReadOnly == isViewOnly) return
+        isFormReadOnly = isViewOnly
+        formAdapter = createFormAdapter(readOnly = isFormReadOnly)
+        binding.rvForm.adapter = formAdapter
+        formAdapter.submitList(dataset.listFlow.value)
+    }
+
+    private fun saveForm() {
+        if (isViewOnlyMode) return
+
+        val validationResult = formAdapter.validateInput(resources, binding.rvForm)
+        if (validationResult != -1) {
+            binding.rvForm.scrollToPosition(validationResult)
+            return
+        }
+
+        motherPatient ?: return
+        deliveryOutcome ?: return
+        val infantReg = currentInfantReg ?: return
+
+        lifecycleScope.launch {
+            try {
+                binding.progressBar.visibility = View.VISIBLE
+                binding.btnSave.isEnabled = false
+                binding.btnCancel.isEnabled = false
+
+                val now = System.currentTimeMillis()
+                val userName = userRepo.getLoggedInUser()?.userName.orEmpty()
+                val childGenderId = dataset.getGenderID() ?: infantReg.genderID
+
+                val childPatient = buildOrUpdateChildPatient(
+                    mother = motherPatient ?: return@launch,
+                    delivery = deliveryOutcome ?: return@launch,
+                    infantReg = infantReg,
+                    childName = dataset.getChildFullName(),
+                    childGenderId = childGenderId,
+                    userName = userName
+                )
+
+                val updatedInfant = infantReg.copy(
+                    childPatientID = childPatient.patientID,
+                    babyName = dataset.getChildFullName().ifBlank { infantReg.babyName },
+                    genderID = childGenderId,
+                    updatedBy = userName,
+                    updatedDate = now,
+                    syncState = SyncState.UNSYNCED,
+                    processed = if (infantReg.processed == "N") "N" else "U"
+                )
+                infantRegRepo.upsertInfantReg(updatedInfant)
+                val childSyncDone = infantRegRepo.syncChildRegistration(updatedInfant)
+                if (!childSyncDone) {
+                    Timber.w("Child saveAll failed for motherPatientID=${updatedInfant.motherPatientID}, babyIndex=${updatedInfant.babyIndex}")
+                }
+                val beneficiarySyncDone = patientRepo.processPatientById(childPatient.patientID)
+                if (!beneficiarySyncDone) {
+                    Timber.w("Beneficiary sync failed for child patientID=${childPatient.patientID}")
+                }
+
+                if (isAdded) {
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.child_registration_saved),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    parentFragmentManager.popBackStack()
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to save child beneficiary record")
+                if (isAdded) {
+                    showError("Failed to save: ${e.message}")
+                }
+            } finally {
+                if (isAdded) {
+                    binding.btnSave.isEnabled = true
+                    binding.btnCancel.isEnabled = true
+                    binding.progressBar.visibility = View.GONE
+                }
+            }
+        }
+    }
+
+    private suspend fun buildOrUpdateChildPatient(
+        mother: Patient,
+        delivery: DeliveryOutcomeCache,
+        infantReg: InfantRegCache,
+        childName: String,
+        childGenderId: Int?,
+        userName: String
+    ): Patient {
+        val now = Date()
+        val childDob = delivery.dateOfDelivery?.let { Date(it) } ?: now
+        val finalChildName = childName.trim().ifBlank {
+            infantReg.babyName?.trim().orEmpty().ifBlank { "Baby" }
+        }
+        val firstName = finalChildName.substringBefore(" ").ifBlank { finalChildName }
+        val lastName = finalChildName.substringAfter(" ", "").trim().ifBlank { "" }
+        val fatherName = mother.spouseName?.takeIf { it.isNotBlank() } ?: mother.parentName
+        val childMaritalStatusId = if (childGenderId == 2) 7 else null
+        val childReproductiveStatusId = if (childGenderId == 2) 7 else null
+
+        val persistedChildPatientID = infantRegRepo
+            .getInfantReg(infantReg.motherPatientID, infantReg.babyIndex)
+            ?.childPatientID
+        val existingChild = (infantReg.childPatientID ?: persistedChildPatientID)
+            ?.let { getPatientOrNull(it) }
+        val childPatient = (existingChild ?: Patient(
+            patientID = generateUuid(),
+            firstName = firstName,
+            lastName = lastName,
+            dob = childDob,
+            age = null,
+            ageUnitID = null,
+            maritalStatusID = childMaritalStatusId,
+            spouseName = "",
+            ageAtMarriage = null,
+            phoneNo = mother.phoneNo,
+            genderID = childGenderId,
+            registrationDate = now,
+            stateID = mother.stateID,
+            districtID = mother.districtID,
+            blockID = mother.blockID,
+            districtBranchID = mother.districtBranchID,
+            communityID = mother.communityID,
+            religionID = mother.religionID,
+            parentName = fatherName,
+            syncState = SyncState.UNSYNCED,
+            beneficiaryID = null,
+            beneficiaryRegID = null,
+            benImage = null,
+            statusOfWomanID = childReproductiveStatusId,
+            isNewAbha = false,
+            healthIdDetails = null,
+            labTechnicianFlag = 0,
+            faceEmbedding = null
+        )).copy(
+            firstName = firstName,
+            lastName = lastName,
+            dob = childDob,
+            genderID = childGenderId,
+            phoneNo = mother.phoneNo,
+            parentName = fatherName,
+            stateID = mother.stateID,
+            districtID = mother.districtID,
+            blockID = mother.blockID,
+            districtBranchID = mother.districtBranchID,
+            communityID = mother.communityID,
+            religionID = mother.religionID,
+            maritalStatusID = childMaritalStatusId,
+            spouseName = "",
+            statusOfWomanID = childReproductiveStatusId,
+            syncState = SyncState.UNSYNCED,
+            registrationDate = existingChild?.registrationDate ?: now
+        )
+
+        if (existingChild == null) {
+            patientRepo.insertPatient(childPatient)
+        } else {
+            patientRepo.updateRecord(childPatient)
+        }
+        return childPatient
+    }
+
+    private suspend fun getPatientOrNull(patientID: String): Patient? {
+        return try {
+            patientRepo.getPatient(patientID)
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+    private fun showError(message: String) {
+        if (isAdded) {
+            Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show()
+            binding.progressBar.visibility = View.GONE
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.child_registration)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationFragment.kt
new file mode 100644
index 000000000..2fb725a9c
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationFragment.kt
@@ -0,0 +1,314 @@
+package org.piramalswasthya.cho.ui.home.rmncha.child_care
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.asLiveData
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.configuration.ChildRegistrationDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.databinding.FragmentNeonatalOutcomeBinding
+import org.piramalswasthya.cho.model.InfantRegCache
+import org.piramalswasthya.cho.model.NeonatalOutcomeCache
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.repositories.NeonatalOutcomeRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.work.WorkerUtils
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChildRegistrationFragment : Fragment() {
+
+    @Inject
+    lateinit var infantRegRepo: InfantRegRepo
+    
+    @Inject
+    lateinit var deliveryOutcomeRepo: DeliveryOutcomeRepo
+
+    @Inject
+    lateinit var neonatalOutcomeRepo: NeonatalOutcomeRepo
+    
+    @Inject
+    lateinit var patientRepo: PatientRepo
+    
+    @Inject
+    lateinit var userRepo: UserRepo
+    
+    @Inject
+    lateinit var preferenceDao: PreferenceDao
+
+    private var _binding: FragmentNeonatalOutcomeBinding? = null
+    private val binding get() = _binding!!
+
+    // Using arguments directly instead of SafeArgs since we don't have nav graph entry yet
+    private val patientID: String? by lazy { arguments?.getString("patientID") }
+    private val babyIndex: Int by lazy { arguments?.getInt("babyIndex", 0) ?: 0 }
+
+    private lateinit var dataset: ChildRegistrationDataset
+    private lateinit var formAdapter: FormInputAdapter
+    private var currentInfantReg: InfantRegCache? = null
+    private var isViewOnlyMode: Boolean = false
+    private var isFormReadOnly: Boolean = false
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNeonatalOutcomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        // Reusing the same layout as NeonatalOutcome since it's just a recycler view + buttons
+
+        dataset = ChildRegistrationDataset(requireContext(), preferenceDao.getCurrentLanguage())
+
+        formAdapter = createFormAdapter(readOnly = false)
+
+        binding.rvForm.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(requireContext())
+        binding.rvForm.adapter = formAdapter
+
+        dataset.listFlow.asLiveData().observe(viewLifecycleOwner) { elements ->
+            formAdapter.submitList(elements)
+        }
+
+        // The dataset signals here when it has mutated a FormElement's value
+        // in place (e.g. "None" mutual exclusion on newbornComplications).
+        // DiffUtil cannot detect the change, so force a row rebind. Reference
+        // formAdapter at notify time so we follow any reassignment in
+        // applyScreenMode().
+        viewLifecycleOwner.lifecycleScope.launch {
+            dataset.forceRefreshIdFlow.collect { id ->
+                val pos = formAdapter.currentList.indexOfFirst { it.id == id }
+                if (pos != -1) formAdapter.notifyItemChanged(pos)
+            }
+        }
+
+        setupClickListeners()
+        observeAlerts()
+        loadData()
+    }
+
+    private fun createFormAdapter(readOnly: Boolean): FormInputAdapter {
+        return FormInputAdapter(
+            formValueListener = if (readOnly) null else FormInputAdapter.FormValueListener { id, index ->
+                lifecycleScope.launch {
+                    dataset.updateList(id, index)
+                }
+            },
+            isEnabled = !readOnly
+        )
+    }
+
+    private fun applyScreenMode(isViewOnly: Boolean) {
+        binding.btnSave.visibility = if (isViewOnly) View.GONE else View.VISIBLE
+        binding.btnCancel.visibility = if (isViewOnly) View.GONE else View.VISIBLE
+        binding.btnCancel.text = getString(R.string.cancel)
+        if (isFormReadOnly == isViewOnly) return
+        isFormReadOnly = isViewOnly
+        formAdapter = createFormAdapter(readOnly = isFormReadOnly)
+        binding.rvForm.adapter = formAdapter
+        formAdapter.submitList(dataset.listFlow.value)
+    }
+
+    private fun loadData() {
+        val pid = patientID ?: return
+        
+        lifecycleScope.launch {
+            try {
+                binding.progressBar.visibility = View.VISIBLE
+                
+                val user = userRepo.getLoggedInUser()
+                val userName = user?.userName ?: ""
+                
+                // Load mother patient
+                val mother = patientRepo.getPatient(pid)
+                
+                // Load delivery outcome
+                val deliveryOutcome = deliveryOutcomeRepo.getDeliveryOutcome(pid)
+                
+                if (deliveryOutcome == null) {
+                    showError("Delivery outcome not found")
+                    return@launch
+                }
+
+                // Load existing infant reg
+                val existing = infantRegRepo.getInfantReg(pid, babyIndex)
+                val legacyNeonatalOutcome = deliveryOutcome.id.let { deliveryOutcomeId ->
+                    if (deliveryOutcomeId > 0L) {
+                        neonatalOutcomeRepo.getNeonatalOutcomesByDeliveryId(deliveryOutcomeId)
+                            .resolveLegacyNeonatalOutcome(babyIndex)
+                    } else {
+                        null
+                    }
+                }
+                
+                currentInfantReg = (existing ?: InfantRegCache(
+                    motherPatientID = pid,
+                    babyIndex = babyIndex,
+                    isActive = true,
+                    createdBy = userName,
+                    updatedBy = userName,
+                    syncState = SyncState.UNSYNCED
+                )).mergeLegacyNeonatalOutcome(legacyNeonatalOutcome)
+
+                isViewOnlyMode = existing?.processed == "C"
+                applyScreenMode(isViewOnlyMode)
+                
+                dataset.setUpPage(mother, deliveryOutcome, babyIndex, currentInfantReg)
+                binding.progressBar.visibility = View.GONE
+                
+            } catch (e: Exception) {
+                Timber.e(e, "Error loading child registration data")
+                showError("Error loading data: ${e.message}")
+            }
+        }
+    }
+
+    private fun setupClickListeners() {
+        binding.btnSave.setOnClickListener {
+            saveForm()
+        }
+
+        binding.btnCancel.setOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+    }
+
+    private fun saveForm() {
+        if (isViewOnlyMode) return
+        val reg = currentInfantReg ?: return
+
+        val invalidIndex = formAdapter.validateInput(resources, binding.rvForm)
+        if (invalidIndex != -1) {
+            binding.rvForm.scrollToPosition(invalidIndex)
+            return
+        }
+        
+        lifecycleScope.launch {
+            try {
+                binding.progressBar.visibility = View.VISIBLE
+                binding.btnSave.isEnabled = false
+                binding.btnCancel.isEnabled = false
+                
+                dataset.mapValues(reg)
+                
+                val user = userRepo.getLoggedInUser()
+                val userName = user?.userName ?: ""
+                val currentTime = System.currentTimeMillis()
+
+                val updated = reg.copy(
+                    updatedBy = userName,
+                    updatedDate = currentTime,
+                    syncState = SyncState.UNSYNCED,
+                    isActive = true,
+                    processed = if (reg.processed == "N") "N" else "U"
+                )
+
+                infantRegRepo.saveInfantReg(updated)
+                WorkerUtils.triggerInfantRegistrationSync(requireContext())
+                
+                if (isAdded) {
+                    Toast.makeText(requireContext(), "Infant registration saved successfully", Toast.LENGTH_SHORT).show()
+                    parentFragmentManager.popBackStack()
+                }
+                
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to save child registration")
+                if (isAdded) {
+                    showError("Failed to save: ${e.message}")
+                    binding.btnSave.isEnabled = true
+                    binding.btnCancel.isEnabled = true
+                    binding.progressBar.visibility = View.GONE
+                }
+            }
+        }
+    }
+
+    private fun observeAlerts() {
+        lifecycleScope.launch {
+            dataset.alertErrorMessageFlow.collect { message ->
+                message?.let {
+                    if (isAdded) {
+                        MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(getString(R.string.alert_title))
+                            .setMessage(it)
+                            .setPositiveButton(getString(R.string.continue_btn), null)
+                            .show()
+                    }
+                    dataset.resetErrorMessageFlow()
+                }
+            }
+        }
+    }
+    
+    private fun showError(message: String) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show()
+        binding.progressBar.visibility = View.GONE
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun InfantRegCache.mergeLegacyNeonatalOutcome(
+        neonatalOutcome: NeonatalOutcomeCache?
+    ): InfantRegCache {
+        if (neonatalOutcome == null) return this
+
+        return copy(
+            outcomeAtBirth = outcomeAtBirth ?: neonatalOutcome.outcomeAtBirth,
+            typeOfResuscitation = typeOfResuscitation ?: neonatalOutcome.typeOfResuscitation,
+            newbornComplications = newbornComplications ?: neonatalOutcome.newbornComplications,
+            currentStatusOfBaby = currentStatusOfBaby ?: neonatalOutcome.currentStatusOfBaby,
+            causeOfDeath = causeOfDeath ?: neonatalOutcome.causeOfDeath,
+            otherCauseOfDeath = otherCauseOfDeath ?: neonatalOutcome.otherCauseOfDeath,
+            birthDoseVaccinesGiven = birthDoseVaccinesGiven ?: neonatalOutcome.birthDoseVaccinesGiven,
+            reasonForNoVaccines = reasonForNoVaccines ?: neonatalOutcome.reasonForNoVaccines,
+            vitaminKInjectionGiven = vitaminKInjectionGiven ?: neonatalOutcome.vitaminKInjectionGiven,
+            reasonForNoVitaminK = reasonForNoVitaminK ?: neonatalOutcome.reasonForNoVitaminK,
+            birthCertificateIssued = birthCertificateIssued ?: neonatalOutcome.birthCertificateIssued
+        )
+    }
+
+    private fun List<NeonatalOutcomeCache>.resolveLegacyNeonatalOutcome(
+        babyIndex: Int
+    ): NeonatalOutcomeCache? {
+        if (isEmpty()) return null
+
+        firstOrNull { it.neonateIndex == babyIndex }?.let { return it }
+
+        if (size == 1) return singleOrNull()
+
+        return normalizeLegacyOneBasedIndices()
+            ?.firstOrNull { it.neonateIndex == babyIndex }
+    }
+
+    private fun List<NeonatalOutcomeCache>.normalizeLegacyOneBasedIndices(): List<NeonatalOutcomeCache>? {
+        val sorted = sortedBy { it.neonateIndex }
+        if (sorted.firstOrNull()?.neonateIndex != 1) return null
+
+        if (sorted.withIndex().any { (index, outcome) -> outcome.neonateIndex != index + 1 }) {
+            return null
+        }
+
+        return sorted.map { it.copy(neonateIndex = it.neonateIndex - 1) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationListFragment.kt
new file mode 100644
index 000000000..edfc11873
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/ChildRegistrationListFragment.kt
@@ -0,0 +1,200 @@
+package org.piramalswasthya.cho.ui.home.rmncha.child_care
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import android.widget.Toast
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.ChildRegistrationAdapter
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.FragmentChildRegListBinding
+import org.piramalswasthya.cho.model.ChildRegDomain
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ChildRegistrationListFragment : Fragment() {
+
+    @Inject
+    lateinit var infantRegRepo: InfantRegRepo
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: FragmentChildRegListBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var adapter: ChildRegistrationAdapter
+    private var allChildren: List<ChildRegDomain> = emptyList()
+    private var filteredChildren: List<ChildRegDomain> = emptyList()
+
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            onSpeechResult = { text -> binding.searchBarInclude.search.setText(text) },
+            onFaceMatchResult = { matchedPatient ->
+                if (matchedPatient != null) {
+                    filteredChildren = allChildren.filter {
+                        it.motherPatient.patientID == matchedPatient.patientID ||
+                        it.childPatient?.patientID == matchedPatient.patientID
+                    }
+                    updateUI()
+                    if (filteredChildren.isNotEmpty()) {
+                        Toast.makeText(requireContext(), "${filteredChildren.size} matching record(s) found", Toast.LENGTH_SHORT).show()
+                    } else {
+                        Toast.makeText(requireContext(), "Patient not found in this Child Registration list", Toast.LENGTH_LONG).show()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "No matching patient found", Toast.LENGTH_SHORT).show()
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentChildRegListBinding.inflate(inflater, container, false)
+        faceSearchHelper
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView()
+        setupSearch()
+        syncChildListFromServer()
+        observeChildren()
+    }
+
+    private fun syncChildListFromServer() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            runCatching { infantRegRepo.pullChildrenFromServer() }
+        }
+    }
+
+    private fun setupRecyclerView() {
+        adapter = ChildRegistrationAdapter(
+            ChildRegistrationAdapter.ClickListener { motherPatientID, babyIndex, childPatientID ->
+                val fragment = ChildBeneficiaryRegistrationFragment().apply {
+                    arguments = Bundle().apply {
+                        putString(ARG_MOTHER_PATIENT_ID, motherPatientID)
+                        putInt(ARG_BABY_INDEX, babyIndex)
+                        putString(ARG_CHILD_PATIENT_ID, childPatientID)
+                    }
+                }
+
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+        )
+
+        binding.rvChildRegList.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvChildRegList.adapter = adapter
+    }
+
+    private fun setupSearch() {
+        binding.searchBarInclude.search.setupSearchTextWatcher { query ->
+            filterChildren(query)
+        }
+        binding.searchBarInclude.searchTil.setEndIconOnClickListener {
+            faceSearchHelper.launchSpeechToText()
+        }
+        binding.searchBarInclude.cameraIcon.setOnClickListener {
+            faceSearchHelper.launchCameraSearch()
+        }
+    }
+
+    private fun observeChildren() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            infantRegRepo.getRegisteredInfants().collectLatest { childrenList ->
+                allChildren = childrenList
+                    .groupBy { it.motherPatient.patientID to it.infant.babyIndex }
+                    .map { (_, rows) ->
+                        rows.maxWithOrNull(
+                            compareBy<ChildRegDomain> { !it.isChildRegistered() }
+                                .thenByDescending { maxOf(it.infant.updatedDate, it.infant.createdDate) }
+                        ) ?: rows.first()
+                    }
+                    .sortedWith(
+                        compareBy<ChildRegDomain> { it.isChildRegistered() }
+                            .thenByDescending { maxOf(it.infant.updatedDate, it.infant.createdDate) }
+                            .thenByDescending { it.infant.updatedDate }
+                    )
+                filteredChildren = allChildren
+                updateUI()
+            }
+        }
+    }
+
+    private fun filterChildren(query: String) {
+        if (query.isBlank()) {
+            filteredChildren = allChildren
+            updateUI()
+            return
+        }
+
+        val normalized = query.trim().lowercase()
+        filteredChildren = allChildren.filter { child ->
+            val childName = child.childPatient?.let {
+                "${it.firstName.orEmpty()} ${it.lastName.orEmpty()}".trim().lowercase()
+            }.orEmpty()
+            val motherName = child.getMotherFullName().lowercase()
+            val motherPhone = child.motherPatient.phoneNo.orEmpty().lowercase()
+            val motherBenId = child.motherPatient.beneficiaryID?.toString().orEmpty()
+            val childBenId = child.childPatient?.beneficiaryID?.toString().orEmpty()
+
+            childName.contains(normalized) ||
+                    child.customName.lowercase().contains(normalized) ||
+                    motherName.contains(normalized) ||
+                    motherPhone.contains(normalized) ||
+                    motherBenId.contains(normalized) ||
+                    childBenId.contains(normalized)
+        }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        adapter.submitList(filteredChildren)
+        updateListUI(
+            filteredList = filteredChildren,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvChildRegList,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying child registration records"
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.child_reg_list)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        const val ARG_MOTHER_PATIENT_ID = "motherPatientID"
+        const val ARG_BABY_INDEX = "babyIndex"
+        const val ARG_CHILD_PATIENT_ID = "childPatientID"
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/InfantListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/InfantListFragment.kt
new file mode 100644
index 000000000..63a1b067d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/child_care/InfantListFragment.kt
@@ -0,0 +1,155 @@
+package org.piramalswasthya.cho.ui.home.rmncha.child_care
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.InfantRegistrationAdapter
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.FragmentInfantListBinding
+import org.piramalswasthya.cho.model.InfantRegDomain
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of infants eligible for registration
+ * Shows infants grouped by mother with "Nth baby of [Mother's Name]" format
+ */
+@AndroidEntryPoint
+class InfantListFragment : Fragment() {
+
+    @Inject
+    lateinit var infantRegRepo: InfantRegRepo
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: FragmentInfantListBinding? = null
+    private val binding get() = _binding!!
+    
+    private lateinit var adapter: InfantRegistrationAdapter
+    private var allInfants: List<InfantRegDomain> = emptyList()
+    private var filteredInfants: List<InfantRegDomain> = emptyList()
+
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            isCameraSearchEnabled = false,
+            onSpeechResult = { text -> binding.searchBarInclude.search.setText(text) }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentInfantListBinding.inflate(inflater, container, false)
+        faceSearchHelper
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        setupRecyclerView()
+        setupSearch()
+        observeInfants()
+    }
+
+    private fun setupRecyclerView() {
+        adapter = InfantRegistrationAdapter(
+            InfantRegistrationAdapter.ClickListener { motherPatientID: String, babyIndex: Int ->
+                // Navigate to ChildRegistrationFragment
+                val fragment = ChildRegistrationFragment()
+                val args = Bundle().apply {
+                    putString("patientID", motherPatientID)
+                    putInt("babyIndex", babyIndex)
+                }
+                fragment.arguments = args
+                
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container, fragment)
+                    .addToBackStack(null)
+                    .commit()
+            }
+        )
+
+        binding.rvInfantList.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvInfantList.adapter = adapter
+    }
+
+    private fun setupSearch() {
+        binding.searchBarInclude.search.setupSearchTextWatcher { query ->
+            filterInfants(query)
+        }
+        binding.searchBarInclude.searchTil.setEndIconOnClickListener {
+            faceSearchHelper.launchSpeechToText()
+        }
+        binding.searchBarInclude.cameraIcon.visibility = View.GONE
+    }
+
+    private fun observeInfants() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            infantRegRepo.getListForInfantReg().collectLatest { infantsList: List<InfantRegDomain> ->
+                allInfants = infantsList.sortedWith(
+                    compareBy<InfantRegDomain> { it.isRegistered() }
+                        .thenByDescending {
+                            it.savedIr?.updatedDate
+                                ?: it.savedIr?.createdDate
+                                ?: it.deliveryOutcome.dateOfDelivery
+                                ?: 0L
+                        }
+                        .thenByDescending { it.deliveryOutcome.dateOfDelivery ?: 0L }
+                )
+                filteredInfants = allInfants
+                updateUI()
+            }
+        }
+    }
+
+    private fun filterInfants(query: String) {
+        filteredInfants = if (query.isBlank()) {
+            allInfants
+        } else {
+            allInfants.filter { infant ->
+                infant.getMotherFullName().contains(query, ignoreCase = true) ||
+                        infant.motherPatient.patientID.contains(query, ignoreCase = true)
+            }
+        }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        adapter.submitList(filteredInfants)
+        updateListUI(
+            filteredList = filteredInfants,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvInfantList,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying registered infants"
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title = getString(R.string.infant_list)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleTrackingFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleTrackingFragment.kt
new file mode 100644
index 000000000..06493f2c4
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleTrackingFragment.kt
@@ -0,0 +1,268 @@
+package org.piramalswasthya.cho.ui.home.rmncha.eligible_couple
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.ECRegistrationAdapter
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.FragmentEligibleCoupleTrackingBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithEcrDomain
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.filterPatientsByQuery
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of Eligible Couples for Tracking.
+ * Uses reusable [FaceSearchHelper] for voice and camera search.
+ */
+@AndroidEntryPoint
+class EligibleCoupleTrackingFragment : Fragment() {
+
+    @Inject
+    lateinit var ecrRepo: EcrRepo
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: FragmentEligibleCoupleTrackingBinding? = null
+    private val binding: FragmentEligibleCoupleTrackingBinding
+        get() = _binding!!
+
+    private lateinit var adapter: ECRegistrationAdapter
+    private var allPatients: List<PatientWithEcrDomain> = emptyList()
+    private var filteredPatients: List<PatientWithEcrDomain> = emptyList()
+    private var currentPatientsList: List<Patient>? = null
+
+    /**
+     * Reusable face-search helper — handles speech-to-text and camera face matching.
+     * Must be initialised before onViewCreated (activity-result launchers requirement).
+     */
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            onSpeechResult = { recognisedText ->
+                binding.searchBarInclude.search.setText(recognisedText)
+            },
+            onFaceMatchResult = { matchedPatient ->
+                if (matchedPatient != null) {
+                    filteredPatients = allPatients.filter {
+                        it.patient.patientID == matchedPatient.patientID
+                    }
+                    updateUI()
+                    if (filteredPatients.isNotEmpty()) {
+                        Toast.makeText(requireContext(), "1 matching record found", Toast.LENGTH_SHORT).show()
+                    } else {
+                        Toast.makeText(requireContext(), "Patient not found in this Eligible Couple list", Toast.LENGTH_LONG).show()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "No matching patient found", Toast.LENGTH_SHORT).show()
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentEligibleCoupleTrackingBinding.inflate(inflater, container, false)
+        // Touch the lazy property so the activity-result launchers are registered now
+        faceSearchHelper
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupRecyclerView()
+        setupSearch()
+        observePatients()
+    }
+
+    private fun setupRecyclerView() {
+        adapter = ECRegistrationAdapter(
+            ECRegistrationAdapter.ClickListener(
+                onAddVisit = { patientWithEcr ->
+                    val lastVisit = patientWithEcr.lastVisitDate
+                    if (lastVisit != null && lastVisit > 0) {
+                        val calendar = java.util.Calendar.getInstance()
+                        calendar.timeInMillis = lastVisit
+                        val lastMonth = calendar.get(java.util.Calendar.MONTH)
+                        val lastYear = calendar.get(java.util.Calendar.YEAR)
+
+                        calendar.timeInMillis = System.currentTimeMillis()
+                        val currentMonth = calendar.get(java.util.Calendar.MONTH)
+                        val currentYear = calendar.get(java.util.Calendar.YEAR)
+
+                        if (lastMonth == currentMonth && lastYear == currentYear) {
+                            Toast.makeText(
+                                requireContext(),
+                                "Eligible Couple tracking is done for this month",
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            return@ClickListener
+                        }
+                    }
+
+                    val patientId = patientWithEcr.patient.patientID
+                    val fragment = org.piramalswasthya.cho.ui.commons.eligible_couple.tracking.form.EligibleCoupleTrackingFormFragment().apply {
+                        arguments = Bundle().apply {
+                            putString("patientID", patientId)
+                            putLong("createdDate", 0L)
+                        }
+                    }
+
+                    requireActivity().supportFragmentManager.commit {
+                        replace(R.id.fragment_container, fragment)
+                        addToBackStack("ECT_FORM_TRANSACTION")
+                    }
+                },
+                onViewVisit = { patientWithEcr ->
+                    val bottomSheet = EligibleCoupleVisitHistoryBottomSheet.newInstance(
+                        patientWithEcr.patient.patientID
+                    )
+                    bottomSheet.show(childFragmentManager, "VisitHistoryBottomSheet")
+                },
+                onCall = { patientWithEcr ->
+                    dialBeneficiary(patientWithEcr.patient.phoneNo)
+                }
+            )
+        )
+
+        binding.rvEligibleCouples.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvEligibleCouples.adapter = adapter
+    }
+
+    private fun setupSearch() {
+        // Text search
+        binding.searchBarInclude.search.setupSearchTextWatcher { query ->
+            filterPatients(query)
+        }
+
+        // Voice search (mic end-icon)
+        binding.searchBarInclude.searchTil.setEndIconOnClickListener {
+            faceSearchHelper.launchSpeechToText()
+        }
+
+        // Camera face search
+        binding.searchBarInclude.cameraIcon.setOnClickListener {
+            faceSearchHelper.launchCameraSearch()
+        }
+    }
+
+    // ── Data loading & filtering ──
+
+    private fun observePatients() {
+        lifecycleScope.launch {
+            ecrRepo.getPatientsForTrackingList().collectLatest { patientsList ->
+                currentPatientsList = patientsList
+                processPatientsList(patientsList)
+            }
+        }
+    }
+
+    private suspend fun processPatientsList(patientsList: List<Patient>) {
+        val filteredPatientsList = patientsList
+
+        allPatients = withContext(Dispatchers.IO) {
+            filteredPatientsList.map { patient ->
+                async {
+                    val ecr = ecrRepo.getSavedECR(patient.patientID)
+                    val latestVisit = ecrRepo.getLatestEctByBenId(patient.patientID)
+                    PatientWithEcrDomain(
+                        patient = patient,
+                        ecr = ecr
+                    ).apply {
+                        lastVisitDate = latestVisit?.visitDate
+                        methodOfContraception = latestVisit?.methodOfContraception
+                        antraInjectionDate = latestVisit?.antraInjectionDate
+                        lmpDateFromTracking = latestVisit?.lmpDate
+                        syncState = latestVisit?.syncState ?: ecr?.syncState
+                        antraNextDueDate = if (latestVisit?.methodOfContraception == "ANTRA Injection") {
+                            latestVisit.antraDueDate
+                        } else {
+                            null
+                        }
+                    }
+                }
+            }.awaitAll()
+        }.filterNotNull()
+            .sortedByDescending { it.patient.registrationDate?.time ?: 0L }
+
+        val currentQuery = if (_binding != null) binding.searchBarInclude.search.text.toString() else ""
+        filterPatients(currentQuery)
+    }
+
+    private fun filterPatients(query: String) {
+        filteredPatients = allPatients.filterPatientsByQuery(query) { it.patient }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        if (_binding == null) return
+        adapter.submitList(filteredPatients)
+        updateListUI(
+            filteredList = filteredPatients,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvEligibleCouples,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying eligible couples for tracking"
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.ec_tracking_title)
+
+        currentPatientsList?.let {
+            lifecycleScope.launch {
+                processPatientsList(it)
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun dialBeneficiary(phoneNumber: String?) {
+        val sanitizedNumber = phoneNumber?.trim().orEmpty()
+        if (sanitizedNumber.isBlank()) {
+            Toast.makeText(
+                requireContext(),
+                getString(R.string.mobile_number_not_present),
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        startActivity(
+            Intent(Intent.ACTION_DIAL, Uri.parse("tel:$sanitizedNumber"))
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleVisitHistoryBottomSheet.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleVisitHistoryBottomSheet.kt
new file mode 100644
index 000000000..35819ee41
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/eligible_couple/EligibleCoupleVisitHistoryBottomSheet.kt
@@ -0,0 +1,211 @@
+package org.piramalswasthya.cho.ui.home.rmncha.eligible_couple
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.ECTrackingAdapter
+import org.piramalswasthya.cho.databinding.BottomSheetEcVisitHistoryBinding
+import org.piramalswasthya.cho.model.EligibleCoupleTrackingCache
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import timber.log.Timber
+import java.util.Calendar
+import javax.inject.Inject
+
+/**
+ * Bottom Sheet to display visit history for Eligible Couple Tracking
+ * Shows all past visits with their dates and allows viewing details
+ */
+@AndroidEntryPoint
+class EligibleCoupleVisitHistoryBottomSheet : BottomSheetDialogFragment() {
+
+    private var _binding: BottomSheetEcVisitHistoryBinding? = null
+    private val binding: BottomSheetEcVisitHistoryBinding
+        get() = _binding!!
+
+    @Inject
+    lateinit var ecrRepo: EcrRepo
+
+    @Inject
+    lateinit var patientRepo: PatientRepo
+
+    private lateinit var patientID: String
+
+    companion object {
+        private const val ARG_PATIENT_ID = "patient_id"
+
+        fun newInstance(patientID: String): EligibleCoupleVisitHistoryBottomSheet {
+            return EligibleCoupleVisitHistoryBottomSheet().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PATIENT_ID, patientID)
+                }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        patientID = arguments?.getString(ARG_PATIENT_ID) ?: ""
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = BottomSheetEcVisitHistoryBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupRecyclerView()
+        loadPatientInfo()
+        loadVisitHistory()
+    }
+
+    private fun setupRecyclerView() {
+        val adapter = ECTrackingAdapter(
+            ECTrackingAdapter.ECTrackViewClickListener { benId, visitDate ->
+                // Navigate to tracking form in view mode
+                val fragment = org.piramalswasthya.cho.ui.commons.eligible_couple.tracking.form.EligibleCoupleTrackingFormFragment().apply {
+                    arguments = Bundle().apply {
+                        putString("patientID", benId)
+                        putLong("createdDate", visitDate)
+                    }
+                }
+
+                requireActivity().supportFragmentManager.commit {
+                    replace(R.id.fragment_container, fragment)
+                    addToBackStack(null)
+                }
+                
+                // Dismiss bottom sheet after navigation
+                dismiss()
+            }
+        )
+
+        binding.rvVisitHistory.apply {
+            layoutManager = LinearLayoutManager(requireContext())
+            this.adapter = adapter
+            
+            // Add divider for better visual separation
+            addItemDecoration(
+                DividerItemDecoration(requireContext(), LinearLayout.VERTICAL)
+            )
+        }
+    }
+
+    private fun loadPatientInfo() {
+        lifecycleScope.launch {
+            try {
+                val patientDisplay = patientRepo.getPatientDisplay(patientID)
+                patientDisplay?.let { patient ->
+                    val name = "${patient.patient.firstName} ${patient.patient.lastName ?: ""}".trim()
+                    val ageGender = "${patient.patient.age} ${patient.ageUnit?.name ?: ""} | ${patient.gender?.genderName ?: ""}".trim()
+                    
+                    binding.tvPatientName.text = name
+                    binding.tvPatientAgeGender.text = ageGender
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load patient info for $patientID")
+            }
+        }
+    }
+
+    private fun loadVisitHistory() {
+        lifecycleScope.launch {
+            try {
+                binding.progressBar.visibility = View.VISIBLE
+                binding.rvVisitHistory.visibility = View.GONE
+                binding.tvEmptyState.visibility = View.GONE
+
+                val visits = ecrRepo.getAllECT(patientID)
+                    .let(::deduplicateByVisitDay)
+                    .sortedByDescending { it.visitDate } // Most recent first
+
+                if (visits.isEmpty()) {
+                    binding.progressBar.visibility = View.GONE
+                    binding.tvEmptyState.visibility = View.VISIBLE
+                    binding.tvCount.text = getString(R.string.no_visits_found)
+                } else {
+                    (binding.rvVisitHistory.adapter as? ECTrackingAdapter)?.submitList(visits)
+                    binding.progressBar.visibility = View.GONE
+                    binding.rvVisitHistory.visibility = View.VISIBLE
+                    
+                    // Update count
+                    val count = visits.size
+                    binding.tvCount.text = resources.getQuantityString(
+                        R.plurals.visit_count,
+                        count,
+                        count
+                    )
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to load visit history for $patientID")
+                binding.progressBar.visibility = View.GONE
+                binding.tvEmptyState.visibility = View.VISIBLE
+                binding.tvEmptyState.text = getString(R.string.error_loading_visits)
+            }
+        }
+    }
+
+    private fun deduplicateByVisitDay(
+        visits: List<EligibleCoupleTrackingCache>
+    ): List<EligibleCoupleTrackingCache> {
+        return visits
+            .groupBy { toVisitDayKey(it.visitDate) }
+            .values
+            .map { sameDayVisits ->
+                sameDayVisits.maxWithOrNull(
+                    compareBy<EligibleCoupleTrackingCache>(
+                        { completenessScore(it) },
+                        { it.updatedDate },
+                        { it.visitDate },
+                        { it.id }
+                    )
+                ) ?: sameDayVisits.first()
+            }
+    }
+
+    private fun toVisitDayKey(visitDate: Long): String {
+        val calendar = Calendar.getInstance()
+        calendar.timeInMillis = visitDate
+        val year = calendar.get(Calendar.YEAR)
+        val month = calendar.get(Calendar.MONTH) + 1
+        val day = calendar.get(Calendar.DAY_OF_MONTH)
+        return "$year-$month-$day"
+    }
+
+    private fun completenessScore(visit: EligibleCoupleTrackingCache): Int {
+        var score = 0
+        if (!visit.isPregnancyTestDone.isNullOrBlank()) score++
+        if (!visit.pregnancyTestResult.isNullOrBlank()) score++
+        if (!visit.isPregnant.isNullOrBlank()) score++
+        if (!visit.methodOfContraception.isNullOrBlank()) score++
+        if (!visit.visitMonth.isNullOrBlank() && !visit.visitMonth.equals("NA", ignoreCase = true)) score++
+        if (!visit.financialYear.isNullOrBlank()) score++
+        if (visit.lmpDate != null && visit.lmpDate != 0L) score++
+        if (!visit.antraDose.isNullOrBlank()) score++
+        if (visit.antraInjectionDate != null && visit.antraInjectionDate != 0L) score++
+        if (visit.antraDueDate != null && visit.antraDueDate != 0L) score++
+        if (visit.dateOfSterilization != null && visit.dateOfSterilization != 0L) score++
+        return score
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/ANCVisitsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/ANCVisitsFragment.kt
new file mode 100644
index 000000000..84f0987c4
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/ANCVisitsFragment.kt
@@ -0,0 +1,173 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.ANCVisitsAdapter
+import org.piramalswasthya.cho.databinding.FragmentAncVisitsBinding
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of ANC Visits.
+ * Shows registered pregnant women with LMP >= 5 weeks (eligible for ANC visits).
+ */
+@AndroidEntryPoint
+class ANCVisitsFragment : BaseMaternalHealthListFragment<FragmentAncVisitsBinding, PatientWithPwrDomain>() {
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    private lateinit var adapter: ANCVisitsAdapter
+
+    companion object {
+        private const val MIN_ANC_WEEKS = 5
+        private const val MIN_ANC_DAYS = MIN_ANC_WEEKS * 7
+
+        private const val ARG_PATIENT_ID = "patientID"
+
+        fun newInstance(patientID: String? = null): ANCVisitsFragment {
+            return ANCVisitsFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PATIENT_ID, patientID)
+                }
+            }
+        }
+    }
+
+    // ── Base class contract ──
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentAncVisitsBinding.inflate(inflater, container, false)
+
+    override fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding = binding.searchBarInclude
+    override fun getRecyclerView(): RecyclerView = binding.rvAncVisits
+    override fun getEmptyStateView(): FrameLayout = binding.flEmpty
+    override fun getCountTextView(): TextView = binding.tvCount
+
+    override val titleResId = R.string.anc_visits
+    override val listDisplayName = "ANC Visits list"
+    override val logMessage = "Displaying ANC-eligible pregnant women"
+
+    override fun extractPatient(item: PatientWithPwrDomain): Patient = item.patient
+
+    override fun submitListToAdapter(list: List<PatientWithPwrDomain>) {
+        adapter.submitList(list)
+    }
+
+    override fun setupRecyclerView() {
+        adapter = ANCVisitsAdapter(
+            ANCVisitsAdapter.ClickListener(
+                clickedAddANC = { patientWithPwr ->
+                    viewLifecycleOwner.lifecycleScope.launch {
+                        val patientID = patientWithPwr.patient.patientID
+                        val allAncRecords = maternalHealthRepo.getAllActiveAncRecords(patientID)
+
+                        // Find the highest visit number that is COMPLETED (weight != null)
+                        val maxCompletedVisit = allAncRecords
+                            .filter { it.weight != null }
+                            .maxOfOrNull { it.visitNumber } ?: 0
+
+                        val nextVisitNumber = maxCompletedVisit + 1
+                        val isHRP = patientWithPwr.pwr?.isHrp ?: false
+
+                        // HRP allows more than 4 visits. Non-HRP is capped at 4.
+                        if (maxCompletedVisit < 4 || isHRP) {
+                            val intent = Intent(
+                                requireContext(),
+                                org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity::class.java
+                            ).apply {
+                                putExtra("navigateTo", "ANC")
+                                putExtra("patientID", patientID)
+                                putExtra("visitNumber", nextVisitNumber)
+                                putExtra("isOldVisit", false)
+                            }
+                            startActivity(intent)
+                        } else {
+                            Toast.makeText(
+                                requireContext(),
+                                getString(R.string.all_4_anc_visits_completed),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                },
+                clickedANCVisits = { patientWithPwr ->
+                    val bottomSheet = AncBottomSheetFragment.newInstance(patientWithPwr.patient.patientID)
+                    bottomSheet.show(childFragmentManager, "ANC_VISITS")
+                },
+                clickedAddPMSMA = { patientWithPwr ->
+                    Toast.makeText(
+                        requireContext(),
+                        "Add PMSMA: ${patientWithPwr.patient.firstName}",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                },
+                clickedCall = { patientWithPwr ->
+                    dialBeneficiary(patientWithPwr.patient.phoneNo)
+                }
+            )
+        )
+
+        binding.rvAncVisits.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvAncVisits.adapter = adapter
+    }
+
+    override fun observePatients() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            maternalHealthRepo.getAllPatientsWithANC().collectLatest { patientsList ->
+                allPatients = patientsList
+                    .map { it.asDomainModel() }
+                    .filter { patient ->
+                        val hasActivePWR = patient.pwr != null && patient.isActive()
+                        val isFemale = patient.patient.genderID == 2
+                        val age = patient.patient.age ?: 0
+                        val isReproductiveAge = age in 15..49
+                        val isEligibleForANC = patient.pwr?.lmpDate?.let { lmpDate ->
+                            val daysSinceLMP = TimeUnit.MILLISECONDS.toDays(
+                                System.currentTimeMillis() - lmpDate
+                            )
+                            daysSinceLMP >= MIN_ANC_DAYS
+                        } ?: false
+
+                        hasActivePWR && isFemale && isReproductiveAge && isEligibleForANC
+                    }
+                    .sortedByDescending { it.pwr?.dateOfRegistration ?: 0L }
+
+                onPatientsLoaded()
+            }
+        }
+    }
+
+    private fun dialBeneficiary(phoneNumber: String?) {
+        val sanitizedNumber = phoneNumber?.trim().orEmpty()
+        if (sanitizedNumber.isBlank()) {
+            Toast.makeText(
+                requireContext(),
+                getString(R.string.mobile_number_not_present),
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
+
+        startActivity(
+            Intent(Intent.ACTION_DIAL, Uri.parse("tel:$sanitizedNumber"))
+        )
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormFragment.kt
new file mode 100644
index 000000000..ea68d856b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormFragment.kt
@@ -0,0 +1,371 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Bundle
+import android.os.Environment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.ScrollView
+import android.widget.Button
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.databinding.FragmentNewFormBinding
+import android.graphics.drawable.Drawable
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.utils.ImgUtils
+import org.piramalswasthya.cho.work.WorkerUtils
+import java.io.File
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AbortionFormFragment : Fragment() {
+
+    @Inject
+    lateinit var preferenceDao: PreferenceDao
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    @Inject
+    lateinit var patientRepo: PatientRepo
+
+    @Inject
+    lateinit var userRepo: UserRepo
+
+    @Inject
+    lateinit var ecrRepo: EcrRepo
+
+    private var _binding: FragmentNewFormBinding? = null
+    private val binding get() = _binding!!
+
+    private val patientId by lazy { requireArguments().getString(ARG_PATIENT_ID).orEmpty() }
+    private val actionType by lazy { requireArguments().getString(ARG_ACTION_TYPE).orEmpty() }
+
+    private val viewModel: AbortionFormViewModel by viewModels {
+        AbortionFormViewModel.Factory(
+            patientId = patientId,
+            actionType = actionType,
+            preferenceDao = preferenceDao,
+            context = requireContext().applicationContext,
+            maternalHealthRepo = maternalHealthRepo,
+            patientRepo = patientRepo,
+            userRepo = userRepo,
+            ecrRepo = ecrRepo
+        )
+    }
+    private var formAdapter: FormInputAdapter? = null
+    private var latestList = emptyList<org.piramalswasthya.cho.model.FormElement>()
+    private var currentImageFormId: Int? = null
+    private var latestTmpUri: Uri? = null
+    private val requestCameraPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+            if (granted) {
+                launchCameraCapture()
+            } else {
+                Toast.makeText(requireContext(), getString(R.string.camera_permission_denied), Toast.LENGTH_SHORT).show()
+            }
+        }
+    private val takePictureLauncher =
+        registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+            if (success) {
+                latestTmpUri?.let { updateImageUriForCurrentForm(it) }
+            }
+        }
+    private val pickImageLauncher =
+        registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
+            uri?.let {
+                updateImageUriForCurrentForm(it)
+            }
+        }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNewFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        rebuildAdapter(isEnabled = actionType.equals("Add", true))
+
+        lifecycleScope.launchWhenStarted {
+            viewModel.formList.collect { list ->
+                if (list.isNotEmpty()) {
+                    latestList = list
+                    formAdapter?.submitList(list)
+                }
+            }
+        }
+
+        viewModel.benName.observe(viewLifecycleOwner) { binding.tvBenName.text = it }
+        viewModel.benAgeGender.observe(viewLifecycleOwner) { binding.tvAgeGender.text = it }
+        viewModel.formReady.observe(viewLifecycleOwner) { ready ->
+            if (!ready) {
+                binding.llContent.visibility = View.GONE
+                binding.pbForm.visibility = View.VISIBLE
+            } else {
+                binding.llContent.visibility = View.VISIBLE
+                binding.pbForm.visibility = View.GONE
+            }
+        }
+        viewModel.loadError.observe(viewLifecycleOwner) { error ->
+            if (error != null) {
+                // Surface the failure instead of letting the spinner hang forever.
+                // The list will refresh when we pop back.
+                binding.pbForm.visibility = View.GONE
+                Toast.makeText(requireContext(), error, Toast.LENGTH_LONG).show()
+                parentFragmentManager.popBackStack()
+            }
+        }
+        viewModel.isEditable.observe(viewLifecycleOwner) { editable ->
+            binding.btnSubmit.visibility = if (editable) View.VISIBLE else View.GONE
+            binding.fabEdit.visibility = if (!editable && actionType.equals("View", true)) View.VISIBLE else View.GONE
+            rebuildAdapter(isEnabled = editable)
+        }
+
+        binding.btnSubmit.setOnClickListener {
+            val result = (binding.form.rvInputForm.adapter as? FormInputAdapter)?.validateInput(resources)
+            if (result == -1) {
+                viewModel.saveForm()
+            } else if (result != null) {
+                binding.form.rvInputForm.scrollToPosition(result)
+            }
+        }
+        binding.fabEdit.setOnClickListener { viewModel.enableEditMode() }
+
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                AbortionFormViewModel.State.IDLE -> Unit
+                AbortionFormViewModel.State.SAVING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                }
+                AbortionFormViewModel.State.SAVE_SUCCESS -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(requireContext(), getString(R.string.save_successful_toast), Toast.LENGTH_LONG).show()
+                    WorkerUtils.triggerAncVisitSync(requireContext())
+                    WorkerUtils.triggerEligibleCoupleTrackingSync(requireContext())
+                    WorkerUtils.triggerBeneficiarySync(requireContext())
+                    parentFragmentManager.popBackStack()
+                }
+                AbortionFormViewModel.State.SAVE_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    Toast.makeText(requireContext(), getString(R.string.something_wend_wong_contact_testing), Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.cac_form)
+        // If the load hasn't succeeded yet (e.g. the user navigated here right
+        // after save and master data hadn't propagated yet), retry now instead
+        // of forcing an app relaunch.
+        viewModel.reload()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+        formAdapter = null
+    }
+
+    private fun rebuildAdapter(isEnabled: Boolean) {
+        formAdapter = FormInputAdapter(
+            selectImageClickListener = FormInputAdapter.SelectUploadImageClickListener { formId ->
+                if (isEnabled && (formId == 21 || formId == 22)) {
+                    currentImageFormId = formId
+                    showMediaOptionsPopup()
+                }
+            },
+            imageClickListener = FormInputAdapter.ImageClickListener { formId ->
+                if (isEnabled && (formId == 21 || formId == 22)) {
+                    currentImageFormId = formId
+                    showMediaOptionsPopup()
+                }
+            },
+            formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                viewModel.updateListOnValueChanged(formId, index)
+                if (formId == 1) {
+                    binding.form.rvInputForm.adapter?.notifyItemChanged(viewModel.getWeeksOfPregnancyIndex())
+                }
+            },
+            isEnabled = isEnabled,
+            viewDocumentListner = FormInputAdapter.ViewDocumentOnClick { formId ->
+                if (formId == 21 || formId == 22) showAbortionImagePreview(formId)
+            }
+        )
+        binding.form.rvInputForm.adapter = formAdapter
+        if (latestList.isNotEmpty()) {
+            formAdapter?.submitList(latestList)
+        }
+    }
+
+    private fun showMediaOptionsPopup() {
+        val alertView = layoutInflater.inflate(R.layout.layout_media_options, binding.root, false)
+        val btnGallery = alertView.findViewById<Button>(R.id.btnGallery)
+        val btnCamera = alertView.findViewById<Button>(R.id.btnCamera)
+        val btnPdf = alertView.findViewById<Button>(R.id.btnPdf)
+        val btnCancel = alertView.findViewById<Button>(R.id.btnCancel)
+        btnPdf.visibility = View.GONE
+        val dialog = MaterialAlertDialogBuilder(requireContext())
+            .setView(alertView)
+            .setCancelable(true)
+            .create()
+
+        btnCamera.setOnClickListener {
+            dialog.dismiss()
+            handleCameraSelection()
+        }
+        btnGallery.setOnClickListener {
+            dialog.dismiss()
+            pickImageLauncher.launch("image/*")
+        }
+        btnCancel.setOnClickListener { dialog.dismiss() }
+        dialog.show()
+    }
+
+    private fun handleCameraSelection() {
+        val permissionStatus = ContextCompat.checkSelfPermission(
+            requireContext(),
+            Manifest.permission.CAMERA
+        )
+        if (permissionStatus == PackageManager.PERMISSION_GRANTED) {
+            launchCameraCapture()
+        } else {
+            requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+        }
+    }
+
+    private fun launchCameraCapture() {
+        latestTmpUri = getTmpFileUri()
+        takePictureLauncher.launch(latestTmpUri)
+    }
+
+    private fun getTmpFileUri(): Uri {
+        val imagesDir = requireContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        val tmpFile = File.createTempFile("cac_discharge_", ".jpg", imagesDir)
+        return FileProvider.getUriForFile(
+            requireContext(),
+            "${requireContext().packageName}.provider",
+            tmpFile
+        )
+    }
+
+    private fun updateImageUriForCurrentForm(uri: Uri) {
+        val formId = currentImageFormId ?: return
+        viewModel.setImageUriToFormElement(formId, uri.toString())
+        val index = viewModel.getImageFieldIndex(formId)
+        if (index >= 0) {
+            binding.form.rvInputForm.adapter?.notifyItemChanged(index)
+        }
+    }
+
+    private fun showAbortionImagePreview(formId: Int) {
+        val raw = viewModel.getAbortionImageFieldValue(formId) ?: return
+        val imageView = ImageView(requireContext()).apply {
+            adjustViewBounds = true
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+        }
+        val scroll = ScrollView(requireContext()).apply {
+            layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+            addView(imageView)
+        }
+        val glideFailureListener = object : RequestListener<Drawable> {
+            override fun onLoadFailed(
+                e: GlideException?,
+                model: Any?,
+                target: Target<Drawable>,
+                isFirstResource: Boolean
+            ): Boolean {
+                Toast.makeText(requireContext(), R.string.image_unavailable, Toast.LENGTH_SHORT).show()
+                return false
+            }
+            override fun onResourceReady(
+                resource: Drawable,
+                model: Any,
+                target: Target<Drawable>?,
+                dataSource: DataSource,
+                isFirstResource: Boolean
+            ): Boolean = false
+        }
+        when {
+            raw.startsWith("data:image", ignoreCase = true) -> {
+                val comma = raw.indexOf(',')
+                val payload = if (comma >= 0) raw.substring(comma + 1) else raw
+                ImgUtils.decodeBase64ToBitmap(payload)?.let { imageView.setImageBitmap(it) }
+            }
+            raw.startsWith("/") -> {
+                Glide.with(this).load(File(raw)).fitCenter().listener(glideFailureListener).into(imageView)
+            }
+            raw.contains("://") -> {
+                Glide.with(this).load(Uri.parse(raw)).fitCenter().listener(glideFailureListener).into(imageView)
+            }
+            else -> {
+                ImgUtils.decodeBase64ToBitmap(raw)?.let { imageView.setImageBitmap(it) }
+            }
+        }
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(
+                when (formId) {
+                    21 -> getString(R.string.abortion_discharge_summary_1)
+                    22 -> getString(R.string.abortion_discharge_summary_2)
+                    else -> getString(R.string.view)
+                }
+            )
+            .setView(scroll)
+            .setPositiveButton(android.R.string.ok, null)
+            .show()
+    }
+
+    companion object {
+        private const val ARG_ACTION_TYPE = "arg_action_type"
+        private const val ARG_PATIENT_ID = "arg_patient_id"
+
+        fun newInstance(actionType: String, patientId: String): AbortionFormFragment {
+            return AbortionFormFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_ACTION_TYPE, actionType)
+                    putString(ARG_PATIENT_ID, patientId)
+                }
+            }
+        }
+    }
+}
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormViewModel.kt
new file mode 100644
index 000000000..d9dd9c8f9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionFormViewModel.kt
@@ -0,0 +1,255 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.configuration.PregnantWomanAncAbortionDataset
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import timber.log.Timber
+
+class AbortionFormViewModel(
+    private val patientId: String,
+    private val actionType: String,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val ecrRepo: EcrRepo
+) : ViewModel() {
+
+    enum class State {
+        IDLE, SAVING, SAVE_SUCCESS, SAVE_FAILED
+    }
+
+    private val _state = MutableLiveData(State.IDLE)
+    val state: LiveData<State> = _state
+
+    private val _benName = MutableLiveData<String>()
+    val benName: LiveData<String> = _benName
+    private val _benAgeGender = MutableLiveData<String>()
+    val benAgeGender: LiveData<String> = _benAgeGender
+
+    private val _recordExists = MutableLiveData<Boolean>(false)
+    val recordExists: LiveData<Boolean> = _recordExists
+
+    private val _formReady = MutableLiveData(false)
+    val formReady: LiveData<Boolean> = _formReady
+
+    private val _loadError = MutableLiveData<String?>(null)
+    val loadError: LiveData<String?> = _loadError
+
+    private val dataset = PregnantWomanAncAbortionDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+    val isEditable: LiveData<Boolean> get() = _isEditable
+    private val _isEditable = MutableLiveData(actionType.equals("Add", true))
+
+    private lateinit var ancCache: PregnantWomanAncCache
+
+    @Volatile
+    private var loadInProgress: Boolean = false
+
+    init {
+        loadForm()
+    }
+
+    /** Re-runs the form load. Safe to call multiple times (e.g. from
+     *  Fragment.onResume) — concurrent calls are coalesced. Used to recover
+     *  from a load that failed transiently (e.g. a background pull hadn't
+     *  finished populating the patient row yet). */
+    fun reload() {
+        if (_formReady.value == true) return
+        loadForm()
+    }
+
+    private fun loadForm() {
+        if (loadInProgress) return
+        loadInProgress = true
+        viewModelScope.launch {
+            try {
+                withContext(Dispatchers.IO) {
+                    _loadError.postValue(null)
+                    Timber.d("AbortionForm load: start patientId=$patientId")
+
+                    val user = userRepo.getLoggedInUser()
+                    if (user == null) {
+                        Timber.w("AbortionForm load: no logged-in user")
+                        _loadError.postValue("Session expired. Please sign in again.")
+                        return@withContext
+                    }
+                    Timber.d("AbortionForm load: user ok")
+
+                    val patient = try {
+                        patientRepo.getPatientDisplay(patientId)
+                    } catch (e: Exception) {
+                        Timber.e(e, "AbortionForm load: getPatientDisplay threw")
+                        _loadError.postValue("Patient record could not be loaded.")
+                        return@withContext
+                    }
+                    _benName.postValue("${patient.patient.firstName} ${patient.patient.lastName ?: ""}".trim())
+                    _benAgeGender.postValue("${patient.patient.age} ${patient.ageUnit?.name} | ${patient.gender?.genderName}")
+                    Timber.d("AbortionForm load: patient ok")
+
+                    val allAnc = maternalHealthRepo.getAllActiveAncRecords(patientId) +
+                        listOfNotNull(maternalHealthRepo.getLastAnc(patientId))
+                    val aborted = allAnc
+                        .distinctBy { it.id }
+                        .filter { it.isAborted && it.abortionDate != null }
+                        .maxByOrNull { it.abortionDate ?: 0L }
+                    if (aborted == null) {
+                        Timber.w("AbortionForm load: no aborted ANC record found for $patientId (scanned ${allAnc.size})")
+                        _loadError.postValue("No abortion record found for this patient yet.")
+                        return@withContext
+                    }
+                    Timber.d("AbortionForm load: aborted found id=${aborted.id}")
+
+                    val savedReg = maternalHealthRepo.getSavedRegistrationRecord(patientId)
+                        ?: maternalHealthRepo.getLatestRegistrationRecord(patientId)
+                    val lmpDate = savedReg?.lmpDate?.takeIf { it > 0 }
+                        ?: aborted.lmpDate?.takeIf { it > 0 }
+                        ?: 0L
+                    val reg = (savedReg ?: PregnantWomanRegistrationCache(
+                        patientID = patientId,
+                        lmpDate = lmpDate,
+                        createdBy = user.userName,
+                        updatedBy = user.userName,
+                        syncState = SyncState.UNSYNCED,
+                        active = false
+                    )).copy(lmpDate = lmpDate)
+
+                    ancCache = aborted.copy(updatedBy = user.userName)
+                    _recordExists.postValue(ancCache.terminationDoneBy != null || ancCache.methodOfTermination != null)
+                    if (actionType.equals("View", true)) {
+                        _isEditable.postValue(false)
+                    }
+                    dataset.setUpPage(reg, ancCache)
+                    _formReady.postValue(true)
+                    Timber.d("AbortionForm load: complete patientId=$patientId")
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "AbortionForm load: uncaught failure for patientId=$patientId")
+                _loadError.postValue("Couldn't load form: ${e.message ?: e.javaClass.simpleName}")
+            } finally {
+                loadInProgress = false
+            }
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        viewModelScope.launch {
+            dataset.updateList(formId, index)
+        }
+    }
+
+    fun enableEditMode() {
+        _isEditable.value = true
+    }
+
+    fun saveForm() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                try {
+                    _state.postValue(State.SAVING)
+                    dataset.mapValues(ancCache, 1)
+                    if (ancCache.processed != "N") ancCache.processed = "U"
+                    ancCache.syncState = SyncState.UNSYNCED
+                    ancCache.updatedDate = System.currentTimeMillis()
+                    maternalHealthRepo.persistAncRecord(ancCache)
+                    // Idempotent retirement: matches PwAncFormViewModel abortion branch so re-saves
+                    // from this dedicated form converge state for women aborted before this fix.
+                    retirePregnancyLifecycle()
+                    _state.postValue(State.SAVE_SUCCESS)
+                } catch (_: Exception) {
+                    _state.postValue(State.SAVE_FAILED)
+                }
+            }
+        }
+    }
+
+    private suspend fun retirePregnancyLifecycle() {
+        try {
+            maternalHealthRepo.getSavedRegistrationRecord(patientId)?.let { pwr ->
+                if (pwr.active) {
+                    pwr.active = false
+                    if (pwr.processed != "N") pwr.processed = "U"
+                    pwr.syncState = SyncState.UNSYNCED
+                    maternalHealthRepo.persistRegisterRecord(pwr)
+                }
+            }
+
+            val activeAnc = maternalHealthRepo.getAllActiveAncRecords(patientId)
+            if (activeAnc.isNotEmpty()) {
+                activeAnc.forEach {
+                    it.isActive = false
+                    if (it.processed != "N") it.processed = "U"
+                    it.syncState = SyncState.UNSYNCED
+                }
+                maternalHealthRepo.updateAncRecord(activeAnc.toTypedArray())
+            }
+
+            val patient = patientRepo.getPatient(patientId)
+            if (patient.statusOfWomanID != 1) {
+                patient.statusOfWomanID = 1 // Eligible Couple — fresh start after abortion
+                patient.syncState = SyncState.UNSYNCED
+                patientRepo.updateRecord(patient)
+            }
+            // Clear pregnancy markers and keep (or recreate) one active ECT row,
+            // so the EC-tracking DAO (filters on isActive = 1) still surfaces her
+            // after statusOfWomanID is reset to 1.
+            val createdBy = userRepo.getLoggedInUser()?.userName ?: "system"
+            ecrRepo.resetEctAfterAbortion(patientId, createdBy)
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to retire pregnancy lifecycle for patientID: $patientId")
+            throw e
+        }
+    }
+
+    fun getWeeksOfPregnancyIndex(): Int = dataset.getWeeksOfPregnancyIndex()
+
+    fun setImageUriToFormElement(formId: Int, uri: String) {
+        dataset.setImageUriToFormElement(formId, uri)
+    }
+
+    fun getImageFieldIndex(formId: Int): Int = dataset.getImageFieldIndex(formId)
+
+    fun getAbortionImageFieldValue(formId: Int): String? = dataset.getAbortionImageFieldValue(formId)
+
+    class Factory(
+        private val patientId: String,
+        private val actionType: String,
+        private val preferenceDao: PreferenceDao,
+        private val context: Context,
+        private val maternalHealthRepo: MaternalHealthRepo,
+        private val patientRepo: PatientRepo,
+        private val userRepo: UserRepo,
+        private val ecrRepo: EcrRepo
+    ) : ViewModelProvider.Factory {
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+            @Suppress("UNCHECKED_CAST")
+            return AbortionFormViewModel(
+                patientId,
+                actionType,
+                preferenceDao,
+                context,
+                maternalHealthRepo,
+                patientRepo,
+                userRepo,
+                ecrRepo
+            ) as T
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionListFragment.kt
new file mode 100644
index 000000000..5bb083469
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AbortionListFragment.kt
@@ -0,0 +1,163 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.AbortionListAdapter
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.FragmentAbortionListBinding
+import org.piramalswasthya.cho.model.AbortionDomain
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.filterPatientsByQuery
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of women with abortion records.
+ * Shows women who have aborted pregnancies (isAborted = 1 and abortionDate is not null).
+ */
+@AndroidEntryPoint
+class AbortionListFragment : Fragment() {
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: FragmentAbortionListBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var adapter: AbortionListAdapter
+    private var allAbortions: List<AbortionDomain> = emptyList()
+    private var filteredAbortions: List<AbortionDomain> = emptyList()
+
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            onSpeechResult = { text -> binding.searchBarInclude.search.setText(text) },
+            onFaceMatchResult = { matchedPatient ->
+                if (matchedPatient != null) {
+                    filteredAbortions = allAbortions.filter { it.patient.patientID == matchedPatient.patientID }
+                    updateUI()
+                    if (filteredAbortions.isNotEmpty()) {
+                        Toast.makeText(requireContext(), "${filteredAbortions.size} matching record(s) found", Toast.LENGTH_SHORT).show()
+                    } else {
+                        Toast.makeText(requireContext(), "Patient not found in this Abortion list", Toast.LENGTH_LONG).show()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "No matching patient found", Toast.LENGTH_SHORT).show()
+                }
+            }
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentAbortionListBinding.inflate(inflater, container, false)
+        faceSearchHelper
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupRecyclerView()
+        setupSearch()
+        observeAbortions()
+    }
+
+    private fun setupRecyclerView() {
+        adapter = AbortionListAdapter(
+            AbortionListAdapter.ClickListener(
+                clickedView = { patientID ->
+                    openAbortionActionFragment(actionType = "View", patientId = patientID)
+                },
+                clickedAdd = { patientID ->
+                    openAbortionActionFragment(actionType = "Add", patientId = patientID)
+                }
+            )
+        )
+
+        binding.rvAbortionList.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvAbortionList.adapter = adapter
+    }
+
+    private fun openAbortionActionFragment(actionType: String, patientId: String) {
+        val fragment = AbortionFormFragment.newInstance(actionType = actionType, patientId = patientId)
+        parentFragmentManager.beginTransaction()
+            .replace(R.id.fragment_container, fragment)
+            .addToBackStack(null)
+            .commit()
+    }
+
+    private fun setupSearch() {
+        binding.searchBarInclude.search.setupSearchTextWatcher { query ->
+            filterAbortions(query)
+        }
+        binding.searchBarInclude.searchTil.setEndIconOnClickListener {
+            faceSearchHelper.launchSpeechToText()
+        }
+        binding.searchBarInclude.cameraIcon.setOnClickListener {
+            faceSearchHelper.launchCameraSearch()
+        }
+    }
+
+    private fun filterAbortions(query: String) {
+        filteredAbortions = allAbortions.filterPatientsByQuery(query) { it.patient }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        if (_binding == null) return
+        adapter.submitList(filteredAbortions)
+        updateListUI(
+            filteredList = filteredAbortions,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvAbortionList,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying abortion records"
+        )
+    }
+
+    private fun observeAbortions() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            maternalHealthRepo.getAbortionPregnantWomanList().collectLatest { abortionsList ->
+                allAbortions = abortionsList.sortedByDescending {
+                    it.abortionDate ?: 0L
+                }
+                filteredAbortions = allAbortions
+                updateUI()
+            }
+        }
+    }
+
+
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.abortion_list)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AncBottomSheetFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AncBottomSheetFragment.kt
new file mode 100644
index 000000000..8da8cf75b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/AncBottomSheetFragment.kt
@@ -0,0 +1,110 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.adapter.AncVisitBottomSheetAdapter
+import org.piramalswasthya.cho.databinding.BottomSheetAncVisitsBinding
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AncBottomSheetFragment : BottomSheetDialogFragment() {
+
+    private var _binding: BottomSheetAncVisitsBinding? = null
+    private val binding: BottomSheetAncVisitsBinding
+        get() = _binding!!
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    private var patientID: String? = null
+    private var allLoadedVisits: List<PregnantWomanAncCache> = emptyList()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = BottomSheetAncVisitsBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        patientID = arguments?.getString("patientID")
+
+        val adapter = AncVisitBottomSheetAdapter(
+            AncVisitBottomSheetAdapter.AncVisitClickListener { ancVisit ->
+                // Navigate to the specific ANC visit form
+                // If ANC 4 is completed, all visits should be read-only
+                val isAnc4Completed = allLoadedVisits.any { it.visitNumber == 4 && it.weight != null }
+                val isOldVisit = ancVisit.weight != null || isAnc4Completed
+                val intent = Intent(
+                    requireContext(),
+                    org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity::class.java
+                ).apply {
+                    putExtra("navigateTo", "ANC")
+                    putExtra("patientID", patientID)
+                    putExtra("visitNumber", ancVisit.visitNumber)
+                    putExtra("isOldVisit", isOldVisit)
+                }
+                startActivity(intent)
+                dismiss()
+            }
+        )
+
+        binding.rvAncVisits.adapter = adapter
+        binding.rvAncVisits.layoutManager = LinearLayoutManager(requireContext())
+        
+        // Add divider
+        val divider = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+        binding.rvAncVisits.addItemDecoration(divider)
+
+        // Load ANC visits
+        loadAncVisits(adapter)
+    }
+
+    private fun loadAncVisits(adapter: AncVisitBottomSheetAdapter) {
+        lifecycleScope.launch {
+            patientID?.let { id ->
+                // Get pregnancy registration to access LMP date
+                val pwr = maternalHealthRepo.getActiveRegistrationRecord(id)
+                val lmpDate = pwr?.lmpDate ?: 0L
+                
+                val ancVisits = maternalHealthRepo.getAllActiveAncRecords(id)
+                    .sortedBy { it.visitNumber }
+                allLoadedVisits = ancVisits
+                
+                // Pass LMP date and all visits to adapter for status calculation
+                adapter.updateData(ancVisits, lmpDate)
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance(patientID: String): AncBottomSheetFragment {
+            return AncBottomSheetFragment().apply {
+                arguments = Bundle().apply {
+                    putString("patientID", patientID)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/BaseMaternalHealthListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/BaseMaternalHealthListFragment.kt
new file mode 100644
index 000000000..825df39f3
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/BaseMaternalHealthListFragment.kt
@@ -0,0 +1,170 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.utils.FaceSearchHelper
+import org.piramalswasthya.cho.utils.filterPatientsByQuery
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import javax.inject.Inject
+
+/**
+ * Abstract base class for maternal health list fragments that share common patterns:
+ * - Search bar with voice and camera search
+ * - FaceSearchHelper for face-based patient lookup
+ * - RecyclerView with empty state and count display
+ * - Patient filtering by search query
+ *
+ * @param VB The ViewBinding type for the fragment's layout
+ * @param T The domain model type for the patient list items
+ */
+abstract class BaseMaternalHealthListFragment<VB : ViewBinding, T : Any> : Fragment() {
+
+    @Inject
+    lateinit var patientDao: PatientDao
+
+    private var _binding: VB? = null
+    protected val binding: VB get() = _binding!!
+
+    protected var allPatients: List<T> = emptyList()
+    protected var filteredPatients: List<T> = emptyList()
+
+    // ── Abstract contract for subclasses ──
+
+    /** Inflate the fragment-specific ViewBinding. */
+    abstract fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?): VB
+
+    /** Return the included search bar binding. */
+    abstract fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding
+
+    /** Return the RecyclerView for the patient list. */
+    abstract fun getRecyclerView(): RecyclerView
+
+    /** Return the empty state FrameLayout. */
+    abstract fun getEmptyStateView(): FrameLayout
+
+    /** Return the count TextView. */
+    abstract fun getCountTextView(): TextView
+
+    /** The string resource ID for the action bar title. */
+    abstract val titleResId: Int
+
+    /** Human-readable list name for the "not found" toast (e.g., "PNC Mother list"). */
+    abstract val listDisplayName: String
+
+    /** Log message prefix for updateUI (e.g., "Displaying PNC mothers"). */
+    abstract val logMessage: String
+
+    /** Set up the RecyclerView adapter. */
+    abstract fun setupRecyclerView()
+
+    /** Observe data from the repository and update [allPatients]. Call [onPatientsLoaded] when done. */
+    abstract fun observePatients()
+
+    /** Submit [list] to the adapter. */
+    abstract fun submitListToAdapter(list: List<T>)
+
+    /** Extract the [Patient] from a list item (used for filtering and face matching). */
+    abstract fun extractPatient(item: T): Patient
+
+    // ── FaceSearchHelper (shared) ──
+
+    private val faceSearchHelper by lazy {
+        FaceSearchHelper(
+            fragment = this,
+            patientDao = patientDao,
+            onSpeechResult = { text -> getSearchBarBinding().search.setText(text) },
+            onFaceMatchResult = { matchedPatient ->
+                if (matchedPatient != null) {
+                    filteredPatients = allPatients.filter {
+                        extractPatient(it).patientID == matchedPatient.patientID
+                    }
+                    updateUI()
+                    if (filteredPatients.isNotEmpty()) {
+                        Toast.makeText(requireContext(), "1 matching record found", Toast.LENGTH_SHORT).show()
+                    } else {
+                        Toast.makeText(requireContext(), "Patient not found in this $listDisplayName", Toast.LENGTH_LONG).show()
+                    }
+                } else {
+                    Toast.makeText(requireContext(), "No matching patient found", Toast.LENGTH_SHORT).show()
+                }
+            }
+        )
+    }
+
+    // ── Lifecycle ──
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = inflateBinding(inflater, container)
+        faceSearchHelper // Eagerly initialise so activity-result launchers are registered
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView()
+        setupSearch()
+        observePatients()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(titleResId)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    // ── Shared helpers ──
+
+    private fun setupSearch() {
+        val searchBar = getSearchBarBinding()
+        searchBar.search.setupSearchTextWatcher { query -> filterPatients(query) }
+        searchBar.searchTil.setEndIconOnClickListener { faceSearchHelper.launchSpeechToText() }
+        searchBar.cameraIcon.setOnClickListener { faceSearchHelper.launchCameraSearch() }
+    }
+
+    protected fun filterPatients(query: String) {
+        filteredPatients = allPatients.filterPatientsByQuery(query) { extractPatient(it) }
+        updateUI()
+    }
+
+    protected fun updateUI() {
+        if (_binding == null) return
+        submitListToAdapter(filteredPatients)
+        updateListUI(
+            filteredList = filteredPatients,
+            emptyStateView = getEmptyStateView(),
+            recyclerView = getRecyclerView(),
+            countTextView = getCountTextView(),
+            resultString = getString(R.string.result),
+            logMessage = logMessage
+        )
+    }
+
+    /** Call after loading or refreshing [allPatients] to update the UI. */
+    protected fun onPatientsLoaded() {
+        filteredPatients = allPatients
+        updateUI()
+    }
+}
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormFragment.kt
new file mode 100644
index 000000000..28f73c136
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormFragment.kt
@@ -0,0 +1,262 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.FormInputAdapter
+import org.piramalswasthya.cho.configuration.RMNCHAIconDataset.Companion.SHOW_ANC_VISITS_KEY
+import org.piramalswasthya.cho.databinding.FragmentNewFormBinding
+import org.piramalswasthya.cho.ui.home.rmncha.SubModuleActivity
+import org.piramalswasthya.cho.work.WorkerUtils
+import timber.log.Timber
+
+@AndroidEntryPoint
+class DeliveryOutcomeFormFragment : Fragment() {
+
+    private var _binding: FragmentNewFormBinding? = null
+    private val binding: FragmentNewFormBinding
+        get() = _binding ?: throw IllegalStateException("Fragment binding accessed after onDestroyView")
+
+    private val viewModel: DeliveryOutcomeFormViewModel by viewModels()
+
+    private val patientID: String
+        get() = arguments?.getString("patientID") ?: ""
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNewFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Set patientID in ViewModel
+        if (patientID.isNotEmpty()) {
+            viewModel.setPatientID(patientID)
+        } else {
+            Timber.e("PatientID is empty, cannot initialize form")
+            activity?.supportFragmentManager?.popBackStack()
+            return
+        }
+
+        // Delivery Outcome–specific UI: form title and Case ID row
+        binding.tvFormTitle.text = getString(R.string.delivery_outcome)
+        binding.llCaseIdRow.visibility = View.VISIBLE
+
+        // Set up all observers and UI components
+        setupFormAdapter()
+        setupPatientDetailsObservers()
+        setupAncHistoryLink()
+        setupAlertObserver()
+        setupSubmitButton()
+        setupStateObserver()
+    }
+
+    private fun setupFormAdapter() {
+        var adapter: FormInputAdapter? = null
+        var previousFormSize = 0
+
+        // Observe form list and update adapter when it's ready
+        lifecycleScope.launch {
+            viewModel.formList.collect { formElements ->
+                if (formElements.isNotEmpty() && adapter != null) {
+                    val currentSize = formElements.size
+                    adapter?.submitList(formElements)
+                    
+                    // Scroll to "Other (specify)" field (id = 9) when it's added
+                    if (currentSize > previousFormSize) {
+                        scrollToOtherFieldIfAdded(formElements)
+                    }
+                    previousFormSize = currentSize
+                }
+            }
+        }
+
+        // Observe record existence to enable/disable form and set up adapter
+        viewModel.recordExists.observe(viewLifecycleOwner) { recordExists ->
+            if (recordExists != null) {
+                adapter = FormInputAdapter(
+                    formValueListener = FormInputAdapter.FormValueListener { formId, index ->
+                        viewModel.updateListOnValueChanged(formId, index)
+                    },
+                    isEnabled = !recordExists
+                )
+                binding.form.rvInputForm.adapter = adapter
+                adapter?.submitList(viewModel.formList.value)
+                binding.btnSubmit.isEnabled = !recordExists
+                setupEditTextFocusListener()
+            }
+        }
+    }
+
+    private fun scrollToOtherFieldIfAdded(formElements: List<org.piramalswasthya.cho.model.FormElement>) {
+        val otherFieldIndex = formElements.indexOfFirst { it.id == 9 }
+        if (otherFieldIndex != -1) {
+            binding.form.rvInputForm.post {
+                binding.form.rvInputForm.scrollToPosition(otherFieldIndex)
+                binding.form.rvInputForm.postDelayed({
+                    val viewHolder = binding.form.rvInputForm.findViewHolderForAdapterPosition(otherFieldIndex)
+                    viewHolder?.itemView?.findViewById<android.widget.EditText>(R.id.et)?.requestFocus()
+                }, 300)
+            }
+        }
+    }
+
+    private fun setupEditTextFocusListener() {
+        binding.form.rvInputForm.addOnChildAttachStateChangeListener(
+            object : androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener {
+                override fun onChildViewAttachedToWindow(view: View) {
+                    view.findViewById<android.widget.EditText>(R.id.et)?.setOnFocusChangeListener { _, hasFocus ->
+                        if (hasFocus) {
+                            val position = binding.form.rvInputForm.getChildAdapterPosition(view)
+                            if (position != androidx.recyclerview.widget.RecyclerView.NO_POSITION) {
+                                binding.form.rvInputForm.post {
+                                    binding.form.rvInputForm.smoothScrollToPosition(position)
+                                }
+                            }
+                        }
+                    }
+                }
+                override fun onChildViewDetachedFromWindow(view: View) {
+                    // No action needed when view is detached
+                }
+            }
+        )
+    }
+
+    private fun setupPatientDetailsObservers() {
+        viewModel.benName.observe(viewLifecycleOwner) {
+            it?.let { name -> binding.tvBenName.text = name }
+        }
+
+        viewModel.benAge.observe(viewLifecycleOwner) {
+            it?.let { age -> binding.tvAgeGender.text = age }
+        }
+
+        viewModel.caseId.observe(viewLifecycleOwner) {
+            it?.let { caseId -> binding.tvCaseId.text = caseId }
+        }
+    }
+
+    private fun setupAncHistoryLink() {
+        binding.tvViewAncHistory.visibility = View.VISIBLE
+        binding.tvViewAncHistory.setOnClickListener {
+            val intent = SubModuleActivity.getDirectFragmentIntent(requireContext(), SHOW_ANC_VISITS_KEY)
+            startActivity(intent)
+        }
+    }
+
+    private fun setupAlertObserver() {
+        lifecycleScope.launch {
+            viewModel.alertMessageFlow.collect { alertMessage ->
+                alertMessage?.let { message ->
+                    if (isAdded) {
+                        val dialog = MaterialAlertDialogBuilder(requireContext())
+                            .setTitle(getString(R.string.alert_popup))
+                            .setMessage(message)
+                            .setPositiveButton(getString(android.R.string.ok)) { dialog, _ -> dialog.dismiss() }
+                            .setCancelable(true)
+                            .create()
+                        dialog.setOnDismissListener { viewModel.clearAlertMessage() }
+                        dialog.show()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun setupSubmitButton() {
+        binding.btnSubmit.setOnClickListener {
+            submitDeliveryOutcomeForm()
+        }
+    }
+
+    private fun setupStateObserver() {
+        viewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                DeliveryOutcomeFormViewModel.State.IDLE -> {
+                    // Do nothing
+                }
+                DeliveryOutcomeFormViewModel.State.LOADING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                }
+                DeliveryOutcomeFormViewModel.State.LOAD_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    context?.let {
+                        Toast.makeText(it, "Error loading form. Please try again.", Toast.LENGTH_LONG).show()
+                    }
+                }
+                DeliveryOutcomeFormViewModel.State.SAVING -> {
+                    binding.llContent.visibility = View.GONE
+                    binding.pbForm.visibility = View.VISIBLE
+                }
+                DeliveryOutcomeFormViewModel.State.SAVE_SUCCESS -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    context?.let { ctx ->
+                        WorkerUtils.triggerDeliveryOutcomeSync(ctx)
+                        WorkerUtils.triggerInfantRegistrationSync(ctx)
+                        WorkerUtils.triggerBeneficiarySync(ctx)
+                    }
+                    context?.let {
+                        Toast.makeText(it, "Save Successful", Toast.LENGTH_LONG).show()
+                    }
+                    parentFragmentManager.popBackStack()
+                }
+                DeliveryOutcomeFormViewModel.State.SAVE_FAILED -> {
+                    binding.llContent.visibility = View.VISIBLE
+                    binding.pbForm.visibility = View.GONE
+                    context?.let {
+                        Toast.makeText(it, "Something went wrong! Please try again.", Toast.LENGTH_LONG).show()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun submitDeliveryOutcomeForm() {
+        if (validateCurrentPage()) {
+            viewModel.saveForm()
+        }
+    }
+
+    private fun validateCurrentPage(): Boolean {
+        val result: Int? = binding.form.rvInputForm.adapter?.let {
+            (it as? FormInputAdapter)?.validateInput(resources, binding.form.rvInputForm)
+        }
+        Timber.d("Validation result: $result")
+        return if (result == -1) {
+            true
+        } else {
+            result?.let {
+                binding.form.rvInputForm.scrollToPosition(it)
+            }
+            false
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        // Update toolbar title - parent Activity will handle this
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title = 
+            getString(R.string.delivery_outcome)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormViewModel.kt
new file mode 100644
index 000000000..aac98a023
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFormViewModel.kt
@@ -0,0 +1,252 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.configuration.DeliveryOutcomeDataset
+import org.piramalswasthya.cho.database.room.SyncState
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.DeliveryOutcomeCache
+import org.piramalswasthya.cho.model.PregnantWomanAncCache
+import org.piramalswasthya.cho.model.PregnantWomanRegistrationCache
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.EcrRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class DeliveryOutcomeFormViewModel @Inject constructor(
+    @ApplicationContext context: Context,
+    private val preferenceDao: org.piramalswasthya.cho.database.shared_preferences.PreferenceDao,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val patientDao: PatientDao,
+    private val ecrRepo: EcrRepo
+) : ViewModel() {
+
+    companion object {
+        const val STATUS_POST_NATAL_MOTHER = 3
+    }
+
+    enum class State { IDLE, LOADING, LOAD_FAILED, SAVING, SAVE_SUCCESS, SAVE_FAILED }
+
+    private var patientID: String = ""
+
+    fun setPatientID(id: String) {
+        if (patientID.isEmpty() && id.isNotEmpty()) {
+            patientID = id
+            initializeForm()
+        }
+    }
+
+    private val _state = MutableLiveData(State.IDLE)
+    val state: LiveData<State> get() = _state
+
+    private val _benName = MutableLiveData<String>()
+    val benName: LiveData<String> get() = _benName
+
+    private val _benAge = MutableLiveData<String>()
+    val benAge: LiveData<String> get() = _benAge
+
+    private val _caseId = MutableLiveData<String>()
+    val caseId: LiveData<String> get() = _caseId
+
+    private val _recordExists = MutableLiveData<Boolean?>()
+    val recordExists: LiveData<Boolean?> get() = _recordExists
+
+    private val dataset = DeliveryOutcomeDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+    val alertMessageFlow = dataset.alertErrorMessageFlow
+
+    private var deliveryOutcome: DeliveryOutcomeCache? = null
+
+    private fun initializeForm() {
+        if (patientID.isEmpty()) return
+        viewModelScope.launch {
+            try {
+                val user = userRepo.getLoggedInUser()
+                    ?: throw IllegalStateException("No user logged in")
+                val (patientName, patientAge, patientCaseId) = loadPatientDetails()
+                val (pwr, anc) = loadPregnancyData()
+                loadDeliveryOutcome(user)
+                
+                dataset.setUpPage(
+                    pwr = pwr,
+                    anc = anc,
+                    saved = if (_recordExists.value == true) deliveryOutcome else null,
+                    patientName = patientName,
+                    patientAge = patientAge,
+                    caseId = patientCaseId
+                )
+            } catch (e: Exception) {
+                handleInitializationError(e)
+            }
+        }
+    }
+
+    private suspend fun loadPatientDetails(): Triple<String, String, String> {
+        val patientDisplay = patientRepo.getPatientDisplay(patientID)
+            ?: throw IllegalStateException("Patient not found: $patientID")
+        val patient = patientDisplay.patient
+        val patientName = "${patient.firstName ?: ""} ${patient.lastName ?: ""}".trim()
+        val patientAge = patient.dob?.let { DateTimeUtil.calculateAgeString(it) } ?: "NA"
+        val genderName = patientDisplay.gender?.genderName ?: "NA"
+        val patientAgeGender = "$patientAge | $genderName"
+        val patientCaseId = patient.patientID
+
+        _benName.value = patientName
+        _benAge.value = patientAgeGender
+        _caseId.value = patientCaseId
+
+        return Triple(patientName, patientAge, patientCaseId)
+    }
+
+    private suspend fun loadPregnancyData(): Pair<PregnantWomanRegistrationCache, PregnantWomanAncCache?> {
+        val pwr = maternalHealthRepo.getSavedRegistrationRecord(patientID)
+            ?: throw IllegalStateException("No pregnancy registration found")
+        if (pwr.lmpDate <= 0) {
+            throw IllegalStateException("Invalid LMP date in pregnancy registration")
+        }
+        val anc: PregnantWomanAncCache? = maternalHealthRepo.getLastAnc(patientID)
+        return Pair(pwr, anc)
+    }
+
+    private suspend fun loadDeliveryOutcome(user: org.piramalswasthya.cho.model.UserDomain) {
+        deliveryOutcome = DeliveryOutcomeCache(
+            patientID = patientID,
+            syncState = SyncState.UNSYNCED,
+            createdBy = user.userName,
+            updatedBy = user.userName,
+            isActive = true
+        )
+        deliveryOutcomeRepo.getDeliveryOutcome(patientID)?.let {
+            deliveryOutcome = it
+            _recordExists.value = true
+        } ?: run {
+            _recordExists.value = false
+        }
+    }
+
+    private suspend fun handleInitializationError(e: Exception) {
+        Timber.e(e, "Error initializing delivery outcome form for patientID: $patientID")
+        _state.value = State.LOAD_FAILED
+        _benName.value = "Error loading form"
+        _benAge.value = e.message ?: "Unknown error"
+        if (_recordExists.value == null) _recordExists.value = false
+        if (deliveryOutcome == null) {
+            createFallbackDeliveryOutcome()
+        }
+    }
+
+    private suspend fun createFallbackDeliveryOutcome() {
+        try {
+            val u = userRepo.getLoggedInUser()
+            deliveryOutcome = DeliveryOutcomeCache(
+                patientID = patientID,
+                syncState = SyncState.UNSYNCED,
+                createdBy = u?.userName ?: "Unknown",
+                updatedBy = u?.userName ?: "Unknown",
+                isActive = true
+            )
+        } catch (ex: Exception) {
+            Timber.e(ex, "Failed to init delivery outcome cache")
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        viewModelScope.launch { dataset.updateList(formId, index) }
+    }
+
+    fun clearAlertMessage() {
+        viewModelScope.launch { dataset.resetErrorMessageFlow() }
+    }
+
+    fun saveForm() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val outcome = deliveryOutcome
+                if (outcome == null) {
+                    Timber.e("deliveryOutcome is null")
+                    _state.postValue(State.SAVE_FAILED)
+                    return@withContext
+                }
+                try {
+                    _state.postValue(State.SAVING)
+                    dataset.mapValues(outcome, 1)
+                    deliveryOutcomeRepo.saveDeliveryOutcome(outcome)
+                    // Update patient status to Post Natal Mother so PNC list picks her up
+                    updatePatientStatusToPostNatal()
+                    // Retire upstream pregnancy state so she drops off PWR/ANC/e-PMSMA lists.
+                    retirePregnancyLifecycle()
+                    _state.postValue(State.SAVE_SUCCESS)
+                } catch (e: Exception) {
+                    Timber.e(e, "Error saving delivery outcome")
+                    _state.postValue(State.SAVE_FAILED)
+                }
+            }
+        }
+    }
+
+    private suspend fun updatePatientStatusToPostNatal() {
+        try {
+            val patient = patientDao.getPatient(patientID)
+            patient.statusOfWomanID = STATUS_POST_NATAL_MOTHER
+            patient.syncState = SyncState.UNSYNCED
+            patientDao.updatePatient(patient)
+            Timber.d("Patient status updated to Post Natal Mother for patientID: $patientID")
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to update patient status to Post Natal Mother")
+        }
+    }
+
+    private suspend fun retirePregnancyLifecycle() {
+        try {
+            maternalHealthRepo.getSavedRegistrationRecord(patientID)?.let { pwr ->
+                if (pwr.active) {
+                    pwr.active = false
+                    pwr.syncState = SyncState.UNSYNCED
+                    maternalHealthRepo.updatePwr(pwr)
+                }
+            }
+
+            val activeAnc = maternalHealthRepo.getAllActiveAncRecords(patientID)
+            if (activeAnc.isNotEmpty()) {
+                activeAnc.forEach {
+                    it.pregnantWomanDelivered = true
+                    it.isActive = false
+                    it.processed = "U"
+                    it.syncState = SyncState.UNSYNCED
+                }
+                maternalHealthRepo.updateAncRecord(activeAnc.toTypedArray())
+            }
+
+            // Clear pregnancy markers on every ECT row so the catch-all cannot leak
+            // post-delivery women back into ANC/PWR lists via stale historical visits.
+            ecrRepo.getAllECT(patientID).forEach { ect ->
+                if (ect.isPregnant != null || ect.pregnancyTestResult != null) {
+                    ect.isPregnant = null
+                    ect.pregnancyTestResult = null
+                    if (ect.processed != "N") ect.processed = "U"
+                    ect.syncState = SyncState.UNSYNCED
+                    ecrRepo.saveEct(ect)
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to retire pregnancy lifecycle for patientID: $patientID")
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFragment.kt
new file mode 100644
index 000000000..af9858dce
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/DeliveryOutcomeFragment.kt
@@ -0,0 +1,127 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.DeliveryOutcomeAdapter
+import org.piramalswasthya.cho.databinding.FragmentDeliveryOutcomeBinding
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form.DeliveryOutcomeFormFragment
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of Delivery Outcomes.
+ * Shows pregnant women who have delivered (pregnantWomanDelivered = true in ANC).
+ */
+@AndroidEntryPoint
+class DeliveryOutcomeFragment : BaseMaternalHealthListFragment<FragmentDeliveryOutcomeBinding, PatientWithPwrDomain>() {
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    @Inject
+    lateinit var deliveryOutcomeRepo: DeliveryOutcomeRepo
+
+    private lateinit var adapter: DeliveryOutcomeAdapter
+
+    // ── Base class contract ──
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentDeliveryOutcomeBinding.inflate(inflater, container, false)
+
+    override fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding = binding.searchBarInclude
+    override fun getRecyclerView(): RecyclerView = binding.rvDeliveryOutcome
+    override fun getEmptyStateView(): FrameLayout = binding.flEmpty
+    override fun getCountTextView(): TextView = binding.tvCount
+
+    override val titleResId = R.string.delivery_outcome
+    override val listDisplayName = "Delivery Outcome list"
+    override val logMessage = "Displaying delivered women"
+
+    override fun extractPatient(item: PatientWithPwrDomain): Patient = item.patient
+
+    override fun submitListToAdapter(list: List<PatientWithPwrDomain>) {
+        adapter.submitList(list)
+    }
+
+    // ── Fragment-specific: back button handling ──
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    requireActivity().supportFragmentManager.popBackStack()
+                }
+            }
+        )
+    }
+
+    override fun setupRecyclerView() {
+        adapter = DeliveryOutcomeAdapter(
+            DeliveryOutcomeAdapter.ClickListener { patientWithPwr ->
+                val fragment = DeliveryOutcomeFormFragment().apply {
+                    arguments = Bundle().apply {
+                        putString("patientID", patientWithPwr.patient.patientID)
+                        putInt("visitNumber", 1)
+                    }
+                }
+                requireActivity().supportFragmentManager.commit {
+                    replace(R.id.fragment_container, fragment)
+                    addToBackStack(null)
+                }
+            }
+        )
+
+        binding.rvDeliveryOutcome.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvDeliveryOutcome.adapter = adapter
+    }
+
+    override fun observePatients() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            combine(
+                maternalHealthRepo.getAllDeliveredWomen(),
+                maternalHealthRepo.getNeonatalOutcomeEligibleWomenPatientIDs()
+            ) { patientsList, filledDOIds ->
+                allPatients = withContext(Dispatchers.IO) {
+                    patientsList.map { patientWithPwr ->
+                        async {
+                            val domainModel = patientWithPwr.asDomainModel()
+                            val patientID = patientWithPwr.patient.patientID
+                            val isFilled = filledDOIds.contains(patientID)
+                            domainModel.isDeliveryOutcomeFilled = isFilled
+                            domainModel.deliveryOutcomeSyncState =
+                                if (isFilled) deliveryOutcomeRepo.getDeliveryOutcome(patientID)?.syncState else null
+                            domainModel
+                        }
+                    }.awaitAll()
+                }.sortedByDescending { it.pwr?.dateOfRegistration ?: 0L }
+
+                onPatientsLoaded()
+            }.collectLatest { }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/EPmsmaListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/EPmsmaListFragment.kt
new file mode 100644
index 000000000..4ca9be644
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/EPmsmaListFragment.kt
@@ -0,0 +1,132 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.PmsmaListAdapter
+import org.piramalswasthya.cho.databinding.FragmentEPmsmaListBinding
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PmsmaDomain
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity
+import javax.inject.Inject
+
+/**
+ * Fragment to display the e-PMSMA List.
+ * Shows pregnant women flagged as high-risk on any active ANC visit
+ * (PregnantWomanAncCache.anyHighRisk = true).
+ */
+@AndroidEntryPoint
+class EPmsmaListFragment : BaseMaternalHealthListFragment<FragmentEPmsmaListBinding, PmsmaDomain>() {
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    private lateinit var adapter: PmsmaListAdapter
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentEPmsmaListBinding.inflate(inflater, container, false)
+
+    override fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding = binding.searchBarInclude
+    override fun getRecyclerView(): RecyclerView = binding.rvEPmsma
+    override fun getEmptyStateView(): FrameLayout = binding.flEmpty
+    override fun getCountTextView(): TextView = binding.tvCount
+
+    override val titleResId = R.string.e_pmsma_list
+    override val listDisplayName = "e-PMSMA List"
+    override val logMessage = "Displaying e-PMSMA women"
+
+    override fun extractPatient(item: PmsmaDomain): Patient = item.patient
+
+    override fun submitListToAdapter(list: List<PmsmaDomain>) {
+        adapter.submitList(list)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    requireActivity().supportFragmentManager.popBackStack()
+                }
+            }
+        )
+    }
+
+    override fun setupRecyclerView() {
+        adapter = PmsmaListAdapter(
+            PmsmaListAdapter.ClickListener(
+                clickedAdd = { item -> onAddVisit(item) },
+                clickedView = { item ->
+                    AncBottomSheetFragment.newInstance(item.patient.patientID)
+                        .show(childFragmentManager, "ANC_VISITS")
+                }
+            )
+        )
+        binding.rvEPmsma.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvEPmsma.adapter = adapter
+    }
+
+    override fun observePatients() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            maternalHealthRepo.getEPmsmaWomenList().collectLatest { list ->
+                allPatients = list.sortedByDescending { it.pwr?.dateOfRegistration ?: 0L }
+                onPatientsLoaded()
+            }
+        }
+    }
+
+    /**
+     * Mirrors ANCVisitsFragment.clickedAddANC — same eligibility rules and same
+     * EditPatientDetailsActivity navigation, just driven from the e-PMSMA row.
+     */
+    private fun onAddVisit(item: PmsmaDomain) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            val patientID = item.patient.patientID
+            val allAncRecords = maternalHealthRepo.getAllActiveAncRecords(patientID)
+            val maxCompletedVisit = allAncRecords
+                .filter { it.weight != null }
+                .maxOfOrNull { it.visitNumber } ?: 0
+            val nextVisitNumber = maxCompletedVisit + 1
+            // Source-of-truth for the e-PMSMA list is ANC anyHighRisk (see
+            // MaternalHealthDao.getHighRiskAncPatientIDs), so gate add-visit on
+            // the same flag — pwr.isHrp can be unset/stale.
+            val isHRP = allAncRecords.any { it.anyHighRisk == true }
+
+            if (maxCompletedVisit < 4 || isHRP) {
+                val intent = Intent(
+                    requireContext(),
+                    EditPatientDetailsActivity::class.java
+                ).apply {
+                    putExtra("navigateTo", "ANC")
+                    putExtra("patientID", patientID)
+                    putExtra("visitNumber", nextVisitNumber)
+                    putExtra("isOldVisit", false)
+                }
+                startActivity(intent)
+            } else {
+                Toast.makeText(
+                    requireContext(),
+                    getString(R.string.all_4_anc_visits_completed),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/MaternalHealthNavHostFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/MaternalHealthNavHostFragment.kt
new file mode 100644
index 000000000..9c4809455
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/MaternalHealthNavHostFragment.kt
@@ -0,0 +1,52 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.NavHostFragment
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentMaternalHealthNavHostBinding
+
+/**
+ * Container Fragment that hosts the Navigation Component for Maternal Health module
+ * Uses nav_maternal_health.xml navigation graph
+ */
+class MaternalHealthNavHostFragment : Fragment() {
+
+    private var _binding: FragmentMaternalHealthNavHostBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentMaternalHealthNavHostBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val navHostFragment = childFragmentManager.findFragmentById(R.id.nav_host_fragment_maternal_health) as NavHostFragment
+        val navController = navHostFragment.navController
+        timber.log.Timber.d("MaternalHealthNavHostFragment onViewCreated. Arguments: $arguments")
+
+        arguments?.let { args ->
+            val destinationId = args.getInt("destinationId", 0)
+            val fromECT = args.getBoolean("fromECT", false)
+            timber.log.Timber.d("MaternalHealthNavHostFragment destinationId: $destinationId, fromECT: $fromECT")
+            if (destinationId != 0) {
+                val navGraph = navController.navInflater.inflate(R.navigation.nav_maternal_health)
+                navGraph.setStartDestination(destinationId)
+                navController.setGraph(navGraph, args)
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/NeonatalOutcomeFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/NeonatalOutcomeFragment.kt
new file mode 100644
index 000000000..f0a57a308
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/NeonatalOutcomeFragment.kt
@@ -0,0 +1,157 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.commit
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.InfantRegistrationAdapter
+import org.piramalswasthya.cho.databinding.FragmentNeonatalOutcomeListBinding
+import org.piramalswasthya.cho.model.InfantRegDomain
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import org.piramalswasthya.cho.utils.filterPatientsByQuery
+import org.piramalswasthya.cho.utils.setupSearchTextWatcher
+import org.piramalswasthya.cho.utils.updateListUI
+import org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form.NeonatalOutcomeFormFragment
+import org.piramalswasthya.cho.repositories.NeonatalOutcomeRepo
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of women eligible for Neonatal Outcomes
+ * Shows women who have a saved Delivery Outcome record
+ */
+@AndroidEntryPoint
+class NeonatalOutcomeFragment : Fragment() {
+
+    @Inject
+    lateinit var infantRegRepo: InfantRegRepo
+    
+    @Inject
+    lateinit var deliveryOutcomeRepo: DeliveryOutcomeRepo
+
+    private var _binding: FragmentNeonatalOutcomeListBinding? = null
+    private val binding: FragmentNeonatalOutcomeListBinding
+        get() = _binding!!
+
+    private lateinit var adapter: InfantRegistrationAdapter
+    private var allInfants: List<InfantRegDomain> = emptyList()
+    private var filteredInfants: List<InfantRegDomain> = emptyList()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentNeonatalOutcomeListBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        
+        // Handle back button press
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    requireActivity().supportFragmentManager.popBackStack()
+                }
+            }
+        )
+
+        setupRecyclerView()
+        setupSearch()
+        observePatients()
+    }
+
+    private fun setupRecyclerView() {
+        adapter = InfantRegistrationAdapter(
+            InfantRegistrationAdapter.ClickListener { motherPatientID: String, babyIndex: Int ->
+                lifecycleScope.launch {
+                    val deliveryOutcome = deliveryOutcomeRepo.getDeliveryOutcome(motherPatientID)
+                    if (deliveryOutcome != null) {
+                        // Navigate to NeonatalOutcomeFormFragment using fragment transaction
+                        val fragment = NeonatalOutcomeFormFragment().apply {
+                            arguments = Bundle().apply {
+                                putLong("deliveryOutcomeId", deliveryOutcome.id)
+                                putString("patientID", motherPatientID)
+                                putInt("babyIndex", babyIndex)
+                            }
+                        }
+                        requireActivity().supportFragmentManager.commit {
+                            replace(R.id.fragment_container, fragment)
+                            addToBackStack(null)
+                        }
+                    } else {
+                        android.widget.Toast.makeText(context,
+                            context?.getString(R.string.delivery_record_not_found), android.widget.Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+        )
+
+        binding.rvNeonatalOutcome.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvNeonatalOutcome.adapter = adapter
+    }
+
+    private fun setupSearch() {
+        binding.searchView.setupSearchTextWatcher { query ->
+            filterPatients(query)
+        }
+    }
+
+    private fun observePatients() {
+        lifecycleScope.launch {
+            infantRegRepo.getListForInfantReg().collectLatest { infantsList: List<InfantRegDomain> ->
+                allInfants = infantsList.sortedByDescending { it.deliveryOutcome.dateOfDelivery ?: 0L }
+                filteredInfants = allInfants
+                updateUI()
+            }
+        }
+    }
+
+    private fun filterPatients(query: String) {
+        filteredInfants = if (query.isBlank()) {
+            allInfants
+        } else {
+            allInfants.filter { infant ->
+                val motherName = infant.getMotherFullName().lowercase()
+                motherName.contains(query.lowercase())
+            }
+        }
+        updateUI()
+    }
+
+    private fun updateUI() {
+        adapter.submitList(filteredInfants)
+        updateListUI(
+            filteredList = filteredInfants,
+            emptyStateView = binding.flEmpty,
+            recyclerView = binding.rvNeonatalOutcome,
+            countTextView = binding.tvCount,
+            resultString = getString(R.string.result),
+            logMessage = "Displaying infants for neonatal outcome"
+        )
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? androidx.appcompat.app.AppCompatActivity)?.supportActionBar?.title =
+            getString(R.string.neonatal_outcome)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PNCMotherListFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PNCMotherListFragment.kt
new file mode 100644
index 000000000..e2c760d37
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PNCMotherListFragment.kt
@@ -0,0 +1,108 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.PNCMotherAdapter
+import org.piramalswasthya.cho.databinding.FragmentPncMotherListBinding
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithPncDomain
+import org.piramalswasthya.cho.repositories.PncRepo
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of PNC Mothers.
+ * Shows women who have delivered and are eligible for PNC visits (within 42 days or not completed all visits).
+ */
+@AndroidEntryPoint
+class PNCMotherListFragment : BaseMaternalHealthListFragment<FragmentPncMotherListBinding, PatientWithPncDomain>() {
+
+    @Inject
+    lateinit var pncRepo: PncRepo
+
+    private lateinit var adapter: PNCMotherAdapter
+
+    // ── Base class contract ──
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentPncMotherListBinding.inflate(inflater, container, false)
+
+    override fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding = binding.searchBarInclude
+    override fun getRecyclerView(): RecyclerView = binding.rvPncMothers
+    override fun getEmptyStateView(): FrameLayout = binding.flEmpty
+    override fun getCountTextView(): TextView = binding.tvCount
+
+    override val titleResId = R.string.pnc_mother_list
+    override val listDisplayName = "PNC Mother list"
+    override val logMessage = "Displaying PNC mothers"
+
+    override fun extractPatient(item: PatientWithPncDomain): Patient = item.patient
+
+    override fun submitListToAdapter(list: List<PatientWithPncDomain>) {
+        adapter.submitList(list)
+    }
+
+    override fun setupRecyclerView() {
+        adapter = PNCMotherAdapter(
+            clickListener = PNCMotherAdapter.ClickListener(
+                onAddVisit = { patientWithPnc -> navigateToAddPncVisit(patientWithPnc) },
+                onViewVisits = { patientWithPnc -> showPncVisitsBottomSheet(patientWithPnc) }
+            ),
+            pncRepo = pncRepo
+        )
+        binding.rvPncMothers.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvPncMothers.adapter = adapter
+    }
+
+    override fun observePatients() {
+        lifecycleScope.launch {
+            pncRepo.getAllPNCMothers().collectLatest { patientsList ->
+                allPatients = patientsList
+                    .map { it.asDomainModel() }
+                    .sortedByDescending { it.deliveryOutcome?.dateOfDelivery ?: it.patient.registrationDate?.time ?: 0L }
+                onPatientsLoaded()
+            }
+        }
+    }
+
+    // ── Fragment-specific logic ──
+
+    private fun navigateToAddPncVisit(patientWithPnc: PatientWithPncDomain) {
+        lifecycleScope.launch {
+            val lastVisitNumber = pncRepo.getLastVisitNumber(patientWithPnc.patient.patientID) ?: 0
+            val availableVisits = listOf(1, 3, 7, 14, 21, 28, 42).filter { it > lastVisitNumber }
+
+            if (availableVisits.isEmpty()) {
+                Toast.makeText(requireContext(), getString(R.string.all_pnc_visits_completed), Toast.LENGTH_SHORT).show()
+                return@launch
+            }
+
+            val nextVisitNumber = availableVisits.first()
+
+            val intent = android.content.Intent(
+                requireContext(),
+                org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity::class.java
+            ).apply {
+                putExtra("navigateTo", "PNC")
+                putExtra("patientID", patientWithPnc.patient.patientID)
+                putExtra("visitNumber", nextVisitNumber)
+            }
+            startActivity(intent)
+        }
+    }
+
+    private fun showPncVisitsBottomSheet(patientWithPnc: PatientWithPncDomain) {
+        val bottomSheet = PncBottomSheetFragment.newInstance(patientWithPnc.patient.patientID)
+        bottomSheet.show(childFragmentManager, "PncVisitsBottomSheet")
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PncBottomSheetFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PncBottomSheetFragment.kt
new file mode 100644
index 000000000..6dde3c436
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PncBottomSheetFragment.kt
@@ -0,0 +1,97 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.adapter.PncVisitAdapter
+import org.piramalswasthya.cho.databinding.BottomSheetPncVisitsBinding
+import org.piramalswasthya.cho.repositories.PncRepo
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class PncBottomSheetFragment : BottomSheetDialogFragment() {
+
+    private var _binding: BottomSheetPncVisitsBinding? = null
+    private val binding: BottomSheetPncVisitsBinding
+        get() = _binding!!
+
+    @Inject
+    lateinit var pncRepo: PncRepo
+
+    private var patientID: String? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = BottomSheetPncVisitsBinding.inflate(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        patientID = arguments?.getString("patientID")
+
+        val adapter = PncVisitAdapter(
+            PncVisitAdapter.PncVisitClickListener { patientId, visitNumber ->
+                // Navigate to the specific PNC visit form
+                val intent = Intent(
+                    requireContext(),
+                    org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity::class.java
+                ).apply {
+                    putExtra("navigateTo", "PNC")
+                    putExtra("patientID", patientId)
+                    putExtra("visitNumber", visitNumber)
+                }
+                startActivity(intent)
+                dismiss()
+            }
+        )
+
+        binding.rvPncVisits.adapter = adapter
+        binding.rvPncVisits.layoutManager = LinearLayoutManager(requireContext())
+        
+        // Add divider
+        val divider = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)
+        binding.rvPncVisits.addItemDecoration(divider)
+
+        // Load PNC visits
+        loadPncVisits(adapter)
+    }
+
+    private fun loadPncVisits(adapter: PncVisitAdapter) {
+        lifecycleScope.launch {
+            patientID?.let { id ->
+                val pncVisits = pncRepo.getAllPNCsByPatId(id)
+                    .sortedBy { it.pncPeriod }
+                
+                adapter.submitList(pncVisits)
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        fun newInstance(patientID: String): PncBottomSheetFragment {
+            return PncBottomSheetFragment().apply {
+                arguments = Bundle().apply {
+                    putString("patientID", patientID)
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PregnantWomenRegistrationFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PregnantWomenRegistrationFragment.kt
new file mode 100644
index 000000000..fb5401939
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home/rmncha/maternal_health/PregnantWomenRegistrationFragment.kt
@@ -0,0 +1,101 @@
+package org.piramalswasthya.cho.ui.home.rmncha.maternal_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.adapter.PregnantWomenAdapter
+import org.piramalswasthya.cho.databinding.FragmentPregnantWomenRegistrationBinding
+import org.piramalswasthya.cho.databinding.IncludeSearchBarWithCameraBinding
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.model.PatientWithPwrDomain
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+import javax.inject.Inject
+
+/**
+ * Fragment to display list of Pregnant Women Registration.
+ * Shows women of reproductive age (15-49) with their pregnancy registration status.
+ */
+@AndroidEntryPoint
+class PregnantWomenRegistrationFragment : BaseMaternalHealthListFragment<FragmentPregnantWomenRegistrationBinding, PatientWithPwrDomain>() {
+
+    @Inject
+    lateinit var maternalHealthRepo: MaternalHealthRepo
+
+    private lateinit var adapter: PregnantWomenAdapter
+
+    // ── Base class contract ──
+
+    override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?) =
+        FragmentPregnantWomenRegistrationBinding.inflate(inflater, container, false)
+
+    override fun getSearchBarBinding(): IncludeSearchBarWithCameraBinding = binding.searchBarInclude
+    override fun getRecyclerView(): RecyclerView = binding.rvPregnantWomen
+    override fun getEmptyStateView(): FrameLayout = binding.flEmpty
+    override fun getCountTextView(): TextView = binding.tvCount
+
+    override val titleResId = R.string.pregnant_women_registration
+    override val listDisplayName = "Pregnant Women list"
+    override val logMessage = "Displaying pregnant women"
+
+    override fun extractPatient(item: PatientWithPwrDomain): Patient = item.patient
+
+    override fun submitListToAdapter(list: List<PatientWithPwrDomain>) {
+        adapter.submitList(list)
+    }
+
+    override fun setupRecyclerView() {
+        adapter = PregnantWomenAdapter(
+            PregnantWomenAdapter.ClickListener { patientWithPwr ->
+                try {
+                    val bundle = Bundle().apply {
+                        putString("patientID", patientWithPwr.patient.patientID)
+                    }
+                    androidx.navigation.fragment.NavHostFragment.findNavController(this)
+                        .navigate(
+                            R.id.action_pregnantWomanRegistrationFragment_to_pregnancyRegistrationFormFragment,
+                            bundle
+                        )
+                } catch (e: Exception) {
+                    Toast.makeText(
+                        requireContext(),
+                        "Navigation failed: ${e.message}",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    timber.log.Timber.e(e, "Failed to navigate to pregnancy registration form")
+                }
+            }
+        )
+
+        binding.rvPregnantWomen.layoutManager = LinearLayoutManager(requireContext())
+        binding.rvPregnantWomen.adapter = adapter
+    }
+
+    override fun observePatients() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            maternalHealthRepo.getAllPatientsWithPWR().collectLatest { patientsList ->
+                // Filter for women of reproductive age
+                allPatients = patientsList
+                    .map { it.asDomainModel() }
+                    .filter { patient ->
+                        val isFemale = patient.patient.genderID == 2
+                        val age = patient.patient.age ?: 0
+                        val isReproductiveAge = age in 15..49
+                        val isPostnatal = patient.patient.statusOfWomanID == 3
+                        isFemale && isReproductiveAge && !isPostnatal
+                    }
+                    .sortedByDescending { it.patient.registrationDate }
+                onPatientsLoaded()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/DashboardFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/DashboardFragment.kt
index 76c7d3567..05fb2c0ae 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/DashboardFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/DashboardFragment.kt
@@ -2,14 +2,17 @@ package org.piramalswasthya.cho.ui.home_activity
 
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.piramalswasthya.cho.R
@@ -25,103 +28,104 @@ import javax.inject.Inject
 class DashboardFragment : Fragment() {
 
     private var _binding: FragmentDashboardBinding? = null
-
     @Inject
     lateinit var benFlowDao: BenFlowDao
-
     @Inject
     lateinit var userRepo: UserRepo
-    private var maleOpdCount: Int? = 0
-    private var femaleOpdCount: Int? = 0
-    private var othersOpdCount: Int? = 0
-    private var totalOpdCount: Int? = 0
-
-    private var ancCount: Int? = 0
-    private var pncCount: Int? = 0
-    private var immunizationCount: Int? = 0
-    private var ectCount: Int? = 0
+    private var maleOpdCount : Int? = 0
+    private var femaleOpdCount : Int? = 0
+    private var othersOpdCount : Int? = 0
+    private var totalOpdCount : Int? = 0
+
+    private var ancCount : Int? = 0
+    private var pncCount : Int? = 0
+    private var maleNcdCount : Int? = 0
+    private var femaleNcdCount : Int? = 0
+    private var othersNcdCount : Int? = 0
+    private var ncdCount : Int? = 0
+    private var immunizationCount : Int? = 0
+    private var ectCount : Int? = 0
 
     private val binding: FragmentDashboardBinding
         get() = _binding!!
     lateinit var viewModel: DashboardViewModel
 
-    val months = listOf(
-        "Today",
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December"
-    )
-    private var selectedPeriod: String = "Today"
-    private var periodParam: String? = null
+    private val months: List<String>
+        get() = listOf(
+            getString(R.string.today),
+            getString(R.string.month_january),
+            getString(R.string.month_february),
+            getString(R.string.month_march),
+            getString(R.string.month_april),
+            getString(R.string.month_may),
+            getString(R.string.month_june),
+            getString(R.string.month_july),
+            getString(R.string.month_august),
+            getString(R.string.month_september),
+            getString(R.string.month_october),
+            getString(R.string.month_november),
+            getString(R.string.month_december)
+        )
+    private var selectedPeriod: String = ""
+    private var periodParam : String? = null
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         _binding = FragmentDashboardBinding.inflate(inflater, container, false)
 
-        val arrayAdapter = ArrayAdapter(requireContext(), R.layout.drop_down, months)
+        selectedPeriod = getString(R.string.today)
+        val monthsList = months
+        val arrayAdapter = ArrayAdapter(requireContext(), R.layout.drop_down, monthsList)
 
         _binding!!.selectPeriod.setAdapter(arrayAdapter)
-        _binding!!.selectPeriod.setText(arrayAdapter.getItem(0), false);
+        _binding!!.selectPeriod.setText(arrayAdapter.getItem(0), false)
         periodParam = SimpleDateFormat("yyyy-MM-dd").format(Date())
         lifecycleScope.launch {
             fetchAndDisplayCount()
         }
         return binding.root
     }
-
-    private suspend fun fetchAndDisplayCount() {
+    private suspend fun fetchAndDisplayCount(){
         val user = userRepo.getLoggedInUser()
-        if (user?.userName == null) {
+        if(user?.userName == null){
             return
         }
-
-        maleOpdCount = benFlowDao.getOpdCount(1, periodParam!!, user.userName) ?: 0
-        femaleOpdCount = benFlowDao.getOpdCount(2, periodParam!!, user.userName) ?: 0
-        othersOpdCount = benFlowDao.getOpdCount(3, periodParam!!, user.userName) ?: 0
+        maleOpdCount = benFlowDao.getDoctorModuleOpdCount("male", periodParam!!) ?: 0
+        femaleOpdCount = benFlowDao.getDoctorModuleOpdCount("female", periodParam!!) ?: 0
+        othersOpdCount = benFlowDao.getDoctorModuleOpdCount("other", periodParam!!) ?: 0
         totalOpdCount = maleOpdCount!! + femaleOpdCount!! + othersOpdCount!!
 
-        if (maleOpdCount!! > 0) binding.opdMaleValue.text =
-            maleOpdCount.toString()
-        if (maleOpdCount!! > 0) binding.opdFemaleValue.text =
-            femaleOpdCount.toString()
-        if (othersOpdCount!! > 0) binding.opdOtherValue.text =
-            othersOpdCount.toString()
-        if (totalOpdCount!! > 0) binding.opdTotalValue.text =
-            totalOpdCount.toString()
-
-
-        //Custom Design for Opd
-        if (maleOpdCount!! > 0) binding.tvMaleCount.text =
-            maleOpdCount.toString()
-        if (maleOpdCount!! > 0) binding.tvFemaleCount.text =
-            femaleOpdCount.toString()
-        if (othersOpdCount!! > 0) binding.tvOtherCount.text =
-            othersOpdCount.toString()
-        if (totalOpdCount!! > 0) binding.tvOpdCount.text =
-            totalOpdCount.toString()
+        binding.opdMaleValue.text = maleOpdCount.toString()
+        binding.opdFemaleValue.text = femaleOpdCount.toString()
+        binding.opdOtherValue.text = othersOpdCount.toString()
+        binding.opdTotalValue.text = totalOpdCount.toString()
 
         ancCount = benFlowDao.getAncCount(periodParam!!, user.userName) ?: 0
         pncCount = benFlowDao.getPncCount(periodParam!!, user.userName) ?: 0
+        maleNcdCount = benFlowDao.getNcdCountByGender("male", periodParam!!, user.userName) ?: 0
+        femaleNcdCount = benFlowDao.getNcdCountByGender("female", periodParam!!, user.userName) ?: 0
+        othersNcdCount = benFlowDao.getNcdCountByGender("other", periodParam!!, user.userName) ?: 0
+        if ((maleNcdCount!! + femaleNcdCount!! + othersNcdCount!!) == 0) {
+            maleNcdCount = benFlowDao.getNcdCountAllTimeByGender("male", user.userName) ?: 0
+            femaleNcdCount = benFlowDao.getNcdCountAllTimeByGender("female", user.userName) ?: 0
+            othersNcdCount = benFlowDao.getNcdCountAllTimeByGender("other", user.userName) ?: 0
+        }
+        ncdCount = maleNcdCount!! + femaleNcdCount!! + othersNcdCount!!
+
         immunizationCount = benFlowDao.getImmunizationCount(periodParam!!, user.userName) ?: 0
         ectCount = benFlowDao.getEctCount(periodParam!!, user.userName) ?: 0
 
-        if (ancCount!! > 0) binding.tvAncValue.text = ancCount.toString()
-        if (pncCount!! > 0) binding.tvPncValue.text = pncCount.toString()
-        if (immunizationCount!! > 0) binding.tvImmValue.text = immunizationCount.toString()
-        if (ectCount!! > 0) binding.tvFamValue.text = ectCount.toString()
+        binding.tvAncValue.text = ancCount.toString()
+        binding.tvPncValue.text = pncCount.toString()
+        binding.tvImmValue.text = immunizationCount.toString()
+        binding.tvFamValue.text = ectCount.toString()
+        binding.ncdMaleValue.text = maleNcdCount.toString()
+        binding.ncdFemaleValue.text = femaleNcdCount.toString()
+        binding.ncdOtherValue.text = othersNcdCount.toString()
+        binding.ncdTotalValue.text = ncdCount.toString()
 
     }
-
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -145,5 +149,20 @@ class DashboardFragment : Fragment() {
             }
 
         }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                benFlowDao.observeDoctorModuleListCount().collect {
+                    fetchAndDisplayCount()
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        lifecycleScope.launch {
+            fetchAndDisplayCount()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivity.kt
index 6c53ba0d2..b68fc20d8 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivity.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivity.kt
@@ -16,6 +16,7 @@ import android.provider.Settings
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.MenuItem
+import android.view.View
 import android.widget.RadioGroup
 import android.widget.TextView
 import android.widget.Toast
@@ -102,10 +103,10 @@ class HomeActivity : AppCompatActivity() {
         ).preferenceDao
         super.attachBaseContext(
             MyContextWrapper.wrap(
-            newBase,
-            newBase.applicationContext,
-            pref.getCurrentLanguage().symbol
-        ))
+                newBase,
+                newBase.applicationContext,
+                pref.getCurrentLanguage().symbol
+            ))
     }
 
     private lateinit var drawerLayout: DrawerLayout
@@ -144,7 +145,7 @@ class HomeActivity : AppCompatActivity() {
 
     var handler: Handler = Handler()
     var runnable: Runnable? = null
-    var delay = 30000
+    var delay = 15 * 60 * 1000
 
     private val REQUEST_CODE_PERMISSION = 123
 
@@ -169,7 +170,7 @@ class HomeActivity : AppCompatActivity() {
             Log.v("resuming activitiy", "resume")
             if( !amritSyncInProgress && !downloadSyncInProgress ){
 //                downloadSyncInProgress = true
-                viewModel.triggerDownSyncWorker(this, WorkerUtils.syncPeriodicDownSyncWorker)
+                WorkerUtils.enqueuePeriodicDownsync(this)
             }
         }.also { runnable = it }, delay.toLong())
         super.onResume()
@@ -304,17 +305,20 @@ class HomeActivity : AppCompatActivity() {
 
         val dashboardBool = intent.extras?.getBoolean("dashboardBool", false)
         // Initializing the ViewPagerAdapter
-            homeAdapter = ViewPagerAdapter(supportFragmentManager, lifecycle)
-            tab.addTab(tab.newTab().setText("Home")) // Add "Dashboard" tab second
-            tab.addTab(tab.newTab().setText("Dashboard"))      // Add "Home" tab first
+        homeAdapter = ViewPagerAdapter(supportFragmentManager, lifecycle)
+        tab.addTab(tab.newTab().setText(getString(R.string.menu_home)))
+        tab.addTab(tab.newTab().setText(getString(R.string.tab_dashboard)))
+        tab.addTab(tab.newTab().setText(getString(R.string.tab_rmnch)))
 
-// Adding the Adapter to the ViewPager
+        // Adding the Adapter to the ViewPager
         pager.adapter = homeAdapter
         if(!showDashboard && (dashboardBool == null || !dashboardBool)) {
             pager.post {
                 pager.setCurrentItem(0, false)
+                updateRefreshButtonVisibility()
             }
         }
+        updateRefreshButtonVisibility()
 
         // Adding the Adapter to the ViewPager
         pager.adapter = homeAdapter
@@ -322,6 +326,7 @@ class HomeActivity : AppCompatActivity() {
             override fun onTabSelected(tab: TabLayout.Tab?) {
                 if (tab != null) {
                     pager.currentItem = tab.position
+                    updateRefreshButtonVisibility()
                 }
             }
 
@@ -338,6 +343,7 @@ class HomeActivity : AppCompatActivity() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
                 tab.selectTab(tab.getTabAt(position))
+                updateRefreshButtonVisibility()
             }
         })
 
@@ -401,6 +407,24 @@ class HomeActivity : AppCompatActivity() {
 
         setObservers()
 
+        supportFragmentManager.addOnBackStackChangedListener {
+            if (supportFragmentManager.backStackEntryCount > 0) {
+                binding.fragmentContainer.visibility = android.view.View.VISIBLE
+                binding.viewPager.visibility = android.view.View.GONE
+                binding.tabsId.visibility = android.view.View.GONE
+            } else {
+                binding.fragmentContainer.visibility = android.view.View.GONE
+                binding.viewPager.visibility = android.view.View.VISIBLE
+                binding.tabsId.visibility = android.view.View.VISIBLE
+            }
+            updateRefreshButtonVisibility()
+        }
+    }
+
+    private fun updateRefreshButtonVisibility() {
+        val isChoTabSelected = prefDao.isNurseSelected() || prefDao.isUserCHO()
+        val isHomeFirstTab = binding.viewPager.visibility == View.VISIBLE && binding.viewPager.currentItem == 0
+        binding.refreshButton.visibility = if (isChoTabSelected && isHomeFirstTab) View.VISIBLE else View.GONE
     }
 
     private fun setObservers() {
@@ -419,8 +443,8 @@ class HomeActivity : AppCompatActivity() {
             AdvertisingOptions.Builder().setStrategy(Strategy.P2P_STAR).build()
         connectionsClient.startAdvertising(
             buildString { append(userRole)
-            append("-")
-            append(userName)},
+                append("-")
+                append(userName)},
             Constants.serviceId,
             connectionLifecycleCallback,
             advertisingOptions
@@ -545,40 +569,44 @@ class HomeActivity : AppCompatActivity() {
 
                 dialog.dismiss()
             }.create()
-        }
-private fun triggerAlarmManager(){
-    val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
-    val alarmIntent = Intent(this, AutoLogoutReceiver::class.java)
-    alarmIntent.putExtra("alarmMgrLatitude", myLocation?.latitude)
-    alarmIntent.putExtra("alarmMgrLongitude", myLocation?.longitude)
-    alarmIntent.action = "com.yourapp.ACTION_AUTO_LOGOUT"
-    val pendingIntent = PendingIntent.getBroadcast(this, 0, alarmIntent, PendingIntent.FLAG_IMMUTABLE)
-
-    // Set the alarm to trigger at 5 PM
-    val calendar = Calendar.getInstance()
-    calendar.set(Calendar.HOUR_OF_DAY, 17) // 5 PM
-    calendar.set(Calendar.MINUTE, 0)
-    calendar.set(Calendar.SECOND, 0)
-
-    // Schedule the alarm to repeat daily
-    alarmManager.setRepeating(
-        AlarmManager.RTC,
-        calendar.timeInMillis,
-        AlarmManager.INTERVAL_DAY,
-        pendingIntent
-    )
-}
+    }
+    private fun triggerAlarmManager(){
+        val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        val alarmIntent = Intent(this, AutoLogoutReceiver::class.java)
+        alarmIntent.putExtra("alarmMgrLatitude", myLocation?.latitude)
+        alarmIntent.putExtra("alarmMgrLongitude", myLocation?.longitude)
+        alarmIntent.action = "com.yourapp.ACTION_AUTO_LOGOUT"
+        val pendingIntent = PendingIntent.getBroadcast(this, 0, alarmIntent, PendingIntent.FLAG_IMMUTABLE)
+
+        // Set the alarm to trigger at 5 PM
+        val calendar = Calendar.getInstance()
+        calendar.set(Calendar.HOUR_OF_DAY, 17) // 5 PM
+        calendar.set(Calendar.MINUTE, 0)
+        calendar.set(Calendar.SECOND, 0)
+
+        // Schedule the alarm to repeat daily
+        alarmManager.setRepeating(
+            AlarmManager.RTC,
+            calendar.timeInMillis,
+            AlarmManager.INTERVAL_DAY,
+            pendingIntent
+        )
+    }
     override fun onBackPressed() {
-//        super.onBackPressed()
-        if (!exitAlert.isShowing)
-            exitAlert.show()
+        if (supportFragmentManager.backStackEntryCount > 0) {
+            supportFragmentManager.popBackStack()
+        } else {
+            if (!exitAlert.isShowing)
+                exitAlert.show()
+        }
     }
+
     private val exitAlert by lazy {
         MaterialAlertDialogBuilder(this)
             .setTitle(resources.getString(R.string.exit_application))
             .setMessage(resources.getString(R.string.do_you_want_to_exit_application))
             .setPositiveButton(resources.getString(R.string.yes)) { _, _ ->
-                this.finish()
+                this.finishAffinity()
             }
             .setNegativeButton(resources.getString(R.string.no)) { d, _ ->
                 d.dismiss()
@@ -590,36 +618,40 @@ private fun triggerAlarmManager(){
         val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_radio_btns, null)
         val dialog = MaterialAlertDialogBuilder(this)
             .setView(dialogView)
-            .setTitle("Choose Application Language")
+            .setTitle(getString(R.string.choose_application_language))
 
-            .setPositiveButton("Apply") { dialog, which ->
+            .setPositiveButton(getString(R.string.applytxt)) { dialog, which ->
                 prefDao.saveSetLanguage(currentLanguage)
                 Locale.setDefault(Locale(currentLanguage.symbol))
 
-                val refresh = Intent(this, HomeActivity::class.java)
-                finish()
-                startActivity(refresh)
-                this?.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
+                recreate()
 
                 dialog.dismiss()
             }
-            .setNegativeButton("Cancel") { dialog, _ ->
+            .setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
                 dialog.dismiss()
             }
         val radioGroup = dialogView.findViewById<RadioGroup>(R.id.rg_lang_select_dialog)
         val englishRadioButton = dialogView.findViewById<MaterialRadioButton>(R.id.rb_eng_dialog)
         val kannadaRadioButton = dialogView.findViewById<MaterialRadioButton>(R.id.rb_kannada_dialog)
-        if (radioGroup != null && englishRadioButton != null && kannadaRadioButton != null) {
+        val hindiRadioButton = dialogView.findViewById<MaterialRadioButton>(R.id.rb_hindi_dialog)
+        val assamRadioButton = dialogView.findViewById<MaterialRadioButton>(R.id.rb_assam_dialog)
+        if (radioGroup != null && englishRadioButton != null && kannadaRadioButton != null
+            && hindiRadioButton != null && assamRadioButton != null) {
 
             when (prefDao.getCurrentLanguage()) {
                 Languages.ENGLISH -> radioGroup.check(englishRadioButton.id)
                 Languages.KANNADA -> radioGroup.check(kannadaRadioButton.id)
+                Languages.ASSAMESE -> radioGroup.check(assamRadioButton.id)
+                Languages.HINDI -> radioGroup.check(hindiRadioButton.id)
             }
 
             radioGroup.setOnCheckedChangeListener { _, i ->
                 currentLanguage = when (i) {
                     englishRadioButton.id -> Languages.ENGLISH
                     kannadaRadioButton.id -> Languages.KANNADA
+                    hindiRadioButton.id -> Languages.HINDI
+                    assamRadioButton.id -> Languages.ASSAMESE
                     else -> Languages.ENGLISH
                 }
             }
@@ -639,12 +671,19 @@ private fun triggerAlarmManager(){
         CoroutineScope(Dispatchers.IO).launch {
             val user = userRepo.getLoggedInUser()
             val headerView = binding.navView.getHeaderView(0)
-                headerView.findViewById<TextView>(R.id.tv_nav_name).text =
-                    getString(R.string.nav_item_1_text, user?.name)
-                headerView.findViewById<TextView>(R.id.tv_nav_role).text =
-                    getString(R.string.nav_item_2_text, user?.userName)
-                headerView.findViewById<TextView>(R.id.tv_nav_id).text =
-                    getString(R.string.nav_item_3_text, user?.userId)
+            headerView.findViewById<TextView>(R.id.tv_nav_name).text = getString(R.string.nav_item_1_text, user?.name)
+            headerView.findViewById<TextView>(R.id.tv_nav_facilityName).text = getString(R.string.nav_item_5_text, user?.facilityName)
+            headerView.findViewById<TextView>(R.id.tv_nav_id).text = getString(R.string.nav_item_3_text, user?.userId)
+            headerView.findViewById<TextView>(R.id.tv_nav_employeeId).text = getString(R.string.nav_item_6_text, user?.employeeId)
+            headerView.findViewById<TextView>(R.id.tv_nav_facilityId).text = getString(
+                R.string.nav_item_7_text,
+                user?.facilityID?.toString() ?: getString(R.string.not_available)
+            )
+            headerView.findViewById<TextView>(R.id.tv_nav_location_type).text = getString(R.string.nav_item_8_text, user?.locationType)
+//            headerView.findViewById<TextView>(R.id.tv_nav_role).text = getString(R.string.nav_item_2_text, user?.userName)
+            headerView.findViewById<TextView>(R.id.tv_nav_contact_no).text = getString(R.string.nav_item_4_text, user?.contactNo)
+            headerView.findViewById<TextView>(R.id.tv_nav_contact_no).visibility =
+                if (user?.contactNo.isNullOrEmpty()) View.GONE else View.VISIBLE
             userName = user?.name.toString()
             userRole = user?.roles.toString()
         }
@@ -720,27 +759,35 @@ private fun triggerAlarmManager(){
         }
     }
 
-private fun calculateDelayMillis(currentHour: Int, currentMinute: Int, desiredHour: Int, desiredMinute: Int): Long {
-    val calendar = Calendar.getInstance()
-    calendar.set(Calendar.HOUR_OF_DAY, desiredHour)
-    calendar.set(Calendar.MINUTE, desiredMinute)
-    calendar.set(Calendar.SECOND, 0)
-    calendar.set(Calendar.MILLISECOND, 0)
+    private fun calculateDelayMillis(currentHour: Int, currentMinute: Int, desiredHour: Int, desiredMinute: Int): Long {
+        val calendar = Calendar.getInstance()
+        calendar.set(Calendar.HOUR_OF_DAY, desiredHour)
+        calendar.set(Calendar.MINUTE, desiredMinute)
+        calendar.set(Calendar.SECOND, 0)
+        calendar.set(Calendar.MILLISECOND, 0)
 
-    val desiredTimeMillis = calendar.timeInMillis
-    val currentTimeMillis = Calendar.getInstance().timeInMillis
+        val desiredTimeMillis = calendar.timeInMillis
+        val currentTimeMillis = Calendar.getInstance().timeInMillis
 
-    if (currentTimeMillis > desiredTimeMillis) {
-        // The desired time is already in the past, schedule it for the next day
-        calendar.add(Calendar.DAY_OF_YEAR, 1)
-    }
+        if (currentTimeMillis > desiredTimeMillis) {
+            // The desired time is already in the past, schedule it for the next day
+            calendar.add(Calendar.DAY_OF_YEAR, 1)
+        }
 
-    // Calculate the delay in milliseconds
-    return calendar.timeInMillis - currentTimeMillis
-}
+        // Calculate the delay in milliseconds
+        return calendar.timeInMillis - currentTimeMillis
+    }
 
-private fun myMethodToRunAtSpecificTime() {
-    // Your method code here
+    private fun myMethodToRunAtSpecificTime() {
+        // Your method code here
 //    viewModel.logout(myLocation,"By System")
+    }
+
+    /**
+     * Switch to the Home tab (index 0) from RMNCHA dashboard
+     * Used when "All Beneficiaries" is clicked from RMNCHA tab
+     */
+    fun switchToHomeTab() {
+        pager.setCurrentItem(0, true) // true for smooth scroll animation
+    }
 }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivityViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivityViewModel.kt
index d4c3342c6..6ad1637fd 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivityViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/home_activity/HomeActivityViewModel.kt
@@ -11,8 +11,12 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.database.room.InAppDb
 import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.database.room.dao.PatientVisitInfoSyncDao
@@ -27,8 +31,10 @@ import org.piramalswasthya.cho.model.PatientVisitDataBundle
 import org.piramalswasthya.cho.model.PatientVisitInfoSync
 import org.piramalswasthya.cho.model.PatientVitalsModel
 import org.piramalswasthya.cho.model.PrescriptionWithItemMasterAndDrugFormMaster
+import org.piramalswasthya.cho.model.StatusOfWomanMaster
 import org.piramalswasthya.cho.model.VisitDB
 import org.piramalswasthya.cho.model.fhir.SelectedOutreachProgram
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
 import org.piramalswasthya.cho.repositories.BenFlowRepo
 import org.piramalswasthya.cho.repositories.DoctorMasterDataMaleRepo
 import org.piramalswasthya.cho.repositories.LanguageRepo
@@ -75,11 +81,57 @@ class HomeActivityViewModel @Inject constructor (application: Application,
 
     fun init(context: Context){
         viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                seedStatusOfWomanMaster()
+            }
             extracted(context)
 //            getStockDetailsOfSubStore()
         }
     }
 
+    private suspend fun seedStatusOfWomanMaster() {
+        val appContext = getApplication<Application>()
+        database.statusOfWomanDao.insertAll(
+            listOf(
+                StatusOfWomanMaster(
+                    1,
+                    appContext.getString(R.string.status_of_woman_eligible_couple_name),
+                    appContext.getString(R.string.status_of_woman_eligible_couple_code)
+                ),
+                StatusOfWomanMaster(
+                    2,
+                    appContext.getString(R.string.status_of_woman_pregnant_woman_name),
+                    appContext.getString(R.string.status_of_woman_pregnant_woman_code)
+                ),
+                StatusOfWomanMaster(
+                    3,
+                    appContext.getString(R.string.status_of_woman_postnatal_name),
+                    appContext.getString(R.string.status_of_woman_postnatal_code)
+                ),
+                StatusOfWomanMaster(
+                    4,
+                    appContext.getString(R.string.status_of_woman_elderly_name),
+                    appContext.getString(R.string.status_of_woman_elderly_code)
+                ),
+                StatusOfWomanMaster(
+                    5,
+                    appContext.getString(R.string.status_of_woman_adolescent_name),
+                    appContext.getString(R.string.status_of_woman_adolescent_code)
+                ),
+                StatusOfWomanMaster(
+                    6,
+                    appContext.getString(R.string.status_of_woman_permanent_sterilization_name),
+                    appContext.getString(R.string.status_of_woman_permanent_sterilization_code)
+                ),
+                StatusOfWomanMaster(
+                    7,
+                    appContext.getString(R.string.status_of_woman_not_applicable_name),
+                    appContext.getString(R.string.status_of_woman_not_applicable_code)
+                )
+            )
+        )
+    }
+
     fun triggerDownSyncWorker(context: Context, syncName: String){
         if (dataLoadFlagManager.isDataLoaded()){
             Log.d("triggering down", "down trigger")
@@ -90,39 +142,36 @@ class HomeActivityViewModel @Inject constructor (application: Application,
     private suspend fun extracted(context: Context) {
         try {
             _state.postValue(State.SAVING)
-            if (dataLoadFlagManager.isDataLoaded()){
+            WorkerUtils.pushAuditDetailsWorker(context)
+
+            if (dataLoadFlagManager.isDataLoaded()) {
+                // Master data is fresh — kick off background sync and return immediately
+                // so the UI is not kept waiting by network calls the user can't see.
                 Log.d("syncing started first", "syncing started")
-                WorkerUtils.triggerAmritSyncWorker(context)
+                WorkerUtils.enqueueFullSync(context)
+                _state.postValue(State.SAVE_SUCCESS)
+                return
             }
-            WorkerUtils.pushAuditDetailsWorker(context)
-            registrarMasterDataRepo.saveGenderMasterResponseToCache()
-            registrarMasterDataRepo.saveAgeUnitMasterResponseToCache()
-            registrarMasterDataRepo.saveMaritalStatusServiceResponseToCache()
-            registrarMasterDataRepo.saveCommunityMasterResponseToCache()
-            registrarMasterDataRepo.saveReligionMasterResponseToCache()
-            languageRepo.saveResponseToCacheLang()
-            visitReasonsAndCategoriesRepo.saveVisitReasonResponseToCache()
-            visitReasonsAndCategoriesRepo.saveVisitCategoriesResponseToCache()
-            registrarMasterDataRepo.saveIncomeMasterResponseToCache()
-            registrarMasterDataRepo.saveLiteracyStatusServiceResponseToCache()
-            registrarMasterDataRepo.saveGovIdEntityMasterResponseToCache()
-            registrarMasterDataRepo.saveOtherGovIdEntityMasterResponseToCache()
-            registrarMasterDataRepo.saveOccupationMasterResponseToCache()
-            registrarMasterDataRepo.saveQualificationMasterResponseToCache()
-            registrarMasterDataRepo.saveRelationshipMasterResponseToCache()
-            vaccineAndDoseTypeRepo.saveVaccineTypeResponseToCache()
-
-            prescriptionTemplateRepo.getTemplateFromServer(userRepo.getLoggedInUser()!!.userId)
-            vaccineAndDoseTypeRepo.saveDoseTypeResponseToCache()
-            vaccineAndDoseTypeRepo.getVaccineDetailsFromServer()
-            doctorMaleMasterDataRepo.getDoctorMasterMaleData()
-
-            malMasterDataRepo.getMasterDataForNurse()
-            getStockDetailsOfSubStore()
-            if (!dataLoadFlagManager.isDataLoaded()){
-                Log.d("syncing started second", "syncing started")
-                WorkerUtils.triggerAmritSyncWorker(context)
+
+            // First login or stale data (>10 days): download all master data.
+            // registrarMasterData is included in the same parallel batch as the
+            // other calls so nothing runs serially before them.
+            coroutineScope {
+                val j0 = async { registrarMasterDataRepo.saveAllMasterDataToCache() }
+                val j1 = async { languageRepo.saveResponseToCacheLang() }
+                val j2 = async { visitReasonsAndCategoriesRepo.saveVisitReasonResponseToCache() }
+                val j3 = async { visitReasonsAndCategoriesRepo.saveVisitCategoriesResponseToCache() }
+                val j4 = async { vaccineAndDoseTypeRepo.saveVaccineTypeResponseToCache() }
+                val j5 = async { vaccineAndDoseTypeRepo.saveDoseTypeResponseToCache() }
+                val j6 = async { vaccineAndDoseTypeRepo.getVaccineDetailsFromServer() }
+                val j7 = async { prescriptionTemplateRepo.getTemplateFromServer(userRepo.getLoggedInUser()!!.userId) }
+                val j8 = async { doctorMaleMasterDataRepo.getDoctorMasterMaleData() }
+                val j9 = async { malMasterDataRepo.getMasterDataForNurse() }
+                val j10 = async { getStockDetailsOfSubStore() }
+                awaitAll(j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10)
             }
+
+            WorkerUtils.enqueueFullSync(context)
             dataLoadFlagManager.setDataLoaded(true)
             _state.postValue(State.SAVE_SUCCESS)
         } catch (_e: Exception) {
@@ -137,32 +186,43 @@ class HomeActivityViewModel @Inject constructor (application: Application,
 
     fun logout(myLocation:Location?,logoutType: String) {
         viewModelScope.launch {
-            val user = userDao.getLoggedInUser()
-            val lat = myLocation?.latitude
-            val long = myLocation?.longitude
-            val pattern = "yyyy-MM-dd'T'HH:mm:ssZ"
-            val timeZone = TimeZone.getTimeZone("GMT+0530")
-            val formatter = SimpleDateFormat(pattern, Locale.getDefault())
-            formatter.timeZone = timeZone
-
-            val logoutTimestamp = formatter.format(Date())
-
-            val selectedOutreachProgram = SelectedOutreachProgram(0,
-                user?.userId,
-                user?.userName,
-                null,
-                null,
-                logoutTimestamp,
-                null,
-                lat,
-                long,
-                logoutType,
-            null)
-            userDao.insertOutreachProgram(selectedOutreachProgram)
-            userDao.resetAllUsersLoggedInState()
-            if (user != null) {
-                userDao.updateLogoutTime(user.userId,Date())
+            withContext(Dispatchers.IO) {
+                val user = userDao.getLoggedInUser()
+                val lat = myLocation?.latitude
+                val long = myLocation?.longitude
+                val pattern = "yyyy-MM-dd'T'HH:mm:ssZ"
+                val timeZone = TimeZone.getTimeZone("GMT+0530")
+                val formatter = SimpleDateFormat(pattern, Locale.getDefault())
+                formatter.timeZone = timeZone
+
+                val logoutTimestamp = formatter.format(Date())
+
+                val selectedOutreachProgram = SelectedOutreachProgram(0,
+                    // USER row is removed by clearAllTables(), so keep FK nullable for logout audit.
+                    null,
+                    user?.userName,
+                    null,
+                    null,
+                    logoutTimestamp,
+                    null,
+                    lat,
+                    long,
+                    logoutType,
+                null)
+                // Cancel any in-flight sync workers BEFORE wiping the DB. Otherwise a
+                // chain still running from this session survives the logout (logout
+                // does not stop WorkManager) and, on relogin, races the fresh login
+                // sync chain — its benflow pull can run while the patient table is
+                // being repopulated, leaving the Nurse/Doctor/Lab/Pharmacist worklists
+                // empty until the next sync cycle.
+                WorkerUtils.cancelAllWork(getApplication())
+                // Reset all local persisted records so next login starts clean.
+                database.clearAllTables()
+                // Preserve logout audit trail for later sync after local reset.
+                userDao.insertOutreachProgram(selectedOutreachProgram)
+                dataLoadFlagManager.setDataLoaded(false)
             }
+            pref.clearSyncTimestamps()
             pref.deleteEsanjeevaniCreds()
             _navigateToLoginPage.value = true
         }
@@ -238,6 +298,7 @@ class HomeActivityViewModel @Inject constructor (application: Application,
     fun processPatientDoctorBundle(dummyPatientDoctorBundle: PatientDoctorBundle){
         viewModelScope.launch {
             withContext(Dispatchers.IO){
+                var replaceLatestPending = false
                 try {
                     dummyPatientDoctorBundle.patient.syncState = SyncState.SHARED_OFFLINE
                     patientRepo.insertPatient(dummyPatientDoctorBundle.patient)
@@ -256,6 +317,13 @@ class HomeActivityViewModel @Inject constructor (application: Application,
                         dummyPatientDoctorBundle.patientVisitInfoSync.doctorDataSynced = SyncState.SYNCED
                         dummyPatientDoctorBundle.patientVisitInfoSync.pharmacistDataSynced = SyncState.SYNCED
                         patientVisitInfoSyncDao.insertPatientVisitInfoSync( dummyPatientDoctorBundle.patientVisitInfoSync)
+                    } else {
+                        // When both test and prescription are selected, move card to pharmacist module
+                        patientVisitInfoSyncDao.updatePharmacistFlagToPending(
+                            dummyPatientDoctorBundle.patientVisitInfoSync.patientID,
+                            dummyPatientDoctorBundle.patientVisitInfoSync.benVisitNo!!
+                        )
+                        replaceLatestPending = (existingPatientVisitInfoSync.pharmacist_flag ?: 0) == 1
                     }
                 }catch (e:Exception){
                     e.printStackTrace()
@@ -267,7 +335,8 @@ class HomeActivityViewModel @Inject constructor (application: Application,
                         dummyPatientDoctorBundle.patient,
                         facilityID,
                         dummyPatientDoctorBundle,
-                        dummyPatientDoctorBundle.patientVisitInfoSync
+                        dummyPatientDoctorBundle.patientVisitInfoSync,
+                        replaceLatestPending = replaceLatestPending
                     )
                 }catch (e:Exception){
                     e.printStackTrace()
@@ -288,6 +357,24 @@ class HomeActivityViewModel @Inject constructor (application: Application,
         _navigateToLoginPage.value = false
     }
 
+    private val _currentRole = MutableLiveData<String>(
+        (pref.getSwitchRole() ?: resolveDefaultRole()).also { pref.setSwitchRoles(it) }
+    )
+    val currentRole: LiveData<String> get() = _currentRole
+
+    fun switchRole(role: String) {
+        pref.setSwitchRoles(role)
+        _currentRole.value = role
+    }
+
+    private fun resolveDefaultRole(): String = when {
+        pref.isUserCHO() || pref.isUserStaffNurseOrNurse() -> "Nurse"
+        pref.isUserDoctorOrMO() -> "Doctor"
+        pref.isUserLabTechnician() -> "Lab Technician"
+        pref.isUserPharmacist() -> "Pharmacist"
+        else -> "Nurse"
+    }
+
     companion object {
 
         private val _state = MutableLiveData(State.IDLE)
@@ -296,4 +383,4 @@ class HomeActivityViewModel @Inject constructor (application: Application,
             get() = _state
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/hwc/HwcFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/hwc/HwcFragment.kt
index d22ff4f9c..20995c650 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/hwc/HwcFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/hwc/HwcFragment.kt
@@ -328,7 +328,7 @@ class HwcFragment constructor(
                     findNavController().navigateUp()
                 else {
                     MaterialAlertDialogBuilder(requireContext()).setTitle(getString(R.string.logout))
-                        .setMessage("Please confirm to logout and exit.")
+                        .setMessage(getString(R.string.please_confirm_logout_exit))
                         .setPositiveButton(getString(R.string.select_yes)) { dialog, _ ->
                             lifecycleScope.launch {
                                 val user = userDao.getLoggedInUser()
@@ -451,10 +451,10 @@ class HwcFragment constructor(
         timestamp = formatter.format(Date())
 
         val alertDialogBuilder = AlertDialog.Builder(activity)
-        alertDialogBuilder.setMessage("You are trying to Log-in away from your facility. Do you want to retry?")
-            .setTitle("Alert!")
+        alertDialogBuilder.setMessage(getString(R.string.login_away_from_facility))
+            .setTitle(getString(R.string.alert_popup))
             .setCancelable(false)
-            .setPositiveButton("Yes") { d, _ ->
+            .setPositiveButton(getString(R.string.yes)) { d, _ ->
                 lifecycleScope.launch {
                     val user = userDao.getLoggedInUser()
                     userDao.resetAllUsersLoggedInState()
@@ -465,7 +465,7 @@ class HwcFragment constructor(
                 d.dismiss()
                 findNavController().navigateUp()
             }
-            .setNegativeButton("No") { d, _ ->
+            .setNegativeButton(getString(R.string.no)) { d, _ ->
                 lifecycleScope.launch {
                     viewModel.setOutreachDetails(
                         "HWC",
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/outreach/OutreachFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/outreach/OutreachFragment.kt
index 7de598676..dc79dd70f 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/outreach/OutreachFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/cho_login/outreach/OutreachFragment.kt
@@ -154,7 +154,7 @@ class OutreachFragment(
 //        getCurrentLocation()
         if (isBiometric) {
             binding.tilPassword.visibility = View.GONE
-            binding.btnOutreachLogin.text = "Proceed to Home"
+            binding.btnOutreachLogin.text = getString(R.string.proceed_to_home)
         }else {
             binding.tilPassword.visibility = View.VISIBLE
             if (!viewModel.fetchRememberedPassword().isNullOrBlank()) {
@@ -175,7 +175,7 @@ class OutreachFragment(
                 if (faces.isEmpty()) {
                     Timber.d("Invalid Image!")
                     validImage = false
-                    Toast.makeText(requireContext(), "Invalid Image! Try Again", Toast.LENGTH_SHORT)
+                    Toast.makeText(requireContext(), getString(R.string.invalid_image_try_again), Toast.LENGTH_SHORT)
                         .show()
                 }
                 if (faces.size > 1) {
@@ -184,7 +184,7 @@ class OutreachFragment(
                     binding.imageView.setImageResource(R.drawable.placeholder_image)
                     Toast.makeText(
                         requireContext(),
-                        "Invalid Image! Multiple Faces Detected",
+                        getString(R.string.invalid_image_multiple_faces),
                         Toast.LENGTH_SHORT
                     ).show()
                 } else {
@@ -195,7 +195,7 @@ class OutreachFragment(
                 // Handle any errors
                 validImage = false
                 binding.imageView.setImageResource(R.drawable.placeholder_image)
-                Toast.makeText(context, "Exception! Image Processing Failed", Toast.LENGTH_SHORT)
+                Toast.makeText(context, getString(R.string.exception_image_processing_failed), Toast.LENGTH_SHORT)
                     .show()
             }
     }
@@ -220,7 +220,7 @@ class OutreachFragment(
                 Timber.d("Eyes Are Closed")
                 validImage = false
                 binding.imageView.setImageResource(R.drawable.placeholder_image)
-                Toast.makeText(requireContext(), "Eyes Closed! Try Again", Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(), getString(R.string.eyes_closed_try_again), Toast.LENGTH_SHORT)
                     .show()
                 // At least one eye is closed, possibly not live face
                 // Implement your logic for an inactive or spoofed face
@@ -237,7 +237,7 @@ class OutreachFragment(
         }
         outreachAdapter = OutreachDropdownAdapter(requireContext(), R.layout.dropdown_subcategory,R.id.tv_dropdown_item_text, outreachList.map { it.outreachType })
         binding.outreachText.setAdapter(outreachAdapter)
-        binding.outreachText.setText("Home Visit",false)
+        binding.outreachText.setText(getString(R.string.home_visit), false)
         viewModel.outreachList.observe(viewLifecycleOwner){ c->
             outreachList.clear()
             outreachList.addAll(c)
@@ -343,7 +343,7 @@ class OutreachFragment(
             }
         }
             else{
-                Toast.makeText(context, "Please capture the image to continue.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, getString(R.string.please_capture_image_to_continue), Toast.LENGTH_SHORT).show()
             }
         }
 
@@ -356,7 +356,7 @@ class OutreachFragment(
                     findNavController().navigateUp()
                 else {
                     MaterialAlertDialogBuilder(requireContext()).setTitle(getString(R.string.logout))
-                        .setMessage("Please confirm to logout and exit.")
+                        .setMessage(getString(R.string.please_confirm_logout_exit))
                         .setPositiveButton(getString(R.string.select_yes)) { dialog, _ ->
                             lifecycleScope.launch {
                                 val user = userDao.getLoggedInUser()
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsFragment.kt
index d0314569d..de8af7bf4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsFragment.kt
@@ -141,7 +141,7 @@ class LoginSettingsFragment : Fragment() {
                 requireActivity().finish()
             }
             else
-                Toast.makeText(activity,"Please wait while master location coordinates are fetched.",Toast.LENGTH_LONG).show()
+                Toast.makeText(activity, getString(R.string.please_wait_master_location), Toast.LENGTH_LONG).show()
         }
     }
 
@@ -238,13 +238,13 @@ class LoginSettingsFragment : Fragment() {
                             viewModel.userInfo?.userId
                         )
                     )
-                    Toast.makeText(activity, "Data is Saved!", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(activity, getString(R.string.data_saved), Toast.LENGTH_SHORT).show()
                 }catch(e:Exception){
-                    Toast.makeText(requireContext(), "Error while saving the master location", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(requireContext(), getString(R.string.error_saving_master_location), Toast.LENGTH_SHORT).show()
                 }
             }
         } else {
-            Toast.makeText(activity,"Please fill all the details",Toast.LENGTH_SHORT).show()
+            Toast.makeText(activity, getString(R.string.please_fill_all_details), Toast.LENGTH_SHORT).show()
         }
     }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsViewModel.kt
index 1f65fa529..d3a08bc32 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/login_settings/LoginSettingsViewModel.kt
@@ -1,25 +1,17 @@
 package org.piramalswasthya.cho.ui.login_activity.login_settings
 
-import android.content.Context
 import android.util.Log
-import android.widget.ArrayAdapter
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import org.piramalswasthya.cho.R
-import org.piramalswasthya.cho.adapter.dropdown_adapters.StatesAdapter
-import org.piramalswasthya.cho.database.room.dao.StateMasterDao
 import org.piramalswasthya.cho.database.room.dao.UserDao
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
 import org.piramalswasthya.cho.model.BlockMaster
 import org.piramalswasthya.cho.model.DistrictMaster
-import org.piramalswasthya.cho.model.LocationRequest
 import org.piramalswasthya.cho.model.StateMaster
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.model.VillageLocationData
@@ -31,7 +23,6 @@ import org.piramalswasthya.cho.network.DistrictBlock
 import org.piramalswasthya.cho.network.DistrictList
 import org.piramalswasthya.cho.network.NetworkResult
 import org.piramalswasthya.cho.network.State
-import org.piramalswasthya.cho.network.StateList
 import org.piramalswasthya.cho.network.Village
 import org.piramalswasthya.cho.network.VillageList
 import org.piramalswasthya.cho.repositories.BlockMasterRepo
@@ -40,8 +31,6 @@ import org.piramalswasthya.cho.repositories.LoginSettingsDataRepository
 import org.piramalswasthya.cho.repositories.StateMasterRepo
 import org.piramalswasthya.cho.repositories.UserRepo
 import org.piramalswasthya.cho.repositories.VillageMasterRepo
-import org.piramalswasthya.cho.ui.login_activity.cho_login.outreach.OutreachViewModel
-import org.piramalswasthya.cho.ui.register_patient_activity.patient_details.PatientDetailsViewModel
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/username/UsernameFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/username/UsernameFragment.kt
index 87ea7a1af..647f01d0a 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/username/UsernameFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/login_activity/username/UsernameFragment.kt
@@ -67,6 +67,10 @@ class UsernameFragment() : Fragment() {
     private lateinit var hwcViewModel: HwcViewModel
     private var user: UserCache? = null
     private var isBiometric : Boolean = false
+    private var pendingUserName: String = ""
+    private var pendingPassword: String = ""
+    private var pendingRememberUsername: Boolean = false
+    private var pendingIsBiometric: Boolean = false
     private var _binding: FragmentUsernameBinding? = null
     private val binding: FragmentUsernameBinding
         get() = _binding!!
@@ -125,10 +129,12 @@ class UsernameFragment() : Fragment() {
                 super.onAuthenticationSucceeded(result)
                 isBiometric = true
                 getCurrentLocation()
-                tryAuthUser = true
+                tryAuthUser = false
                 val userName = binding.etUsername.text.toString()
                 val remember = binding.cbRemember.isChecked
-                loginHwc(userName, "", remember, true)
+                // Reuse the normal login path so the local logged-in user is restored
+                // before Home opens. That keeps downstream modules and the drawer in sync.
+                loginHwc(userName, user?.password ?: "", remember, true)
                 displayMessage("Authentication succeeded!")
             }
 
@@ -164,6 +170,7 @@ class UsernameFragment() : Fragment() {
     }
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         viewModel.getOutreach()
+        observeLoginState()
         activity?.onBackPressedDispatcher?.addCallback(viewLifecycleOwner, onBackPressedCallback)
         binding.etUsername .addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@@ -203,12 +210,16 @@ class UsernameFragment() : Fragment() {
         when (prefDao.getCurrentLanguage()) {
             Languages.ENGLISH -> binding.rgLangSelect.check(binding.rbEng.id)
             Languages.KANNADA -> binding.rgLangSelect.check(binding.rbKannada.id)
+            Languages.HINDI -> binding.rgLangSelect.check(binding.rbHindi.id)
+            Languages.ASSAMESE -> binding.rgLangSelect.check(binding.rbAssam.id)
         }
 
         binding.rgLangSelect.setOnCheckedChangeListener { _, i ->
             val currentLanguage = when (i) {
                 binding.rbEng.id -> Languages.ENGLISH
                 binding.rbKannada.id -> Languages.KANNADA
+                binding.rbHindi.id -> Languages.HINDI
+                binding.rbAssam.id -> Languages.ASSAMESE
                 else -> Languages.ENGLISH
             }
             prefDao.saveSetLanguage(currentLanguage)
@@ -296,88 +307,83 @@ class UsernameFragment() : Fragment() {
 }
 
     private fun loginHwc(userName: String,password: String, rememberUsername: Boolean, isBiometric: Boolean) {
-
+        pendingUserName = userName
+        pendingPassword = password
+        pendingRememberUsername = rememberUsername
+        pendingIsBiometric = isBiometric
         val timestamp = getTimestamp()
 
-        if (!isBiometric) {
-            // Normal login
-            lifecycleScope.launch {
-                hwcViewModel.authUser(
-                    userName,
-                    password,
-                    "HWC",
-                    null,
-                    timestamp,
-                    null,
-                    currentLocation?.latitude,
-                    currentLocation?.longitude,
-                    null,
-                    requireContext()
-                )
-
-                hwcViewModel.state.observe(viewLifecycleOwner) { state ->
-                    when (state) {
-                        OutreachViewModel.State.SUCCESS -> {
-
-//                            val user = userDao.getLoggedInUser()
-
-                            if (rememberUsername)
-                                hwcViewModel.rememberUser(userName, password)
-                            else
-                                hwcViewModel.forgetUser()
-
-                            findNavController().navigate(
-                                UsernameFragmentDirections.actionSignInToHomeFromCho(true)
-                            )
-
-                            hwcViewModel.resetState()
-                            activity?.finish()
-                        }
+        lifecycleScope.launch {
+            hwcViewModel.authUser(
+                userName,
+                password,
+                "HWC",
+                null,
+                timestamp,
+                null,
+                currentLocation?.latitude,
+                currentLocation?.longitude,
+                null,
+                requireContext()
+            )
+        }
+    }
 
-                        OutreachViewModel.State.ERROR_SERVER,
-                        OutreachViewModel.State.ERROR_NETWORK -> {
-                            Toast.makeText(requireContext(), "Login Failed", Toast.LENGTH_LONG).show()
-                            hwcViewModel.resetState()
+    private fun observeLoginState() {
+        hwcViewModel.state.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                OutreachViewModel.State.SUCCESS -> {
+                    if (pendingRememberUsername)
+                        hwcViewModel.rememberUser(pendingUserName, pendingPassword)
+                    else
+                        hwcViewModel.forgetUser()
+
+                    lifecycleScope.launch {
+                        if (pendingIsBiometric) {
+                            try {
+                                hwcViewModel.setOutreachDetails(
+                                    "HWC",
+                                    null,
+                                    getTimestamp(),
+                                    null,
+                                    currentLocation?.latitude,
+                                    currentLocation?.longitude,
+                                    null,
+                                    false
+                                )
+                            } catch (_: Exception) {
+                                // Continue into Home even if the audit write fails.
+                            }
                         }
 
-                        OutreachViewModel.State.SAVING -> {
-                            Toast.makeText(requireContext(), "Processing...", Toast.LENGTH_SHORT).show()
-                        }
-                        OutreachViewModel.State.IDLE -> {
-                            // No-op
-                        }
-                        OutreachViewModel.State.LOADING -> {
-                            // No-op
-                        }
-                        OutreachViewModel.State.ERROR_INPUT -> {
-                            Toast.makeText(requireContext(), "Invalid input", Toast.LENGTH_SHORT).show()
-                            hwcViewModel.resetState()
-                        }
+                        findNavController().navigate(
+                            UsernameFragmentDirections.actionSignInToHomeFromCho(true)
+                        )
+
+                        hwcViewModel.resetState()
+                        activity?.finish()
                     }
                 }
-            }
-        } else {
-            // Biometric login
-            lifecycleScope.launch {
-                val user = userDao.getLoggedInUser()
-
-                hwcViewModel.setOutreachDetails(
-                    "HWC",
-                    null,
-                    timestamp,
-                    null,
-                    currentLocation?.latitude,
-                    currentLocation?.longitude,
-                    null,
-                    false
-                )
-
-                findNavController().navigate(
-                    UsernameFragmentDirections.actionSignInToHomeFromCho(true)
-                )
-
-                hwcViewModel.resetState()
-                activity?.finish()
+
+                OutreachViewModel.State.ERROR_SERVER,
+                OutreachViewModel.State.ERROR_NETWORK -> {
+                    Toast.makeText(requireContext(), getString(R.string.login_failed_toast), Toast.LENGTH_LONG).show()
+                    hwcViewModel.resetState()
+                }
+
+                OutreachViewModel.State.SAVING -> {
+                    Toast.makeText(requireContext(), getString(R.string.processing), Toast.LENGTH_SHORT).show()
+                }
+                OutreachViewModel.State.IDLE -> {
+                    // No-op
+                }
+                OutreachViewModel.State.LOADING -> {
+                    // No-op
+                }
+                OutreachViewModel.State.ERROR_INPUT -> {
+                    Toast.makeText(requireContext(), getString(R.string.invalid_input), Toast.LENGTH_SHORT).show()
+                    hwcViewModel.resetState()
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/master_location_settings/MasterLocationSettingsActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/master_location_settings/MasterLocationSettingsActivity.kt
index 428587913..77dac57d0 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/master_location_settings/MasterLocationSettingsActivity.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/master_location_settings/MasterLocationSettingsActivity.kt
@@ -24,7 +24,8 @@ class MasterLocationSettingsActivity : AppCompatActivity() {
         setContentView(binding.root)
         navHostFragment = supportFragmentManager.findFragmentById(binding.navHostUserLocation.id) as NavHostFragment
         val navController = navHostFragment.navController
-        navController.navigate(R.id.loginSettingsFragmentMaster)
+        if(savedInstanceState ==  null){
+        navController.navigate(R.id.loginSettingsFragmentMaster)}
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormFragment.kt
new file mode 100644
index 000000000..25d66d87d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormFragment.kt
@@ -0,0 +1,128 @@
+package org.piramalswasthya.cho.ui.mental_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.repeatOnLifecycle
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentMentalHealthScreeningFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class MentalHealthScreeningFormFragment :
+    BaseAssessmentFormFragment<MentalHealthScreeningFormViewModel>() {
+
+    private var _binding: FragmentMentalHealthScreeningFormBinding? = null
+    private val binding get() = _binding!!
+
+    override val viewModel: MentalHealthScreeningFormViewModel by viewModels()
+
+    // ── View references ───────────────────────────────────────────────────────
+
+    override val inputFormRecyclerView: RecyclerView
+        get() = binding.form.rvInputForm
+
+    override val contentLayout: View
+        get() = binding.llContent
+
+    override val progressBar: View
+        get() = binding.pbForm
+
+    override val benNameTextView: TextView
+        get() = binding.tvBenName
+
+    override val ageGenderTextView: TextView
+        get() = binding.tvAgeGender
+
+    override val submitButton: View
+        get() = binding.btnSubmit
+
+    override val cancelButton: View
+        get() = binding.btnCancel
+
+    // ── Form-specific configuration ──────────────────────────────────────────
+
+    override fun getFormTitle(): String =
+        getString(R.string.title_mental_health_screening)
+
+    override fun getSaveSuccessMessage(): String =
+        getString(R.string.mental_health_screening_saved)
+
+    override fun getFormFlow(): Flow<List<FormElement>> =
+        viewModel.formList
+
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+
+    override fun onSaveForm() =
+        viewModel.saveForm()
+
+    override fun getFragmentId(): Int =
+        R.id.fragment_mental_health_screening_form
+
+    // ── Lifecycle ─────────────────────────────────────────────────────────────
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding =
+            FragmentMentalHealthScreeningFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        observePhq9Alert()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    // Stamp Mental Health Screening metadata onto MasterDb from arguments and navigate to the vitals screen.
+    override fun onSaveSuccess() {
+        WorkerUtils.mentalPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.mentalHealth,
+        )
+    }
+
+    private fun observePhq9Alert() {
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.phq9AlertMessageFlow.collect { message ->
+                    message?.let {
+                        if (isAdded) {
+                            MaterialAlertDialogBuilder(requireContext())
+                                .setTitle(getString(R.string.form_alert_title))
+                                .setMessage(it)
+                                .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                                    dialog.dismiss()
+                                    viewModel.clearPhq9AlertMessage()
+                                }
+                                .setCancelable(false)
+                                .show()
+                            }
+
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormViewModel.kt
new file mode 100644
index 000000000..44fc1273e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/mental_health/MentalHealthScreeningFormViewModel.kt
@@ -0,0 +1,125 @@
+package org.piramalswasthya.cho.ui.mental_health
+
+import android.content.Context
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.MentalHealthScreeningDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.MentalHealthScreeningCache
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+import org.piramalswasthya.cho.repositories.MentalHealthScreeningRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+@HiltViewModel
+class MentalHealthScreeningFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val mentalHealthScreeningRepo: MentalHealthScreeningRepo,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo
+
+) : BaseFormViewModel() {
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val dataset =
+        MentalHealthScreeningDataset(context, preferenceDao.getCurrentLanguage())
+
+    val formList = dataset.listFlow
+    val phq9AlertMessageFlow = dataset.phq9AlertMessageFlow
+
+    private lateinit var screeningCache: MentalHealthScreeningCache
+
+    init {
+        viewModelScope.launch {
+            dataset.alertErrorMessageFlow.collect { message ->
+                message?.let {
+                    _showAlert.value = it
+                    dataset.resetErrorMessageFlow()
+                }
+            }
+        }
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID)
+                    ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    mentalHealthScreeningRepo.getScreeningByPatientIdAndVisitNo(
+                        patient.patient.patientID,
+                        benVisitNo
+                    )
+                } else {
+                    mentalHealthScreeningRepo.getScreeningByPatientId(
+                        patient.patient.patientID
+                    )
+                }
+
+                screeningCache = existingRecord ?: MentalHealthScreeningCache(
+                    patientId = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                val deliveryOutcome = deliveryOutcomeRepo.getDeliveryOutcome(patient.patient.patientID)
+                // Logic to determine if the patient is in the postpartum period:
+                // 1. Check if a delivery was recorded within the last 12 months.
+                // 2. Alternatively, check if the patient's status is explicitly "Postnatal" (statusOfWomanID == 3).
+                // If neither condition is confirmed, default to null (unselected) instead of false (No).
+                val isPostpartumFromRmncha = deliveryOutcome?.dateOfDelivery?.let { deliveryDateMs ->
+                    val twelveMonthsInMs = TimeUnit.DAYS.toMillis(365)
+                    val now = System.currentTimeMillis()
+                    if ((now - deliveryDateMs) in 0..twelveMonthsInMs) true else null
+                } ?: if (patient.patient.statusOfWomanID == 3) true else null
+
+
+                dataset.setUpPage(
+                    savedRecord = existingRecord,
+                    isPostpartumFromRmncha = isPostpartumFromRmncha,
+                    genderID = patient.patient.genderID,
+                    age = patient.patient.age
+                )
+
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing MentalHealthScreeningFormViewModel")
+            }
+        }
+    }
+
+    // ── Form Updates ──────────────────────────────────────────────────
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(
+            dataset,
+            formId,
+            index,
+            "Error updating Mental Health Screening form"
+        )
+    }
+
+    fun clearPhq9AlertMessage() {
+        dataset.resetPhq9AlertMessageFlow()
+    }
+
+    // ── Save ──────────────────────────────────────────────────────────
+
+    fun saveForm() {
+        launchSave("Saving Mental Health Screening failed") {
+            check(::screeningCache.isInitialized) {
+                "Screening cache not initialized"
+            }
+            dataset.mapValues(screeningCache, 1)
+            mentalHealthScreeningRepo.saveScreening(screeningCache)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningFragment.kt
new file mode 100644
index 000000000..4d891e3aa
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningFragment.kt
@@ -0,0 +1,554 @@
+package org.piramalswasthya.cho.ui.ophthalmic_screening
+
+import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.Toast
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import android.widget.ScrollView
+import dagger.hilt.android.AndroidEntryPoint
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentOphthalmicScreeningBinding
+import org.piramalswasthya.cho.ui.commons.CphcFormNavigation
+import org.piramalswasthya.cho.ui.commons.DropdownConst
+import android.app.AlertDialog
+import org.piramalswasthya.cho.ui.commons.NavigationAdapter
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class OphthalmicScreeningFragment : Fragment(), NavigationAdapter {
+
+    private val viewModel: OphthalmicScreeningViewModel by viewModels()
+    private lateinit var binding: FragmentOphthalmicScreeningBinding
+    private val args: OphthalmicScreeningFragmentArgs by navArgs()
+
+    private val onBackPressedCallback by lazy {
+        object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                onCancelAction()
+            }
+        }
+    }
+
+    private val chartOptions by lazy { resources.getStringArray(R.array.ophthalmic_chart_options) }
+    private val caseIdOptions by lazy { resources.getStringArray(R.array.ophthalmic_case_id_options) }
+    private val injuryTypeOptions by lazy { resources.getStringArray(R.array.ophthalmic_injury_type_options) }
+    private val foreignBodyOptions by lazy { resources.getStringArray(R.array.ophthalmic_foreign_body_options) }
+    private val trachomaOptions by lazy { resources.getStringArray(R.array.ophthalmic_trachoma_options) }
+    private val cornealDiseaseOptions by lazy { resources.getStringArray(R.array.ophthalmic_corneal_disease_options) }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = DataBindingUtil.inflate(
+            inflater, R.layout.fragment_ophthalmic_screening, container, false
+        )
+        binding.lifecycleOwner = viewLifecycleOwner
+        viewModel.resetFields()
+        binding.viewModel = viewModel
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupDropdowns()
+        setupClickListeners()
+        setupObservers()
+        observeConditionSubFields()
+        observeInjuryFields()
+        viewModel.loadOphthalmicVisit(args.patientID, args.benVisitNo, args.reasonForVisit)
+
+        val headerTitle = when (args.reasonForVisit) {
+            DropdownConst.REASON_SYMPTOMATIC -> getString(R.string.ophthalmic_symptomatic_title)
+            DropdownConst.REASON_FIRST_AID_EYE_INJURY,
+            DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA -> getString(R.string.ophthalmic_injury_trauma_title)
+            else -> getString(R.string.ophthalmic_screening_title)
+        }
+        activity?.findViewById<android.widget.TextView>(R.id.header_text_register_patient)?.text = headerTitle
+
+        requireActivity().onBackPressedDispatcher.addCallback(
+            viewLifecycleOwner,
+            onBackPressedCallback
+        )
+    }
+
+    private fun setupDropdowns() {
+        val chartValues = DropdownConst.visualAcuityChartList
+        val chartAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, chartOptions)
+        binding.actvChartUsed.setAdapter(chartAdapter)
+        binding.actvChartUsed.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setChartUsed(chartValues[position])
+        }
+
+        val vaValues = DropdownConst.visualAcuityList
+        val vaAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, vaValues)
+        binding.actvDistVaRight.setAdapter(vaAdapter)
+        binding.actvDistVaLeft.setAdapter(vaAdapter)
+        binding.actvDistVaRight.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setDistVARight(vaValues[position])
+        }
+        binding.actvDistVaLeft.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setDistVALeft(vaValues[position])
+        }
+
+        val nearVaValues = DropdownConst.nearVisualAcuityList
+        val nearVaAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, nearVaValues)
+        binding.actvNearVa.setAdapter(nearVaAdapter)
+        binding.actvNearVa.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setNearVA(nearVaValues[position])
+        }
+
+        val trachomaValues = DropdownConst.trachomaStatusList
+        val trachomaAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, trachomaOptions)
+        binding.actvTrachomaStatus.setAdapter(trachomaAdapter)
+        binding.actvTrachomaStatus.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setTrachomaStatus(trachomaValues[position])
+        }
+
+        val cornealValues = DropdownConst.cornealDiseaseTypeList
+        val cornealAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, cornealDiseaseOptions)
+        binding.actvCornealDiseaseType.setAdapter(cornealAdapter)
+        binding.actvCornealDiseaseType.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setCornealDiseaseType(cornealValues[position])
+        }
+
+        val foreignBodyValues = DropdownConst.foreignBodyRemovalOptions
+        val foreignBodyAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, foreignBodyOptions)
+        binding.actvForeignBodyRemoval.setAdapter(foreignBodyAdapter)
+        binding.actvForeignBodyRemoval.setOnItemClickListener { _, _, position, _ ->
+            viewModel.setForeignBodyRemoval(foreignBodyValues[position])
+        }
+    }
+
+    private fun setupClickListeners() {
+        binding.btnNext.setOnClickListener { navigateAfterSave() }
+        binding.btnCancel.setOnClickListener { onCancelAction() }
+
+        binding.tvCaseIdSelection.setOnClickListener {
+            showCaseIdMultiSelectDialog()
+        }
+
+        binding.tvInjuryTypeSelection.setOnClickListener {
+            showInjuryTypeMultiSelectDialog()
+        }
+
+        binding.rgChemicalExposure.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_chemical_exposure_yes -> viewModel.setChemicalExposure(true)
+                R.id.rb_chemical_exposure_no -> viewModel.setChemicalExposure(false)
+            }
+        }
+
+        binding.rgCataractSymptoms.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_cataract_yes -> viewModel.setCataractSymptoms(true)
+                R.id.rb_cataract_no -> viewModel.setCataractSymptoms(false)
+            }
+        }
+
+        binding.rgGlaucomaSymptoms.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_glaucoma_yes -> viewModel.setGlaucomaSymptoms(true)
+                R.id.rb_glaucoma_no -> viewModel.setGlaucomaSymptoms(false)
+            }
+        }
+
+        binding.rgDrSymptoms.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_dr_yes -> viewModel.setDrSymptoms(true)
+                R.id.rb_dr_no -> viewModel.setDrSymptoms(false)
+            }
+        }
+
+        binding.rgPresbyopiaSymptoms.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_presbyopia_yes -> viewModel.setPresbyopiaSymptoms(true)
+                R.id.rb_presbyopia_no -> viewModel.setPresbyopiaSymptoms(false)
+            }
+        }
+
+        binding.rgVitaminADeficiency.setOnCheckedChangeListener { _, checkedId ->
+            when (checkedId) {
+                R.id.rb_vitamin_a_yes -> viewModel.setVitaminADeficiency(true)
+                R.id.rb_vitamin_a_no -> viewModel.setVitaminADeficiency(false)
+            }
+        }
+    }
+
+    private fun showCaseIdMultiSelectDialog() {
+        val options = DropdownConst.caseIdConditionsList.toTypedArray()
+        val currentSelections = viewModel.caseIdConditions.value ?: emptyList()
+        val checkedItems = BooleanArray(options.size) { index ->
+            currentSelections.contains(options[index])
+        }
+
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.ophthalmic_case_id_conditions))
+            .setMultiChoiceItems(caseIdOptions, checkedItems) { _, which, isChecked ->
+                checkedItems[which] = isChecked
+            }
+            .setPositiveButton(getString(android.R.string.ok)) { _, _ ->
+                val selectedList = mutableListOf<String>()
+                for (i in options.indices) {
+                    if (checkedItems[i]) {
+                        selectedList.add(options[i])
+                    }
+                }
+                viewModel.setCaseIdConditions(selectedList)
+            }
+            .setNegativeButton(getString(android.R.string.cancel), null)
+            .show()
+    }
+
+    private fun showInjuryTypeMultiSelectDialog() {
+        val options = DropdownConst.injuryTypeList.toTypedArray()
+        val currentSelections = viewModel.injuryTypes.value ?: emptyList()
+        val checkedItems = BooleanArray(options.size) { index ->
+            currentSelections.contains(options[index])
+        }
+
+        AlertDialog.Builder(requireContext())
+            .setTitle(getString(R.string.ophthalmic_select_injury_type))
+            .setMultiChoiceItems(injuryTypeOptions, checkedItems) { _, which, isChecked ->
+                checkedItems[which] = isChecked
+            }
+            .setPositiveButton(getString(android.R.string.ok)) { _, _ ->
+                val selectedList = mutableListOf<String>()
+                for (i in options.indices) {
+                    if (checkedItems[i]) selectedList.add(options[i])
+                }
+                viewModel.setInjuryTypes(selectedList)
+            }
+            .setNegativeButton(getString(android.R.string.cancel), null)
+            .show()
+    }
+
+    private fun navigateAfterSave() {
+        val missingField = viewModel.getMissingMandatoryField()
+        if (missingField != OphthalmicScreeningViewModel.MissingField.NONE) {
+            handleMissingField(missingField)
+            return
+        }
+
+        binding.btnNext.isEnabled = false
+        viewModel.save {
+            Toast.makeText(requireContext(), getString(R.string.saved_successfully), Toast.LENGTH_SHORT).show()
+            WorkerUtils.ophthalmicPushWorker(requireContext())
+            val bundle = CphcFormNavigation.buildVitalsBundle(
+                arguments = arguments,
+                subCategory = org.piramalswasthya.cho.ui.commons.DropdownConst.ophthalmic,
+                reasonForVisit = args.reasonForVisit,
+            )
+            findNavController().navigate(org.piramalswasthya.cho.R.id.customVitalsFragment, bundle)
+        }
+    }
+
+    private fun handleMissingField(field: OphthalmicScreeningViewModel.MissingField) {
+        val (messageRes, viewToFocus) = when (field) {
+            OphthalmicScreeningViewModel.MissingField.IS_DIABETIC -> Pair(R.string.ophthalmic_is_diabetic, binding.rgIsDiabetic)
+            OphthalmicScreeningViewModel.MissingField.SCREENING_PERFORMED -> Pair(R.string.ophthalmic_screening_performed, binding.rgScreeningPerformed)
+            OphthalmicScreeningViewModel.MissingField.CHART_USED -> Pair(R.string.ophthalmic_chart_used, binding.actvChartUsed)
+            OphthalmicScreeningViewModel.MissingField.DIST_VA_RIGHT -> Pair(R.string.ophthalmic_dist_va_right, binding.actvDistVaRight)
+            OphthalmicScreeningViewModel.MissingField.DIST_VA_LEFT -> Pair(R.string.ophthalmic_dist_va_left, binding.actvDistVaLeft)
+            OphthalmicScreeningViewModel.MissingField.NEAR_VA -> Pair(R.string.ophthalmic_near_va, binding.actvNearVa)
+            OphthalmicScreeningViewModel.MissingField.CASE_ID -> Pair(R.string.ophthalmic_case_id_conditions, binding.tvCaseIdSelection)
+            OphthalmicScreeningViewModel.MissingField.CATARACT -> Pair(R.string.ophthalmic_cataract_symptoms, binding.rgCataractSymptoms)
+            OphthalmicScreeningViewModel.MissingField.GLAUCOMA -> Pair(R.string.ophthalmic_glaucoma_symptoms, binding.rgGlaucomaSymptoms)
+            OphthalmicScreeningViewModel.MissingField.DR -> Pair(R.string.ophthalmic_dr_symptoms, binding.rgDrSymptoms)
+            OphthalmicScreeningViewModel.MissingField.PRESBYOPIA -> Pair(R.string.ophthalmic_presbyopia_symptoms, binding.rgPresbyopiaSymptoms)
+            OphthalmicScreeningViewModel.MissingField.TRACHOMA -> Pair(R.string.ophthalmic_trachoma_status, binding.actvTrachomaStatus)
+            OphthalmicScreeningViewModel.MissingField.CORNEAL -> Pair(R.string.ophthalmic_corneal_disease_type, binding.actvCornealDiseaseType)
+            OphthalmicScreeningViewModel.MissingField.VITAMIN_A -> Pair(R.string.ophthalmic_vitamin_a_deficiency_label, binding.rgVitaminADeficiency)
+            OphthalmicScreeningViewModel.MissingField.INJURY_TYPE -> Pair(R.string.ophthalmic_injury_type_label, binding.tvInjuryTypeSelection)
+            OphthalmicScreeningViewModel.MissingField.FOREIGN_BODY_REMOVAL -> Pair(
+                R.string.ophthalmic_foreign_body_removal_attempted,
+                binding.actvForeignBodyRemoval
+            )
+            OphthalmicScreeningViewModel.MissingField.CHEMICAL_EXPOSURE -> Pair(
+                R.string.ophthalmic_chemical_exposure_wash_performed,
+                binding.rgChemicalExposure
+            )
+            else -> return
+        }
+
+        Toast.makeText(requireContext(), getString(R.string.please_complete_field, getString(messageRes)), Toast.LENGTH_SHORT).show()
+
+        binding.root.findViewById<ScrollView>(R.id.scroll_view)?.let { scrollView ->
+            scrollView.post {
+                val viewLocation = IntArray(2)
+                viewToFocus.getLocationInWindow(viewLocation)
+
+                val scrollLocation = IntArray(2)
+                scrollView.getLocationInWindow(scrollLocation)
+
+                val scrollToY = (viewLocation[1] - scrollLocation[1]) + scrollView.scrollY - 32
+                scrollView.smoothScrollTo(0, scrollToY)
+                viewToFocus.requestFocus()
+            }
+        }
+    }
+
+    private fun setupObservers() {
+        viewModel.showInjuryTraumaModule.observe(viewLifecycleOwner) { show ->
+            binding.llInjuryTraumaModule.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.showScreeningModule.observe(viewLifecycleOwner) { show ->
+            binding.llScreeningModule.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.isDiabetic.observe(viewLifecycleOwner) { isDiabetic ->
+            applyIsDiabeticState(isDiabetic)
+        }
+
+        viewModel.isScreeningPerformed.observe(viewLifecycleOwner) { performed ->
+            applyScreeningPerformedState(performed)
+        }
+
+        viewModel.showChartSection.observe(viewLifecycleOwner) { show ->
+            binding.llChartSection.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.showDistVASection.observe(viewLifecycleOwner) { show ->
+            binding.llDistVaSection.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.showNearVASection.observe(viewLifecycleOwner) { show ->
+            binding.llNearVaSection.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.chartUsed.observe(viewLifecycleOwner) { value ->
+            val localizedText = getLocalizedText(value, DropdownConst.visualAcuityChartList, chartOptions)
+            if (binding.actvChartUsed.text.toString() != localizedText) {
+                binding.actvChartUsed.setText(localizedText, false)
+            }
+        }
+
+        viewModel.canProceed.observe(viewLifecycleOwner) { canProceed ->
+            if (args.reasonForVisit == DropdownConst.REASON_FIRST_AID_EYE_INJURY ||
+                args.reasonForVisit == DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA
+            ) {
+                binding.btnNext.isEnabled = canProceed
+            }
+        }
+
+        viewModel.saveError.observe(viewLifecycleOwner) { failed ->
+            if (failed) {
+                binding.btnNext.isEnabled = true
+                Toast.makeText(requireContext(), getString(R.string.save_failed_retry), Toast.LENGTH_LONG).show()
+            }
+        }
+
+        viewModel.caseIdConditions.observe(viewLifecycleOwner) { conditions ->
+            applyCaseIdConditionsDisplay(conditions)
+        }
+    }
+
+    private fun observeInjuryFields() {
+        viewModel.injuryTypes.observe(viewLifecycleOwner) { types ->
+            applyInjuryTypesDisplay(types)
+        }
+
+        viewModel.showForeignBodyRemovalField.observe(viewLifecycleOwner) { show ->
+            updateTextViewVisibility(show, binding.llForeignBodyRemovalField, binding.actvForeignBodyRemoval)
+        }
+
+        viewModel.showChemicalExposureField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llChemicalExposureField, binding.rgChemicalExposure)
+        }
+
+        viewModel.showForeignBodyAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvForeignBodyAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.showChemicalExposureAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvChemicalExposureAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+
+        viewModel.foreignBodyRemoval.observe(viewLifecycleOwner) { value ->
+            val localizedText = getLocalizedText(value, DropdownConst.foreignBodyRemovalOptions, foreignBodyOptions)
+            if (!localizedText.isNullOrEmpty() && binding.actvForeignBodyRemoval.text.toString() != localizedText) {
+                binding.actvForeignBodyRemoval.setText(localizedText, false)
+            }
+        }
+
+        viewModel.chemicalExposure.observe(viewLifecycleOwner) { value ->
+            applyRadioState(
+                binding.rgChemicalExposure,
+                value,
+                R.id.rb_chemical_exposure_yes,
+                R.id.rb_chemical_exposure_no
+            )
+        }
+    }
+    private fun observeConditionSubFields() {
+        observeSubFieldVisibility()
+        observeSubFieldAlerts()
+        observeSubFieldRestoration()
+    }
+
+    private fun observeSubFieldVisibility() {
+        viewModel.showCataractSubField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llCataractSubfield, binding.rgCataractSymptoms)
+        }
+        viewModel.showGlaucomaSubField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llGlaucomaSubfield, binding.rgGlaucomaSymptoms)
+        }
+        viewModel.showDrSubField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llDrSubfield, binding.rgDrSymptoms)
+        }
+        viewModel.showPresbyopiaSubField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llPresbyopiaSubfield, binding.rgPresbyopiaSymptoms)
+        }
+        viewModel.showTrachomaSubField.observe(viewLifecycleOwner) { show ->
+            updateTextViewVisibility(show, binding.llTrachomaSubfield, binding.actvTrachomaStatus)
+        }
+        viewModel.showCornealSubField.observe(viewLifecycleOwner) { show ->
+            updateTextViewVisibility(show, binding.llCornealSubfield, binding.actvCornealDiseaseType)
+        }
+        viewModel.showVitaminASubField.observe(viewLifecycleOwner) { show ->
+            updateRadioGroupVisibility(show, binding.llVitaminASubfield, binding.rgVitaminADeficiency)
+        }
+    }
+
+    private fun updateRadioGroupVisibility(show: Boolean, layout: View, radioGroup: android.widget.RadioGroup) {
+        layout.visibility = if (show) View.VISIBLE else View.GONE
+        if (!show) radioGroup.clearCheck()
+    }
+
+    private fun updateTextViewVisibility(show: Boolean, layout: View, textView: android.widget.AutoCompleteTextView) {
+        layout.visibility = if (show) View.VISIBLE else View.GONE
+        if (!show) textView.setText("", false)
+    }
+
+    private fun observeSubFieldAlerts() {
+        viewModel.showCataractAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvCataractAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showGlaucomaAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvGlaucomaAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showDrAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvDrAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showPresbyopiaAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvPresbyopiaAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showTrachomaAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvTrachomaAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showCornealAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvCornealAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+        viewModel.showVitaminAAlert.observe(viewLifecycleOwner) { show ->
+            binding.tvVitaminAAlert.visibility = if (show) View.VISIBLE else View.GONE
+        }
+    }
+
+    private fun observeSubFieldRestoration() {
+        viewModel.cataractSymptoms.observe(viewLifecycleOwner) { value ->
+            applyRadioState(binding.rgCataractSymptoms, value, R.id.rb_cataract_yes, R.id.rb_cataract_no)
+        }
+        viewModel.glaucomaSymptoms.observe(viewLifecycleOwner) { value ->
+            applyRadioState(binding.rgGlaucomaSymptoms, value, R.id.rb_glaucoma_yes, R.id.rb_glaucoma_no)
+        }
+        viewModel.drSymptoms.observe(viewLifecycleOwner) { value ->
+            applyRadioState(binding.rgDrSymptoms, value, R.id.rb_dr_yes, R.id.rb_dr_no)
+        }
+        viewModel.presbyopiaSymptoms.observe(viewLifecycleOwner) { value ->
+            applyRadioState(binding.rgPresbyopiaSymptoms, value, R.id.rb_presbyopia_yes, R.id.rb_presbyopia_no)
+        }
+        viewModel.vitaminADeficiency.observe(viewLifecycleOwner) { value ->
+            applyRadioState(binding.rgVitaminADeficiency, value, R.id.rb_vitamin_a_yes, R.id.rb_vitamin_a_no)
+        }
+        viewModel.trachomaStatus.observe(viewLifecycleOwner) { value ->
+            val localizedText = getLocalizedText(value, DropdownConst.trachomaStatusList, trachomaOptions)
+            if (!localizedText.isNullOrEmpty() && binding.actvTrachomaStatus.text.toString() != localizedText) {
+                binding.actvTrachomaStatus.setText(localizedText, false)
+            }
+        }
+        viewModel.cornealDiseaseType.observe(viewLifecycleOwner) { value ->
+            val localizedText = getLocalizedText(value, DropdownConst.cornealDiseaseTypeList, cornealDiseaseOptions)
+            if (!localizedText.isNullOrEmpty() && binding.actvCornealDiseaseType.text.toString() != localizedText) {
+                binding.actvCornealDiseaseType.setText(localizedText, false)
+            }
+        }
+    }
+
+    private fun getLocalizedText(internalValue: String?, internalList: List<String>, localizedList: Array<String>): String {
+        if (internalValue == null) return ""
+        val index = internalList.indexOf(internalValue)
+        return if (index != -1 && index < localizedList.size) localizedList[index] else internalValue ?: ""
+    }
+    
+    private fun getLocalizedList(internalValues: List<String>?, internalList: List<String>, localizedList: Array<String>): List<String> {
+        return internalValues?.map { getLocalizedText(it, internalList, localizedList) } ?: emptyList()
+    }
+
+    private fun applyMultiSelectDisplay(
+        view: android.widget.AutoCompleteTextView,
+        values: List<String>?,
+        emptyHintRes: Int
+    ) {
+        if (values.isNullOrEmpty()) {
+            view.setText("")
+            view.hint = getString(emptyHintRes)
+        } else {
+            view.setText(values.joinToString(", "))
+        }
+    }
+
+    private fun applyInjuryTypesDisplay(types: List<String>?) {
+        val localizedTypes = getLocalizedList(types, DropdownConst.injuryTypeList, injuryTypeOptions)
+        applyMultiSelectDisplay(binding.tvInjuryTypeSelection, localizedTypes, R.string.ophthalmic_select_injury_type)
+    }
+
+    private fun applyCaseIdConditionsDisplay(conditions: List<String>?) {
+        val localizedConditions = getLocalizedList(conditions, DropdownConst.caseIdConditionsList, caseIdOptions)
+        applyMultiSelectDisplay(binding.tvCaseIdSelection, localizedConditions, R.string.select_conditions)
+    }
+
+    private fun applyRadioState(
+        group: android.widget.RadioGroup,
+        value: Boolean?,
+        yesId: Int,
+        noId: Int
+    ) {
+        when (value) {
+            true -> group.check(yesId)
+            false -> group.check(noId)
+            null -> group.clearCheck()
+        }
+    }
+
+    private fun applyIsDiabeticState(isDiabetic: Boolean?) {
+        when (isDiabetic) {
+            true  -> binding.rgIsDiabetic.check(R.id.rb_diabetic_yes)
+            false -> binding.rgIsDiabetic.check(R.id.rb_diabetic_no)
+            null  -> binding.rgIsDiabetic.clearCheck()
+        }
+        binding.llScreeningSection.visibility = if (isDiabetic == true) View.VISIBLE else View.GONE
+    }
+
+    private fun applyScreeningPerformedState(performed: Boolean?) {
+        when (performed) {
+            true  -> binding.rgScreeningPerformed.check(R.id.rb_screening_yes)
+            false -> binding.rgScreeningPerformed.check(R.id.rb_screening_no)
+            null  -> binding.rgScreeningPerformed.clearCheck()
+        }
+    }
+
+    override fun getFragmentId(): Int = R.id.ophthalmicScreeningFragment
+
+    override fun onSubmitAction() { navigateAfterSave() }
+
+    override fun onCancelAction() { findNavController().popBackStack() }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningViewModel.kt
new file mode 100644
index 000000000..fd392f323
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/ophthalmic_screening/OphthalmicScreeningViewModel.kt
@@ -0,0 +1,768 @@
+package org.piramalswasthya.cho.ui.ophthalmic_screening
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import org.piramalswasthya.cho.model.OphthalmicVisit
+import org.piramalswasthya.cho.repositories.OphthalmicRepository
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.DropdownConst
+import timber.log.Timber
+import java.util.Date
+import javax.inject.Inject
+
+@HiltViewModel
+class OphthalmicScreeningViewModel @Inject constructor(
+    private val ophthalmicRepository: OphthalmicRepository,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo
+) : ViewModel() {
+
+    private val moshiAdapter: JsonAdapter<List<String>> by lazy {
+        Moshi.Builder().build().adapter(
+            Types.newParameterizedType(List::class.java, String::class.java)
+        )
+    }
+
+    private val _benName = MutableLiveData<String>()
+    val benName: LiveData<String> = _benName
+
+    private val _benAgeGender = MutableLiveData<String>()
+    val benAgeGender: LiveData<String> = _benAgeGender
+
+    private val _ophthalmicVisit = MutableLiveData<OphthalmicVisit?>()
+    val ophthalmicVisit: LiveData<OphthalmicVisit?> = _ophthalmicVisit
+
+    private val _reasonForVisit = MutableLiveData<String?>()
+    val reasonForVisit: LiveData<String?> = _reasonForVisit
+
+    private val _isDiabetic = MutableLiveData<Boolean?>()
+    val isDiabetic: LiveData<Boolean?> = _isDiabetic
+
+    private val _isScreeningPerformed = MutableLiveData<Boolean?>()
+    val isScreeningPerformed: LiveData<Boolean?> = _isScreeningPerformed
+
+    private val _chartUsed = MutableLiveData<String?>()
+    val chartUsed: LiveData<String?> = _chartUsed
+
+    private val _distVARight = MutableLiveData<String?>()
+    val distVARight: LiveData<String?> = _distVARight
+
+    private val _distVALeft = MutableLiveData<String?>()
+    val distVALeft: LiveData<String?> = _distVALeft
+
+    private val _nearVA = MutableLiveData<String?>()
+    val nearVA: LiveData<String?> = _nearVA
+
+    private val _caseIdConditions = MutableLiveData<List<String>>(emptyList())
+    val caseIdConditions: LiveData<List<String>> = _caseIdConditions
+
+    private val _cataractSymptoms = MutableLiveData<Boolean?>()
+    val cataractSymptoms: LiveData<Boolean?> = _cataractSymptoms
+
+    private val _glaucomaSymptoms = MutableLiveData<Boolean?>()
+    val glaucomaSymptoms: LiveData<Boolean?> = _glaucomaSymptoms
+
+    private val _drSymptoms = MutableLiveData<Boolean?>()
+    val drSymptoms: LiveData<Boolean?> = _drSymptoms
+
+    private val _presbyopiaSymptoms = MutableLiveData<Boolean?>()
+    val presbyopiaSymptoms: LiveData<Boolean?> = _presbyopiaSymptoms
+
+    private val _trachomaStatus = MutableLiveData<String?>()
+    val trachomaStatus: LiveData<String?> = _trachomaStatus
+
+    private val _cornealDiseaseType = MutableLiveData<String?>()
+    val cornealDiseaseType: LiveData<String?> = _cornealDiseaseType
+
+    private val _vitaminADeficiency = MutableLiveData<Boolean?>()
+    val vitaminADeficiency: LiveData<Boolean?> = _vitaminADeficiency
+
+    private val _showCataractSubField = MutableLiveData<Boolean>(false)
+    val showCataractSubField: LiveData<Boolean> = _showCataractSubField
+
+    private val _showGlaucomaSubField = MutableLiveData<Boolean>(false)
+    val showGlaucomaSubField: LiveData<Boolean> = _showGlaucomaSubField
+
+    private val _showDrSubField = MutableLiveData<Boolean>(false)
+    val showDrSubField: LiveData<Boolean> = _showDrSubField
+
+    private val _showPresbyopiaSubField = MutableLiveData<Boolean>(false)
+    val showPresbyopiaSubField: LiveData<Boolean> = _showPresbyopiaSubField
+
+    private val _showTrachomaSubField = MutableLiveData<Boolean>(false)
+    val showTrachomaSubField: LiveData<Boolean> = _showTrachomaSubField
+
+    private val _showCornealSubField = MutableLiveData<Boolean>(false)
+    val showCornealSubField: LiveData<Boolean> = _showCornealSubField
+
+    private val _showVitaminASubField = MutableLiveData<Boolean>(false)
+    val showVitaminASubField: LiveData<Boolean> = _showVitaminASubField
+
+    private val _showCataractAlert = MutableLiveData<Boolean>(false)
+    val showCataractAlert: LiveData<Boolean> = _showCataractAlert
+
+    private val _showGlaucomaAlert = MutableLiveData<Boolean>(false)
+    val showGlaucomaAlert: LiveData<Boolean> = _showGlaucomaAlert
+
+    private val _showDrAlert = MutableLiveData<Boolean>(false)
+    val showDrAlert: LiveData<Boolean> = _showDrAlert
+
+    private val _showPresbyopiaAlert = MutableLiveData<Boolean>(false)
+    val showPresbyopiaAlert: LiveData<Boolean> = _showPresbyopiaAlert
+
+    private val _showTrachomaAlert = MutableLiveData<Boolean>(false)
+    val showTrachomaAlert: LiveData<Boolean> = _showTrachomaAlert
+
+    private val _showCornealAlert = MutableLiveData<Boolean>(false)
+    val showCornealAlert: LiveData<Boolean> = _showCornealAlert
+
+    private val _showVitaminAAlert = MutableLiveData<Boolean>(false)
+    val showVitaminAAlert: LiveData<Boolean> = _showVitaminAAlert
+
+    private val _showScreeningModule = MutableLiveData<Boolean>(false)
+    val showScreeningModule: LiveData<Boolean> = _showScreeningModule
+
+    private val _showCaseIdSection = MutableLiveData<Boolean>(false)
+    val showCaseIdSection: LiveData<Boolean> = _showCaseIdSection
+
+    private val _isCaseIdMandatory = MutableLiveData<Boolean>(false)
+    val isCaseIdMandatory: LiveData<Boolean> = _isCaseIdMandatory
+
+    private val _showChartSection = MutableLiveData<Boolean>(false)
+    val showChartSection: LiveData<Boolean> = _showChartSection
+
+    private val _showDistVASection = MutableLiveData<Boolean>(false)
+    val showDistVASection: LiveData<Boolean> = _showDistVASection
+
+    private val _showNearVASection = MutableLiveData<Boolean>(false)
+    val showNearVASection: LiveData<Boolean> = _showNearVASection
+
+    private val _showVisualImpairmentAlert = MutableLiveData<Boolean>(false)
+    val showVisualImpairmentAlert: LiveData<Boolean> = _showVisualImpairmentAlert
+
+    private val _canProceed = MutableLiveData<Boolean>(false)
+    val canProceed: LiveData<Boolean> = _canProceed
+
+    private val _showInjuryTraumaModule = MutableLiveData<Boolean>(false)
+    val showInjuryTraumaModule: LiveData<Boolean> = _showInjuryTraumaModule
+
+    private val _injuryTypes = MutableLiveData<List<String>>(emptyList())
+    val injuryTypes: LiveData<List<String>> = _injuryTypes
+
+    private val _foreignBodyRemoval = MutableLiveData<String?>()
+    val foreignBodyRemoval: LiveData<String?> = _foreignBodyRemoval
+
+    private val _chemicalExposure = MutableLiveData<Boolean?>()
+    val chemicalExposure: LiveData<Boolean?> = _chemicalExposure
+
+    private val _showForeignBodyRemovalField = MutableLiveData<Boolean>(false)
+    val showForeignBodyRemovalField: LiveData<Boolean> = _showForeignBodyRemovalField
+
+    private val _showChemicalExposureField = MutableLiveData<Boolean>(false)
+    val showChemicalExposureField: LiveData<Boolean> = _showChemicalExposureField
+
+    private val _showForeignBodyAlert = MutableLiveData<Boolean>(false)
+    val showForeignBodyAlert: LiveData<Boolean> = _showForeignBodyAlert
+
+    private val _showChemicalExposureAlert = MutableLiveData<Boolean>(false)
+    val showChemicalExposureAlert: LiveData<Boolean> = _showChemicalExposureAlert
+
+    private val _saveError = MutableLiveData<Boolean>(false)
+    val saveError: LiveData<Boolean> = _saveError
+
+    private var currentPatientId: String? = null
+    private var currentBenVisitNo: Int? = null
+
+    fun loadOphthalmicVisit(patientID: String, benVisitNo: Int, reasonForVisit: String) {
+        currentPatientId = patientID
+        currentBenVisitNo = benVisitNo
+        _reasonForVisit.value = reasonForVisit
+        _showScreeningModule.value = (reasonForVisit == DropdownConst.screening)
+        _showInjuryTraumaModule.value = isInjuryTraumaReason(reasonForVisit)
+        resetFields()
+
+        viewModelScope.launch {
+            try {
+                val patientDisplay = patientRepo.getPatientDisplay(patientID)
+                _benName.value = "${patientDisplay.patient.firstName ?: ""} ${patientDisplay.patient.lastName ?: ""}".trim()
+                val ageText = patientDisplay.patient.age ?: 0
+                val ageUnit = patientDisplay.ageUnit?.name ?: ""
+                val gender = patientDisplay.gender?.genderName ?: ""
+                _benAgeGender.value = "$ageText $ageUnit | $gender"
+
+                val visit = ophthalmicRepository.getOphthalmicVisit(patientID, benVisitNo)
+                if (visit != null) {
+                    _ophthalmicVisit.value = visit
+                    updateStateFromVisit(visit)
+                }
+            } catch (e: Exception) {
+                Timber.e(e, "Error loading ophthalmic visit")
+            }
+        }
+    }
+
+    fun resetFields() {
+        _isDiabetic.value = null
+        _isScreeningPerformed.value = null
+        _chartUsed.value = null
+        _distVARight.value = null
+        _distVALeft.value = null
+        _nearVA.value = null
+        _caseIdConditions.value = emptyList()
+        _injuryTypes.value = emptyList()
+        _foreignBodyRemoval.value = null
+        _chemicalExposure.value = null
+        _showForeignBodyRemovalField.value = false
+        _showChemicalExposureField.value = false
+        _showForeignBodyAlert.value = false
+        _showChemicalExposureAlert.value = false
+        _ophthalmicVisit.value = null
+        resetConditionSubFields()
+        updateSectionVisibility()
+        validate()
+    }
+
+    private fun resetConditionSubFields() {
+        _cataractSymptoms.value = null
+        _glaucomaSymptoms.value = null
+        _drSymptoms.value = null
+        _presbyopiaSymptoms.value = null
+        _trachomaStatus.value = null
+        _cornealDiseaseType.value = null
+        _vitaminADeficiency.value = null
+    }
+
+    private fun updateStateFromVisit(visit: OphthalmicVisit) {
+        _isDiabetic.value = visit.isDiabetic
+        _isScreeningPerformed.value = visit.screeningPerformed
+        _chartUsed.value = visit.visualAcuityChartUsed
+        _distVARight.value = visit.distVARight
+        _distVALeft.value = visit.distVALeft
+        _nearVA.value = visit.nearVA
+
+        visit.caseIdConditions?.let { json ->
+            try {
+                _caseIdConditions.value = moshiAdapter.fromJson(json) ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Error parsing caseIdConditions")
+                _caseIdConditions.value = emptyList()
+            }
+        } ?: run {
+            _caseIdConditions.value = emptyList()
+        }
+
+        _cataractSymptoms.value = visit.cataractSymptoms
+        _glaucomaSymptoms.value = visit.glaucomaSymptoms
+        _drSymptoms.value = visit.diabeticRetinopathySymptoms
+        _presbyopiaSymptoms.value = visit.presbyopiaSymptoms
+        _trachomaStatus.value = visit.trachomaStatus
+        _cornealDiseaseType.value = visit.cornealDiseaseType
+        _vitaminADeficiency.value = visit.vitaminADeficiency
+        _foreignBodyRemoval.value = visit.foreignBodyRemoval
+        _chemicalExposure.value = visit.chemicalExposure
+
+        visit.injuryType?.let { json ->
+            try {
+                _injuryTypes.value = moshiAdapter.fromJson(json) ?: emptyList()
+            } catch (e: Exception) {
+                Timber.e(e, "Error parsing injuryType")
+                _injuryTypes.value = emptyList()
+            }
+        } ?: run {
+            _injuryTypes.value = emptyList()
+        }
+
+        updateSectionVisibility()
+        deriveAlerts()
+        deriveInjuryAlerts()
+        validate()
+    }
+
+    // ─── Public setters ─────────────────────────────────────────────────────
+
+    fun setDiabeticStatus(isDiabetic: Boolean) {
+        _isDiabetic.value = isDiabetic
+        if (isDiabetic) {
+            _chartUsed.value = null
+            _nearVA.value = null
+        } else {
+            _isScreeningPerformed.value = null
+        }
+        _distVARight.value = null
+        _distVALeft.value = null
+        updateSectionVisibility()
+        validate()
+    }
+
+    fun setScreeningPerformed(performed: Boolean) {
+        _isScreeningPerformed.value = performed
+        if (!performed) {
+            _distVARight.value = null
+            _distVALeft.value = null
+        }
+        updateSectionVisibility()
+        validate()
+    }
+
+    fun setChartUsed(chart: String) {
+        _chartUsed.value = chart
+        _distVARight.value = null
+        _distVALeft.value = null
+        _nearVA.value = null
+        updateSectionVisibility()
+        validate()
+    }
+
+    fun setDistVARight(value: String) {
+        _distVARight.value = value
+        validate()
+    }
+
+    fun setDistVALeft(value: String) {
+        _distVALeft.value = value
+        validate()
+    }
+
+    fun setNearVA(value: String) {
+        _nearVA.value = value
+        validate()
+    }
+
+    fun setCaseIdConditions(conditions: List<String>) {
+        _caseIdConditions.value = conditions
+        clearRemovedConditionSubFields(conditions)
+        updateConditionSubFieldVisibility(conditions)
+        deriveAlerts()
+        validate()
+    }
+
+    fun setCataractSymptoms(hasSymptoms: Boolean) {
+        _cataractSymptoms.value = hasSymptoms
+        deriveAlerts()
+        validate()
+    }
+
+    fun setGlaucomaSymptoms(hasSymptoms: Boolean) {
+        _glaucomaSymptoms.value = hasSymptoms
+        deriveAlerts()
+        validate()
+    }
+
+    fun setDrSymptoms(hasSymptoms: Boolean) {
+        _drSymptoms.value = hasSymptoms
+        deriveAlerts()
+        validate()
+    }
+
+    fun setPresbyopiaSymptoms(hasSymptoms: Boolean) {
+        _presbyopiaSymptoms.value = hasSymptoms
+        deriveAlerts()
+        validate()
+    }
+
+    fun setTrachomaStatus(status: String) {
+        _trachomaStatus.value = status
+        deriveAlerts()
+        validate()
+    }
+
+    fun setCornealDiseaseType(type: String) {
+        _cornealDiseaseType.value = type
+        deriveAlerts()
+        validate()
+    }
+
+    fun setVitaminADeficiency(hasDeficiency: Boolean) {
+        _vitaminADeficiency.value = hasDeficiency
+        deriveAlerts()
+        validate()
+    }
+
+    fun setInjuryTypes(types: List<String>) {
+        _injuryTypes.value = types
+        clearRemovedInjuryFields(types)
+        updateInjuryFieldVisibility(types)
+        deriveInjuryAlerts()
+        validate()
+    }
+
+    fun setForeignBodyRemoval(value: String) {
+        _foreignBodyRemoval.value = value
+        deriveInjuryAlerts()
+        validate()
+    }
+
+    fun setChemicalExposure(value: Boolean) {
+        _chemicalExposure.value = value
+        deriveInjuryAlerts()
+        validate()
+    }
+
+    private fun clearRemovedInjuryFields(currentInjuryTypes: List<String>) {
+        if (!currentInjuryTypes.contains(DropdownConst.INJURY_MECHANICAL_FOREIGN_BODY)) {
+            _foreignBodyRemoval.value = null
+            _showForeignBodyAlert.value = false
+        }
+        if (!currentInjuryTypes.contains(DropdownConst.INJURY_CHEMICAL)) {
+            _chemicalExposure.value = null
+            _showChemicalExposureAlert.value = false
+        }
+    }
+
+    private fun updateInjuryFieldVisibility(injuryTypes: List<String>) {
+        _showForeignBodyRemovalField.value = injuryTypes.contains(DropdownConst.INJURY_MECHANICAL_FOREIGN_BODY)
+        _showChemicalExposureField.value = injuryTypes.contains(DropdownConst.INJURY_CHEMICAL)
+    }
+
+    private fun deriveInjuryAlerts() {
+        val injuryTypes = _injuryTypes.value ?: emptyList()
+        _showForeignBodyAlert.value = injuryTypes.contains(DropdownConst.INJURY_MECHANICAL_FOREIGN_BODY) &&
+                _foreignBodyRemoval.value == DropdownConst.FOREIGN_BODY_LODGED_IN_CORNEA
+        _showChemicalExposureAlert.value = injuryTypes.contains(DropdownConst.INJURY_CHEMICAL) &&
+                _chemicalExposure.value == true
+    }
+
+
+    private fun clearRemovedConditionSubFields(currentConditions: List<String>) {
+        if (!currentConditions.contains(DropdownConst.CONDITION_CATARACT)) {
+            _cataractSymptoms.value = null
+            _showCataractAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_GLAUCOMA)) {
+            _glaucomaSymptoms.value = null
+            _showGlaucomaAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_DIABETIC_RETINOPATHY)) {
+            _drSymptoms.value = null
+            _showDrAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_PRESBYOPIA)) {
+            _presbyopiaSymptoms.value = null
+            _showPresbyopiaAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_TRACHOMA)) {
+            _trachomaStatus.value = null
+            _showTrachomaAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_CORNEAL_DISEASE)) {
+            _cornealDiseaseType.value = null
+            _showCornealAlert.value = false
+        }
+        if (!currentConditions.contains(DropdownConst.CONDITION_DRY_EYE)) {
+            _vitaminADeficiency.value = null
+            _showVitaminAAlert.value = false
+        }
+    }
+
+    private fun updateConditionSubFieldVisibility(conditions: List<String>) {
+        _showCataractSubField.value = conditions.contains(DropdownConst.CONDITION_CATARACT)
+        _showGlaucomaSubField.value = conditions.contains(DropdownConst.CONDITION_GLAUCOMA)
+        _showDrSubField.value = conditions.contains(DropdownConst.CONDITION_DIABETIC_RETINOPATHY)
+        _showPresbyopiaSubField.value = conditions.contains(DropdownConst.CONDITION_PRESBYOPIA)
+        _showTrachomaSubField.value = conditions.contains(DropdownConst.CONDITION_TRACHOMA)
+        _showCornealSubField.value = conditions.contains(DropdownConst.CONDITION_CORNEAL_DISEASE)
+        _showVitaminASubField.value = conditions.contains(DropdownConst.CONDITION_DRY_EYE)
+    }
+
+    private fun deriveAlerts() {
+        val conditions = _caseIdConditions.value ?: emptyList()
+        _showCataractAlert.value = conditions.contains(DropdownConst.CONDITION_CATARACT) &&
+                (_cataractSymptoms.value ?: false)
+        _showGlaucomaAlert.value = conditions.contains(DropdownConst.CONDITION_GLAUCOMA) &&
+                (_glaucomaSymptoms.value ?: false)
+        _showDrAlert.value = conditions.contains(DropdownConst.CONDITION_DIABETIC_RETINOPATHY) &&
+                (_drSymptoms.value ?: false)
+        _showPresbyopiaAlert.value = conditions.contains(DropdownConst.CONDITION_PRESBYOPIA) &&
+                (_presbyopiaSymptoms.value ?: false)
+        val trachoma = _trachomaStatus.value
+        _showTrachomaAlert.value = conditions.contains(DropdownConst.CONDITION_TRACHOMA) &&
+                (trachoma == DropdownConst.TRACHOMA_SUSPECTED_ACTIVE ||
+                        trachoma == DropdownConst.TRACHOMA_SUSPECTED_TT)
+        _showCornealAlert.value = conditions.contains(DropdownConst.CONDITION_CORNEAL_DISEASE) &&
+                !_cornealDiseaseType.value.isNullOrEmpty()
+        _showVitaminAAlert.value = conditions.contains(DropdownConst.CONDITION_DRY_EYE) &&
+                (_vitaminADeficiency.value ?: false)
+    }
+
+    private fun updateSectionVisibility() {
+        val diabetic = _isDiabetic.value
+        val screening = _isScreeningPerformed.value
+        val chart = _chartUsed.value
+
+        _showChartSection.value = (diabetic?.not() ?: false)
+
+        _showDistVASection.value =
+            (diabetic ?: false) && (screening ?: false) ||
+                    (diabetic?.not() ?: false) && chart == DropdownConst.CHART_SNELLENS
+
+        _showNearVASection.value = (diabetic?.not() ?: false) && chart == DropdownConst.CHART_NEAR_VISION
+
+        val conditions = _caseIdConditions.value ?: emptyList()
+        updateConditionSubFieldVisibility(conditions)
+        val injuryTypes = _injuryTypes.value ?: emptyList()
+        updateInjuryFieldVisibility(injuryTypes)
+    }
+
+    enum class MissingField {
+        IS_DIABETIC,
+        SCREENING_PERFORMED,
+        CHART_USED,
+        DIST_VA_RIGHT,
+        DIST_VA_LEFT,
+        NEAR_VA,
+        CASE_ID,
+        CATARACT,
+        GLAUCOMA,
+        DR,
+        PRESBYOPIA,
+        TRACHOMA,
+        CORNEAL,
+        VITAMIN_A,
+        INJURY_TYPE,
+        FOREIGN_BODY_REMOVAL,
+        CHEMICAL_EXPOSURE,
+        NONE
+    }
+
+    private data class ValidationResult(
+        val fieldsValid: Boolean,
+        val alert: Boolean,
+        val caseIdByVA: Boolean
+    )
+
+    private fun validate() {
+        val reason = _reasonForVisit.value
+        val diabetic = _isDiabetic.value
+        val rightVA = _distVARight.value
+        val leftVA = _distVALeft.value
+        val nearVaValue = _nearVA.value
+        val caseIds = _caseIdConditions.value ?: emptyList()
+
+        val isMando = reason == DropdownConst.REASON_SYMPTOMATIC && (
+                isVisualImpairment(rightVA ?: "") ||
+                        isVisualImpairment(leftVA ?: "") ||
+                        isNearVAReduced(nearVaValue)
+                )
+        _isCaseIdMandatory.value = isMando
+
+        val result = when {
+            isInjuryTraumaReason(reason) ->
+                ValidationResult(
+                    fieldsValid = getMissingInjuryTraumaField() == MissingField.NONE,
+                    alert = false,
+                    caseIdByVA = false
+                )
+            reason == DropdownConst.REASON_SYMPTOMATIC -> {
+                val validCaseId = !isMando || caseIds.isNotEmpty()
+                val subFieldsValid = areVisibleSubFieldsAnswered()
+                ValidationResult(fieldsValid = validCaseId && subFieldsValid, alert = false, caseIdByVA = false)
+            }
+            reason == DropdownConst.screening && (diabetic ?: false) ->
+                validateDiabeticPath(rightVA, leftVA)
+            reason == DropdownConst.screening && (diabetic?.not() ?: false) ->
+                validateNonDiabeticPath(rightVA, leftVA, nearVaValue)
+            else ->
+                ValidationResult(fieldsValid = false, alert = false, caseIdByVA = false)
+        }
+
+        _showCaseIdSection.value = reason == DropdownConst.REASON_SYMPTOMATIC || result.caseIdByVA
+        _showVisualImpairmentAlert.value = result.alert
+        _canProceed.value = result.fieldsValid && !result.caseIdByVA
+    }
+
+    private fun validateDiabeticPath(rightVA: String?, leftVA: String?): ValidationResult {
+        val screening = _isScreeningPerformed.value
+        return when {
+            screening == null -> ValidationResult(fieldsValid = false, alert = false, caseIdByVA = false)
+            screening -> validateSnellenVA(rightVA, leftVA)
+            else -> ValidationResult(fieldsValid = true, alert = false, caseIdByVA = false)
+        }
+    }
+
+    private fun validateNonDiabeticPath(rightVA: String?, leftVA: String?, nearVaValue: String?): ValidationResult {
+        val chart = _chartUsed.value
+        return when {
+            chart == null -> ValidationResult(fieldsValid = false, alert = false, caseIdByVA = false)
+            chart == DropdownConst.CHART_SNELLENS -> validateSnellenVA(rightVA, leftVA)
+            chart == DropdownConst.CHART_NEAR_VISION -> validateNearVA(nearVaValue)
+            else -> ValidationResult(fieldsValid = false, alert = false, caseIdByVA = false)
+        }
+    }
+
+    private fun validateSnellenVA(rightVA: String?, leftVA: String?): ValidationResult {
+        val impaired = isVisualImpairment(rightVA ?: "") || isVisualImpairment(leftVA ?: "")
+        val bothFilled = rightVA != null && leftVA != null
+        return ValidationResult(fieldsValid = bothFilled, alert = impaired, caseIdByVA = impaired)
+    }
+
+    private fun validateNearVA(nearVaValue: String?): ValidationResult {
+        if (nearVaValue == null) {
+            return ValidationResult(fieldsValid = false, alert = false, caseIdByVA = false)
+        }
+        val reduced = isNearVAReduced(nearVaValue)
+        return ValidationResult(fieldsValid = true, alert = false, caseIdByVA = reduced)
+    }
+
+    private fun isVisualImpairment(va: String): Boolean {
+        return DropdownConst.visualImpairmentList.contains(va)
+    }
+
+    private fun isNearVAReduced(va: String?): Boolean {
+        return va != null && DropdownConst.nearVAReducedList.contains(va)
+    }
+
+    private fun areVisibleSubFieldsAnswered(): Boolean {
+        return getMissingSubField() == MissingField.NONE
+    }
+
+    private fun getMissingSubField(): MissingField {
+        val conditions = _caseIdConditions.value ?: return MissingField.NONE
+        if (conditions.contains(DropdownConst.CONDITION_CATARACT) && _cataractSymptoms.value == null) return MissingField.CATARACT
+        if (conditions.contains(DropdownConst.CONDITION_GLAUCOMA) && _glaucomaSymptoms.value == null) return MissingField.GLAUCOMA
+        if (conditions.contains(DropdownConst.CONDITION_DIABETIC_RETINOPATHY) && _drSymptoms.value == null) return MissingField.DR
+        if (conditions.contains(DropdownConst.CONDITION_PRESBYOPIA) && _presbyopiaSymptoms.value == null) return MissingField.PRESBYOPIA
+        if (conditions.contains(DropdownConst.CONDITION_TRACHOMA) && _trachomaStatus.value.isNullOrEmpty()) return MissingField.TRACHOMA
+        if (conditions.contains(DropdownConst.CONDITION_CORNEAL_DISEASE) && _cornealDiseaseType.value.isNullOrEmpty()) return MissingField.CORNEAL
+        if (conditions.contains(DropdownConst.CONDITION_DRY_EYE) && _vitaminADeficiency.value == null) return MissingField.VITAMIN_A
+        return MissingField.NONE
+    }
+
+    fun getMissingMandatoryField(): MissingField {
+        val reason = _reasonForVisit.value
+        return when (reason) {
+            DropdownConst.REASON_FIRST_AID_EYE_INJURY,
+            DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA -> getMissingInjuryTraumaField()
+            DropdownConst.REASON_SYMPTOMATIC -> getMissingSymptomaticField()
+            DropdownConst.screening -> getMissingScreeningField()
+            else -> MissingField.NONE
+        }
+    }
+
+    private fun getMissingInjuryTraumaField(): MissingField {
+        val injuries = _injuryTypes.value ?: emptyList()
+        if (injuries.isEmpty()) return MissingField.INJURY_TYPE
+        return MissingField.NONE
+    }
+
+    private fun isInjuryTraumaReason(reason: String?): Boolean {
+        return reason == DropdownConst.REASON_FIRST_AID_INJURY_TRAUMA ||
+                reason == DropdownConst.REASON_FIRST_AID_EYE_INJURY
+    }
+
+    private fun getMissingSymptomaticField(): MissingField {
+        val rightVA = _distVARight.value
+        val leftVA = _distVALeft.value
+        val caseIds = _caseIdConditions.value ?: emptyList()
+        val isMando = isVisualImpairment(rightVA ?: "") || isVisualImpairment(leftVA ?: "") || isNearVAReduced(_nearVA.value)
+        if (isMando && caseIds.isEmpty()) return MissingField.CASE_ID
+        return getMissingSubField()
+    }
+
+    private fun getMissingScreeningField(): MissingField {
+        val diabetic = _isDiabetic.value ?: return MissingField.IS_DIABETIC
+        return if (diabetic) getMissingDiabeticField() else getMissingNonDiabeticField()
+    }
+
+    private fun getMissingDiabeticField(): MissingField {
+        val screening = _isScreeningPerformed.value ?: return MissingField.SCREENING_PERFORMED
+        if (!screening) return MissingField.NONE
+        return getMissingDistanceVAField()
+    }
+
+    private fun getMissingNonDiabeticField(): MissingField {
+        val chart = _chartUsed.value ?: return MissingField.CHART_USED
+        return when (chart) {
+            DropdownConst.CHART_SNELLENS -> getMissingDistanceVAField()
+            DropdownConst.CHART_NEAR_VISION -> if (_nearVA.value == null) MissingField.NEAR_VA else MissingField.NONE
+            else -> MissingField.NONE
+        }
+    }
+
+    private fun getMissingDistanceVAField(): MissingField {
+        if (_distVARight.value == null) return MissingField.DIST_VA_RIGHT
+        if (_distVALeft.value == null) return MissingField.DIST_VA_LEFT
+        return MissingField.NONE
+    }
+
+    fun save(onSuccess: () -> Unit) {
+        _saveError.value = false
+        viewModelScope.launch {
+            try {
+                val user = userRepo.getLoggedInUser()
+                val patientId = currentPatientId ?: run {
+                    Timber.e("Cannot save: patientId is null")
+                    return@launch
+                }
+                val benVisitNo = currentBenVisitNo ?: run {
+                    Timber.e("Cannot save: benVisitNo is null")
+                    return@launch
+                }
+
+                val currentVisit = _ophthalmicVisit.value ?: OphthalmicVisit(
+                    patientID = patientId,
+                    benVisitNo = benVisitNo,
+                    createdBy = user?.userName ?: "Unknown",
+                    createdDate = Date().time,
+                    updatedBy = user?.userName ?: "Unknown",
+                    updatedDate = Date().time,
+                    syncState = 0
+                )
+
+                var conditionsJson: String? = null
+                val conditions = _caseIdConditions.value
+                if (!conditions.isNullOrEmpty()) {
+                    try {
+                        conditionsJson = moshiAdapter.toJson(conditions)
+                    } catch (e: Exception) {
+                        Timber.e(e, "Error converting conditions to JSON")
+                    }
+                }
+
+                currentVisit.apply {
+                    isDiabetic = _isDiabetic.value
+                    screeningPerformed = _isScreeningPerformed.value
+                    visualAcuityChartUsed = _chartUsed.value
+                    distVARight = _distVARight.value
+                    distVALeft = _distVALeft.value
+                    nearVA = _nearVA.value
+                    caseIdConditions = conditionsJson
+                    cataractSymptoms = _cataractSymptoms.value
+                    glaucomaSymptoms = _glaucomaSymptoms.value
+                    diabeticRetinopathySymptoms = _drSymptoms.value
+                    presbyopiaSymptoms = _presbyopiaSymptoms.value
+                    trachomaStatus = _trachomaStatus.value
+                    cornealDiseaseType = _cornealDiseaseType.value
+                    vitaminADeficiency = _vitaminADeficiency.value
+
+                    val injuryTypesVal = _injuryTypes.value
+                    injuryType = if (!injuryTypesVal.isNullOrEmpty()) {
+                        try { moshiAdapter.toJson(injuryTypesVal) } catch (e: Exception) {
+                            Timber.e(e, "Error converting injuryTypes to JSON")
+                            null
+                        }
+                    } else null
+                    foreignBodyRemoval = _foreignBodyRemoval.value
+                    chemicalExposure = _chemicalExposure.value
+
+                    updatedBy = user?.userName ?: "Unknown"
+                    updatedDate = Date().time
+                    syncState = 0
+                }
+
+                ophthalmicRepository.saveOphthalmicVisit(currentVisit)
+                onSuccess()
+            } catch (e: Exception) {
+                Timber.e(e, "Error saving ophthalmic visit")
+                _saveError.value = true
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormFragment.kt
new file mode 100644
index 000000000..534d2f1a0
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormFragment.kt
@@ -0,0 +1,77 @@
+package org.piramalswasthya.cho.ui.oral_health
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import androidx.recyclerview.widget.RecyclerView
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.Flow
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.databinding.FragmentOralHealthFormBinding
+import org.piramalswasthya.cho.model.FormElement
+import org.piramalswasthya.cho.model.MasterDb
+import org.piramalswasthya.cho.model.VisitMasterDb
+import org.piramalswasthya.cho.ui.commons.BaseAssessmentFormFragment
+import org.piramalswasthya.cho.ui.commons.DropdownConst
+import org.piramalswasthya.cho.work.WorkerUtils
+
+@AndroidEntryPoint
+class OralHealthFormFragment : BaseAssessmentFormFragment<OralHealthFormViewModel>() {
+
+    private var _binding: FragmentOralHealthFormBinding? = null
+    private val binding get() = _binding!!
+
+    private val args: OralHealthFormFragmentArgs by navArgs()
+
+    override val viewModel: OralHealthFormViewModel by viewModels()
+
+    override val inputFormRecyclerView: RecyclerView get() = binding.form.rvInputForm
+    override val contentLayout: View get() = binding.llContent
+    override val progressBar: View get() = binding.pbForm
+    override val benNameTextView: TextView get() = binding.tvBenName
+    override val ageGenderTextView: TextView get() = binding.tvAgeGender
+    override val submitButton: View get() = binding.btnSubmit
+    override val cancelButton: View get() = binding.btnCancel
+
+    override fun getFormTitle(): String = getString(R.string.title_oral_health)
+    override fun getSaveSuccessMessage(): String = getString(R.string.oral_health_saved)
+    override fun getFormFlow(): Flow<List<FormElement>> = viewModel.formList
+    override fun onUpdateFormValue(formId: Int, index: Int) =
+        viewModel.updateListOnValueChanged(formId, index)
+    override fun onSaveForm() = viewModel.saveForm()
+    override fun getFragmentId(): Int = R.id.fragment_oral_health_form
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentOralHealthFormBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        activity?.findViewById<TextView>(R.id.header_text_register_patient)?.text = getFormTitle()
+    }
+
+    // Stamp Oral Health visit metadata onto MasterDb from arguments and navigate to vitals.
+    override fun onSaveSuccess() {
+        WorkerUtils.oralPushWorker(requireContext())
+        navigateToCphcVitalsAfterSave(
+            subCategory = DropdownConst.oral,
+            reasonForVisit = DropdownConst.dental,
+            requireMasterDb = true,
+        )
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormViewModel.kt
new file mode 100644
index 000000000..37f83ae51
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/oral_health/OralHealthFormViewModel.kt
@@ -0,0 +1,81 @@
+package org.piramalswasthya.cho.ui.oral_health
+
+import android.content.Context
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.configuration.OralHealthDataset
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.model.OralHealth
+import org.piramalswasthya.cho.repositories.OralHealthRepo
+import org.piramalswasthya.cho.repositories.PatientRepo
+import org.piramalswasthya.cho.repositories.UserRepo
+import org.piramalswasthya.cho.ui.commons.BaseFormViewModel
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class OralHealthFormViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    preferenceDao: PreferenceDao,
+    @ApplicationContext context: Context,
+    private val patientRepo: PatientRepo,
+    private val userRepo: UserRepo,
+    private val oralHealthRepo: OralHealthRepo
+) : BaseFormViewModel() {
+
+    val patientID: String? = savedStateHandle["patientID"]
+    val benVisitNo: Int? = savedStateHandle["benVisitNo"]
+
+    private val dataset = OralHealthDataset(context, preferenceDao.getCurrentLanguage())
+    val formList = dataset.listFlow
+
+    private lateinit var oralHealthCache: OralHealth
+
+    init {
+        viewModelScope.launch {
+            try {
+                val patient = loadPatientDetails(userRepo, patientRepo, patientID) ?: return@launch
+
+                val existingRecord = if (benVisitNo != null) {
+                    oralHealthRepo.getByPatientIdAndVisitNo(
+                        patient.patient.patientID,
+                        benVisitNo
+                    )
+                } else {
+                    oralHealthRepo.getByPatientId(patient.patient.patientID)
+                }
+
+                oralHealthCache = existingRecord ?: OralHealth(
+                    patientID = patient.patient.patientID,
+                    benVisitNo = benVisitNo
+                )
+
+                dataset.onShowAlert = { _showAlert.postValue(it) }
+                dataset.setUpPage(savedRecord = existingRecord)
+            } catch (e: Exception) {
+                Timber.e(e, "Error initializing OralHealthFormViewModel")
+            }
+        }
+    }
+
+    fun updateListOnValueChanged(formId: Int, index: Int) {
+        launchUpdateList(dataset, formId, index, "Error updating oral health form")
+    }
+
+    fun saveForm() {
+        launchSave("Saving oral health form failed") {
+            check(::oralHealthCache.isInitialized) { "Oral health cache not initialized" }
+            dataset.mapValues(oralHealthCache, 1)
+            if (oralHealthCache.oralHealthId == 0L) {
+                val user = userRepo.getLoggedInUser()
+                oralHealthCache.createdDate = System.currentTimeMillis()
+                oralHealthCache.createdBy = user?.userName
+            }
+            oralHealthRepo.save(oralHealthCache)
+        }
+    }
+}
+
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/OutreachActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/OutreachActivity.kt
index 6fc387bc7..e18e02406 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/OutreachActivity.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/OutreachActivity.kt
@@ -34,15 +34,15 @@ class OutreachActivity : AppCompatActivity() {
         navHostFragment.navController.addOnDestinationChangedListener { controller, destination, arguments ->
             when (destination.id) {
                 R.id.outreachActiviityListFragment -> {
-                    binding.headerTextRegisterPatient.text = "Previous Activity"
+                    binding.headerTextRegisterPatient.text = getString(R.string.previous_activity)
                     binding.plusButton.visibility = View.VISIBLE
                 }
                 R.id.outreachActivityDetailsFragment -> {
-                    binding.headerTextRegisterPatient.text = "Activity Details"
+                    binding.headerTextRegisterPatient.text = getString(R.string.activity_details)
                     binding.plusButton.visibility = View.GONE
                 }
                 R.id.outreachActivityFormFragment -> {
-                    binding.headerTextRegisterPatient.text = "Activity Form"
+                    binding.headerTextRegisterPatient.text = getString(R.string.activity_form)
                     binding.plusButton.visibility = View.GONE
                 }
             }
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/outreach_activity_form/OutreachActivityFormFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/outreach_activity_form/OutreachActivityFormFragment.kt
index 9e39d1fe9..67ea6f8f4 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/outreach_activity_form/OutreachActivityFormFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/outreach_activity/outreach_activity_form/OutreachActivityFormFragment.kt
@@ -1,7 +1,6 @@
 package org.piramalswasthya.cho.ui.outreach_activity.outreach_activity_form
 
 import android.Manifest
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
@@ -18,13 +17,14 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
 import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
 import dagger.hilt.android.AndroidEntryPoint
 import org.piramalswasthya.cho.BuildConfig
 import org.piramalswasthya.cho.R
 import org.piramalswasthya.cho.databinding.FragmentOutreachActivityFormBinding
-import org.piramalswasthya.cho.ui.outreach_activity.OutreachActivity
+
 import org.piramalswasthya.cho.utils.DateTimeUtil
 import org.piramalswasthya.cho.utils.ImgUtils
 import org.piramalswasthya.cho.utils.nullIfEmpty
@@ -149,7 +149,7 @@ class OutreachActivityFormFragment : Fragment() {
                     inputDate == formattedDate
                 }
                 if (isDateExist) {
-                    Toast.makeText(requireContext(),"Events for this Date already exist",Toast.LENGTH_SHORT ).show()
+                    Toast.makeText(requireContext(), getString(R.string.events_for_date_already_exist), Toast.LENGTH_SHORT).show()
                     return@setOnClickListener;
                 }
 
@@ -179,8 +179,7 @@ class OutreachActivityFormFragment : Fragment() {
             viewModel.isDataSaved.observe(viewLifecycleOwner) {
                 when (it) {
                     true -> {
-                        requireActivity().finish()
-                        startActivity(Intent(requireContext(), OutreachActivity::class.java))
+                        findNavController().popBackStack(R.id.outreachActiviityListFragment, false)
                         binding.rlSaving.visibility = View.GONE
                     }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/RegisterPatientActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/RegisterPatientActivity.kt
index feb5de30a..b780262db 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/RegisterPatientActivity.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/RegisterPatientActivity.kt
@@ -1,10 +1,13 @@
 package org.piramalswasthya.cho.ui.register_patient_activity
 
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.EntryPoint
 import dagger.hilt.InstallIn
@@ -19,7 +22,6 @@ import org.piramalswasthya.cho.facenet.SharedViewModel
 import org.piramalswasthya.cho.helpers.MyContextWrapper
 import org.piramalswasthya.cho.model.PatientDetails
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
 
 @AndroidEntryPoint
 class RegisterPatientActivity : AppCompatActivity() {
@@ -66,13 +68,50 @@ class RegisterPatientActivity : AppCompatActivity() {
 
         navHostFragment = supportFragmentManager.findFragmentById(binding.patientRegistration.id) as NavHostFragment
 
+        // Adjust bottom action buttons to sit above system navigation (Android 10+ gesture/3‑button bar)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomNavigation) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updateLayoutParams<ConstraintLayout.LayoutParams> {
+                bottomMargin = systemBars.bottom
+            }
+            insets
+        }
+
         navHostFragment.navController.addOnDestinationChangedListener { controller, destination, arguments ->
             when (destination.id) {
                 R.id.patientDetailsFragment -> {
                     binding.headerTextRegisterPatient.text = resources.getString(R.string.personal_information)
+                    binding.bottomNavigation.visibility = android.view.View.VISIBLE
                     binding.btnSubmit.text = resources.getString(R.string.submit_btn_text)
                     binding.btnCancel.text = resources.getString(R.string.cancel)
                 }
+                else -> {
+                    binding.bottomNavigation.visibility = android.view.View.VISIBLE
+                }
+            }
+        }
+
+        if (intent.getBooleanExtra("isEdit", false)) {
+
+            val patientInfo =
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+                    intent.getSerializableExtra(
+                        "patientInfo",
+                        org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo::class.java
+                    )
+                } else {
+                    @Suppress("DEPRECATION")
+                    intent.getSerializableExtra("patientInfo")
+                            as? org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+                }
+
+            patientInfo?.let {
+                val graph = navHostFragment.navController.navInflater.inflate(R.navigation.register_nav)
+                val bundle = Bundle().apply {
+                    putSerializable("patientInfo", it)
+                    putBoolean("isEditMode", true)
+                }
+                navHostFragment.navController.setGraph(graph, bundle)
             }
         }
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/location_details/LocationViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/location_details/LocationViewModel.kt
index 1d1d70141..75dea1c16 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/location_details/LocationViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/location_details/LocationViewModel.kt
@@ -7,29 +7,21 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.database.room.dao.UserDao
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
-import org.piramalswasthya.cho.model.LocationRequest
 import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.UserCache
 import org.piramalswasthya.cho.network.AmritApiService
-import org.piramalswasthya.cho.network.BlockList
 import org.piramalswasthya.cho.network.District
 import org.piramalswasthya.cho.network.DistrictBlock
-import org.piramalswasthya.cho.network.DistrictList
-import org.piramalswasthya.cho.network.NetworkResult
 import org.piramalswasthya.cho.network.State
-import org.piramalswasthya.cho.network.StateList
 import org.piramalswasthya.cho.network.Village
-import org.piramalswasthya.cho.network.VillageList
 import org.piramalswasthya.cho.repositories.BlockMasterRepo
 import org.piramalswasthya.cho.repositories.DistrictMasterRepo
 import org.piramalswasthya.cho.repositories.LoginSettingsDataRepository
 import org.piramalswasthya.cho.repositories.PatientRepo
 import org.piramalswasthya.cho.repositories.StateMasterRepo
 import org.piramalswasthya.cho.repositories.VillageMasterRepo
-import org.piramalswasthya.cho.ui.login_activity.login_settings.LoginSettingsViewModel
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/other_informations/OtherInformationsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/other_informations/OtherInformationsFragment.kt
index 827c0119b..8e2459fe5 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/other_informations/OtherInformationsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/other_informations/OtherInformationsFragment.kt
@@ -1,6 +1,6 @@
 package org.piramalswasthya.cho.ui.register_patient_activity.other_informations
 
-import android.content.Intent
+
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -16,7 +16,7 @@ import org.piramalswasthya.cho.databinding.FragmentOtherInformationsBinding
 import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.SpeechToTextContract
-import org.piramalswasthya.cho.ui.home_activity.HomeActivity
+
 import org.piramalswasthya.cho.utils.generateUuid
 
 @AndroidEntryPoint
@@ -109,9 +109,7 @@ class OtherInformationsFragment : Fragment() , NavigationAdapter {
             patient!!.patientID = generateUuid()
             viewModel.insertPatient(patient!!)
         }
-        val intent = Intent(context, HomeActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(intent)
+        requireActivity().finish()
     }
 
     fun updatePatientDetails(){
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsFragment.kt
index 56e2f0de1..bb16d5f49 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsFragment.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsFragment.kt
@@ -15,8 +15,10 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
+import android.view.MotionEvent
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.AutoCompleteTextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
@@ -33,7 +35,7 @@ import com.google.mediapipe.tasks.core.BaseOptions
 import com.google.mediapipe.tasks.vision.core.RunningMode
 import com.google.mediapipe.tasks.vision.facedetector.FaceDetector
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
+import org.piramalswasthya.cho.coroutines.DispatcherProvider
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.piramalswasthya.cho.R
@@ -48,15 +50,20 @@ import org.piramalswasthya.cho.facenet.Models
 import org.piramalswasthya.cho.facenet.SharedViewModel
 import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.PatientAadhaarDetails
+import org.piramalswasthya.cho.database.room.SyncState
 import org.piramalswasthya.cho.model.VillageLocationData
+import kotlin.math.pow
 import org.piramalswasthya.cho.ui.commons.NavigationAdapter
 import org.piramalswasthya.cho.ui.commons.SpeechToTextContract
 import org.piramalswasthya.cho.ui.edit_patient_details_activity.EditPatientDetailsActivity
 import org.piramalswasthya.cho.ui.register_patient_activity.scanAadhaar.ScanAadhaarActivity
+import org.piramalswasthya.cho.ui.register_patient_activity.RegisterPatientActivity
 import org.piramalswasthya.cho.utils.DateTimeUtil
 import org.piramalswasthya.cho.utils.ImgUtils
 import org.piramalswasthya.cho.utils.generateUuid
 import org.piramalswasthya.cho.utils.setBoxColor
+import org.piramalswasthya.cho.utils.setupDropdownKeyboardHandling
+import org.piramalswasthya.cho.utils.KeyboardUtils
 import org.piramalswasthya.cho.work.WorkerUtils
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserFactory
@@ -69,6 +76,8 @@ import java.util.Locale
 import javax.inject.Inject
 import android.text.InputType
 import android.view.inputmethod.InputMethodManager
+import android.text.InputFilter
+import android.util.Log
 
 
 @RequiresApi(Build.VERSION_CODES.O)
@@ -78,6 +87,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
     @Inject
     lateinit var preferenceDao: PreferenceDao
 
+    @Inject
+    lateinit var dispatcherProvider: DispatcherProvider
+
     private val binding by lazy{
         FragmentPatientDetailsBinding.inflate(layoutInflater)
     }
@@ -88,11 +100,16 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
     private var patient = Patient()
     private lateinit var villageAdapter :VillageDropdownAdapter
     private var isSettingVillageProgrammatically = false
+    private var isAgeChangedInEditMode = false
+    private var isMaritalStatusChangedInEditMode = false
+    private var isProgrammaticChange = false
+    private var isReadOnly = false
+    private var isEditModeAfterRegistration = false
     private val dobUtil : DateTimeUtil = DateTimeUtil()
     var bool: Boolean = false
     private var currentFileName: String? = null
     private var currentPhotoPath: String? = null
-    private lateinit var  photoURI: Uri
+    private var photoURI: Uri? = null
 
     //facenet
     private val useGpu = false
@@ -103,11 +120,26 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
     private lateinit var dialog: AlertDialog
     private val sharedViewModel: SharedViewModel by activityViewModels()
 
+    private var statusOfWomanAdapter: DropdownAdapter? = null
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        photoURI?.let { outState.putParcelable("photoURI", it) }
+        outState.putString("currentFileName", currentFileName)
+        outState.putString("currentPhotoPath", currentPhotoPath)
+    }
+
     @RequiresApi(Build.VERSION_CODES.P)
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        if (savedInstanceState != null) {
+            @Suppress("DEPRECATION")
+            photoURI = savedInstanceState.getParcelable("photoURI")
+            currentFileName = savedInstanceState.getString("currentFileName")
+            currentPhotoPath = savedInstanceState.getString("currentPhotoPath")
+        }
         binding.ivImgCapture.setOnClickListener {
             if (::dialog.isInitialized && dialog.isShowing) {
                 dialog.dismiss()
@@ -124,9 +156,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             dialog = builder.create()
             dialog.show()
 
-            lifecycleScope.launch(Dispatchers.IO) {
+            lifecycleScope.launch(dispatcherProvider.io) {
                 faceNetModel = FaceNetModel(requireActivity(), modelInfo, useGpu, useXNNPack)
-                withContext(Dispatchers.Main) {
+                withContext(dispatcherProvider.main) {
                     if (isAdded) {
                         dialog.dismiss()
                         checkAndRequestCameraPermission()
@@ -158,9 +190,12 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
     private val takePictureLauncher =
         registerForActivityResult(ActivityResultContracts.TakePicture()) { result: Boolean ->
             if (result) {
-                // Picture was taken successfully, update the ImageView with the captured image
-                Glide.with(this).load(photoURI).placeholder(R.drawable.ic_person).circleCrop()
-                    .into(binding.ivImgCapture)
+                val uri = photoURI
+                if (uri == null) {
+                    Toast.makeText(requireContext(), "Photo capture failed. Please try again.", Toast.LENGTH_SHORT).show()
+                    return@registerForActivityResult
+                }
+                // Do NOT show the captured image yet — wait for face detection to pass first
 
                 try {
                     // Initialize MediaPipe Face Detector
@@ -169,20 +204,28 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
 
                     val options = FaceDetector.FaceDetectorOptions.builder()
                         .setBaseOptions(baseOptionsBuilder.build())
-                        .setMinDetectionConfidence(0.5f)
+                        .setMinDetectionConfidence(0.75f)
                         .setRunningMode(RunningMode.IMAGE)
                         .build()
 
                     val faceDetector = FaceDetector.createFromOptions(requireContext(), options)
 
-                    // Load image from URI
+                    // Load image from URI, downsampled to avoid OOM on high-res cameras
+                    val maxDimension = 1024
                     val imageBitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                        val source = ImageDecoder.createSource(requireContext().contentResolver, photoURI)
-                        ImageDecoder.decodeBitmap(source).copy(Bitmap.Config.ARGB_8888, true)
+                        val source = ImageDecoder.createSource(requireContext().contentResolver, uri)
+                        ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
+                            val size = info.size
+                            val sampleSize = maxOf(size.width, size.height) / maxDimension
+                            if (sampleSize > 1) {
+                                decoder.setTargetSampleSize(sampleSize)
+                            }
+                            decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+                        }
                     } else {
                         @Suppress("DEPRECATION")
-                        MediaStore.Images.Media.getBitmap(requireContext().contentResolver, photoURI)
-                    }
+                        MediaStore.Images.Media.getBitmap(requireContext().contentResolver, uri)
+                    }.copy(Bitmap.Config.ARGB_8888, true)
 
                     // Convert to MPImage
                     val mpImage = BitmapImageBuilder(imageBitmap).build()
@@ -193,16 +236,29 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                     // Handle detection results
                     when {
                         detectionResult.detections().isEmpty() -> {
-                            Toast.makeText(requireContext(), "No face detected", Toast.LENGTH_SHORT).show()
+                            // No face — keep the placeholder, show toast
+                            embeddings = null
+                            photoURI = null
+                            currentFileName = null
+                            currentPhotoPath = null
+                            Toast.makeText(requireContext(), getString(R.string.no_face_detected), Toast.LENGTH_SHORT).show()
                             binding.ivImgCapture.setImageResource(R.drawable.ic_person)
                             faceDetector.close()
                         }
                         detectionResult.detections().size > 1 -> {
-                            Toast.makeText(requireContext(), "Multiple faces detected", Toast.LENGTH_SHORT).show()
+                            embeddings = null
+                            photoURI = null
+                            currentFileName = null
+                            currentPhotoPath = null
+                            Toast.makeText(requireContext(), getString(R.string.multiple_faces_detected), Toast.LENGTH_SHORT).show()
                             binding.ivImgCapture.setImageResource(R.drawable.ic_person)
                             faceDetector.close()
                         }
                         else -> {
+                            // Face found — now show the captured photo
+                            Glide.with(this).load(uri).placeholder(R.drawable.ic_person).circleCrop()
+                                .into(binding.ivImgCapture)
+
                             val detection = detectionResult.detections()[0]
                             val boundingBox = detection.boundingBox()
 
@@ -216,7 +272,11 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
 
                             // Validate dimensions
                             if (width <= 0 || height <= 0 || left >= imageBitmap.width || top >= imageBitmap.height) {
-                                Toast.makeText(requireContext(), "Invalid face detection", Toast.LENGTH_SHORT).show()
+                                embeddings = null
+                                photoURI = null
+                                currentFileName = null
+                                currentPhotoPath = null
+                                Toast.makeText(requireContext(), getString(R.string.invalid_face_detection), Toast.LENGTH_SHORT).show()
                                 binding.ivImgCapture.setImageResource(R.drawable.ic_person)
                                 faceDetector.close()
                                 return@registerForActivityResult
@@ -231,17 +291,44 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                                 height
                             )
 
-                            // Clean up detector
+                            // Clean up detectoar
                             faceDetector.close()
 
                             // Get face embeddings
                             embeddings = faceNetModel.getFaceEmbedding(faceBitmap)
-                            Toast.makeText(requireContext(), "Face Embeddings Generated", Toast.LENGTH_SHORT).show()
+
+                            if (embeddings == null) {
+                                photoURI = null
+                                currentFileName = null
+                                currentPhotoPath = null
+                                Toast.makeText(requireContext(), getString(R.string.failed_to_generate_face_embeddings), Toast.LENGTH_SHORT).show()
+                                binding.ivImgCapture.setImageResource(R.drawable.ic_person)
+                                return@registerForActivityResult
+                            }
+
+                            lifecycleScope.launch(dispatcherProvider.io) {
+                                val matchedPatient = compareFacesL2Norm(embeddings!!)
+                                withContext(dispatcherProvider.main) {
+                                    if (matchedPatient != null) {
+                                        val patientInfo = viewModel.patientRepo.getPatientDisplayListForNurseByPatient(matchedPatient.patientID)
+                                        populateForm(patientInfo)
+                                        isEditModeAfterRegistration = true
+                                        setFormEditable(true)
+                                        Toast.makeText(requireContext(), "Existing beneficiary found. You can edit and update.", Toast.LENGTH_LONG).show()
+                                    } else {
+                                        Toast.makeText(requireContext(), "Face Embeddings Generated", Toast.LENGTH_SHORT).show()
+                                    }
+                                }
+                            }
                         }
                     }
 
                 } catch (e: Exception) {
-                    Toast.makeText(requireContext(), "Face detection failed: ${e.message}", Toast.LENGTH_SHORT).show()
+                    embeddings = null
+                    photoURI = null
+                    currentFileName = null
+                    currentPhotoPath = null
+                    Toast.makeText(requireContext(), getString(R.string.face_detection_failed, e.message.orEmpty()), Toast.LENGTH_SHORT).show()
                     binding.ivImgCapture.setImageResource(R.drawable.ic_person)
                 }
             }
@@ -256,12 +343,13 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         }
 
         photoFile?.also {
-            photoURI = FileProvider.getUriForFile(
+            val uri = FileProvider.getUriForFile(
                 requireContext(),
                 requireContext().packageName + ".provider",
                 it
             )
-            takePictureLauncher.launch(photoURI)
+            photoURI = uri
+            takePictureLauncher.launch(uri)
         }
     }
     private fun createImageFile(): File {
@@ -296,38 +384,266 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
 
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         viewModel = ViewModelProvider(this)[PatientDetailsViewModel::class.java]
+
+        initializeUI()
+        setupViewModelObservers()
+        handleArguments()
+        setupClickListeners()
+        setupNameFieldsInputFilters()
+    }
+
+    private fun initializeUI() {
+        // Initial button state
+        updateActivityButtons()
         hideMarriedFields()
         setChangeListeners()
         setAdapters()
         setupVillageDropdown()
+        setupStatusOfWomanDropdown()
+
+        enableFullBoxClick(binding.genderDropdown)
+        enableFullBoxClick(binding.maritalStatusDropdown)
+        enableFullBoxClick(binding.statusOfWomanDropdown)
+    }
+
+    private fun setupViewModelObservers() {
+        viewModel.isDataSaved.observe(viewLifecycleOwner) { state ->
+            if (state == true) {
+                if (isEditModeAfterRegistration) {
+                    WorkerUtils.triggerBeneficiarySync(requireContext())
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.patient_edited_successfully_title),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    requireActivity().finish()
+                } else {
+                    WorkerUtils.triggerBeneficiarySync(requireContext())
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.patient_registered_successfully_title),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    requireActivity().finish()
+                }
+                viewModel.setIsDataSaved(null)
+            }
+        }
 
         sharedViewModel.photoUri.observe(viewLifecycleOwner) { uriString ->
-            val photoUri = Uri.parse(uriString)
-            Glide.with(this).load(photoUri).placeholder(R.drawable.ic_person).circleCrop().into(binding.ivImgCapture)}
+            // Only update when a real photo URI is available (skip the empty string set in edit mode)
+            if (!uriString.isNullOrEmpty()) {
+                val photoUri = Uri.parse(uriString)
+                Glide.with(this).load(photoUri).placeholder(R.drawable.ic_person).circleCrop()
+                    .into(binding.ivImgCapture)
+            }
+        }
         sharedViewModel.faceVector.observe(viewLifecycleOwner) { faceVector ->
             embeddings = faceVector
         }
+    }
 
+    private fun handleArguments() {
+        val patientInfo = getPatientInfo(arguments) ?: getPatientInfo(activity?.intent)
+        val isEditMode = arguments?.getBoolean("isEditMode", false)
+            ?: activity?.intent?.getBooleanExtra("isEdit", false)
+            ?: activity?.intent?.getBooleanExtra("isEditMode", false)
+            ?: false
+
+        if (patientInfo != null) {
+            populateForm(patientInfo)
+            if (isEditMode) {
+                isEditModeAfterRegistration = true
+                setFormEditable(true)
+            } else {
+                setFormEditable(false)
+            }
+        }
+    }
 
+    private fun getPatientInfo(bundleSource: Bundle?): org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo? {
+        if (bundleSource == null) return null
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            bundleSource.getSerializable(
+                "patientInfo",
+                org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo::class.java
+            )
+        } else {
+            @Suppress("DEPRECATION")
+            bundleSource.getSerializable("patientInfo") as? org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+        }
+    }
+
+    private fun getPatientInfo(intentSource: Intent?): org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo? {
+        if (intentSource == null) return null
+
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            intentSource.getSerializableExtra(
+                "patientInfo",
+                org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo::class.java
+            )
+        } else {
+            @Suppress("DEPRECATION")
+            intentSource.getSerializableExtra("patientInfo") as? org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setupClickListeners() {
+        setupDobClickListener()
+        setupSpeechToTextClickListeners()
+        setupOtherClickListeners()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setupDobClickListener() {
+        binding.dateOfBirthText.setEndIconOnClickListener {
+            if (binding.dateOfBirth.isEnabled) {
+                // Hide keyboard when clicking on date of birth field
+                KeyboardUtils.hideKeyboard(binding.dateOfBirth)
+                KeyboardUtils.hideKeyboardFromActivity(requireContext())
+
+                dobUtil.showDatePickerDialog(
+                    requireContext(),
+                    viewModel.selectedDateOfBirth,
+                    maxDays = 0,
+                    minDays = -(99 * 365 + 25)
+                ).show()
+            }
+        }
+    }
+
+    private fun setupSpeechToTextClickListeners() {
         binding.firstNameText.setEndIconOnClickListener {
-            speechToTextLauncherForFirstName.launch(Unit)
+            if (binding.firstName.isEnabled) speechToTextLauncherForFirstName.launch(Unit)
         }
         binding.lastNameText.setEndIconOnClickListener {
-            speechToTextLauncherForLastName.launch(Unit)
+            if (binding.lastName.isEnabled) speechToTextLauncherForLastName.launch(Unit)
         }
         binding.phoneNoText.setEndIconOnClickListener {
-            speechToTextLauncherForPhoneNumber.launch(Unit)
+            if (binding.phoneNo.isEnabled) speechToTextLauncherForPhoneNumber.launch(Unit)
         }
         binding.spouseNameText.setEndIconOnClickListener {
-            speechToTextLauncherForSpouseName.launch(Unit)
+            if (binding.spouseName.isEnabled) speechToTextLauncherForSpouseName.launch(Unit)
         }
         binding.fatherNameText.setEndIconOnClickListener {
-            speechToTextLauncherForFatherName.launch(Unit)
+            if (binding.fatherNameEditText.isEnabled) speechToTextLauncherForFatherName.launch(Unit)
         }
 
+        binding.ageAtMarriageText.setEndIconOnClickListener {
+            if (binding.ageAtMarriage.isEnabled) speechToTextLauncherForAgeAtMarriage.launch(Unit)
+        }
+    }
+
+    private fun setupOtherClickListeners() {
         binding.age.setOnClickListener {
-            ageAlertDialog.show()
+            if (binding.age.isEnabled) {
+                ageAlertDialog.show()
+            }
+        }
+
+        binding.fabEdit.setOnClickListener {
+            isEditModeAfterRegistration = true
+            setFormEditable(true)
+        }
+    }
+
+    private fun setupNameFieldsInputFilters() {
+        val nameFilter = InputFilter { source, start, end, dest, dstart, dend ->
+            for (i in start until end) {
+                val char = source[i]
+                if (!char.isLetter() && char != ' ' && char != '-') {
+                    return@InputFilter ""
+                }
+            }
+            null
+        }
+        binding.firstName.filters = arrayOf(nameFilter)
+        binding.lastName.filters = arrayOf(nameFilter)
+        binding.fatherNameEditText.filters = arrayOf(nameFilter)
+        binding.spouseName.filters = arrayOf(nameFilter)
+    }
+
+    private fun setFormEditable(isEditable: Boolean) {
+        isReadOnly = !isEditable
+        isAgeChangedInEditMode = false
+        isMaritalStatusChangedInEditMode = false
+        binding.lastName.isEnabled = isEditable
+        binding.phoneNo.isEnabled = isEditable
+        binding.statusOfWomanDropdown.isEnabled = isEditable
+        binding.age.isEnabled = isEditable
+        binding.ageInUnitDropdown.isEnabled = isEditable
+        val isCoreEditable = isEditable && !isEditModeAfterRegistration
+        binding.firstName.isEnabled = isCoreEditable
+        binding.genderDropdown.isEnabled = isCoreEditable
+        binding.dateOfBirth.isEnabled = isCoreEditable
+
+        val canEditAgeDependentFields = isEditable && (!isEditModeAfterRegistration || isAgeChangedInEditMode)
+        binding.maritalStatusDropdown.isEnabled = canEditAgeDependentFields
+
+        binding.spouseName.isEnabled = isCoreEditable
+        binding.villageDropdown.isEnabled = isCoreEditable
+        binding.ivImgCapture.isEnabled = isCoreEditable
+        binding.tvSubTitlePhoto.visibility = if (isCoreEditable) View.VISIBLE else View.GONE
+        binding.btnScanAadhaar.isEnabled = isCoreEditable
+
+        // Disable end icons (mic/dropdown/calendar) for non-editable fields
+        binding.firstNameText.isEndIconVisible = binding.firstName.isEnabled
+        binding.lastNameText.isEndIconVisible = binding.lastName.isEnabled
+        binding.phoneNoText.isEndIconVisible = binding.phoneNo.isEnabled
+        val isUnmarried = isUnmarriedStatus(
+            viewModel.selectedMaritalStatus?.maritalStatusID,
+            viewModel.selectedMaritalStatus?.status
+        )
+        val isChild = (viewModel.enteredAgeYears ?: 0) < 15
+        val canEditFatherName = isEditable && (isUnmarried || isChild || !isEditModeAfterRegistration)
+        binding.fatherNameEditText.isEnabled = canEditFatherName
+        binding.spouseNameText.isEndIconVisible = binding.spouseName.isEnabled
+        binding.fatherNameText.isEndIconVisible = binding.fatherNameEditText.isEnabled
+        binding.ageAtMarriageText.isEndIconVisible = binding.ageAtMarriage.isEnabled
+        binding.dateOfBirthText.isEndIconVisible = binding.dateOfBirth.isEnabled
+
+        // Handle dropdown icons
+        // Using setEndIconVisible(false) might hide the dropdown arrow
+        binding.genderText.isEndIconVisible = binding.genderDropdown.isEnabled
+        binding.maritalStatusText.isEndIconVisible = binding.maritalStatusDropdown.isEnabled
+        binding.statusOfWomanText.isEndIconVisible = binding.statusOfWomanDropdown.isEnabled
+        binding.ageInUnitText.isEndIconVisible = binding.ageInUnitDropdown.isEnabled
+        binding.villageText.isEndIconVisible = binding.villageDropdown.isEnabled
+
+        // Clear focus if moving to read-only
+        if (!isEditable) {
+            binding.root.requestFocus()
+        }
+
+        // FAB visibility
+        binding.fabEdit.visibility = if (isEditable) View.GONE else View.VISIBLE
+
+        // Activity buttons visibility/text
+        updateActivityButtons()
+    }
+
+    private fun updateActivityButtons() {
+        (activity as? RegisterPatientActivity)?.let { act ->
+            val bottomNav = act.findViewById<View>(R.id.bottom_navigation)
+            val submitBtn = act.findViewById<android.widget.Button>(R.id.btnSubmit)
+            val cancelBtn = act.findViewById<android.widget.Button>(R.id.btnCancel)
+
+            bottomNav?.visibility = View.VISIBLE
+            if (isReadOnly) {
+                cancelBtn?.visibility = View.GONE
+                submitBtn?.text = getString(R.string.submit_btn_text)
+            } else {
+                cancelBtn?.visibility = View.VISIBLE
+                if (isEditModeAfterRegistration) {
+                    submitBtn?.text = getString(R.string.ok_button)
+                } else {
+                    submitBtn?.text = getString(R.string.submit_btn_text)
+                }
+            }
         }
     }
 
@@ -398,9 +714,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             alert.cancel()
         }
         alert.setOnShowListener {
-            alertBinding.dialogNumberPickerYears.value =  viewModel.enteredAgeYears!!
-            alertBinding.dialogNumberPickerMonths.value = viewModel.enteredAgeMonths!!
-            alertBinding.dialogNumberPickerDays.value =  viewModel.enteredAgeDays!!
+            alertBinding.dialogNumberPickerYears.value =  viewModel.enteredAgeYears ?: 0
+            alertBinding.dialogNumberPickerMonths.value = viewModel.enteredAgeMonths ?: 0
+            alertBinding.dialogNumberPickerDays.value =  viewModel.enteredAgeDays ?: 0
         }
         alert
     }
@@ -412,83 +728,15 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                 if (scannedData != null) {
                     val userData = parseUserData(scannedData)
 
-                    val nameParts = userData.name?.split(" ")
-                    val firstName = nameParts?.get(0)
-                    val lastName = nameParts?.get(nameParts.size - 1)
-                    binding.firstName.text =
-                        Editable.Factory.getInstance().newEditable(firstName ?: "")
-                    binding.lastName.text =
-                        Editable.Factory.getInstance().newEditable(lastName ?: "")
-
-                    val inputDateFormat1 = SimpleDateFormat("dd/MM/yyyy")
-                    val inputDateFormat2 = SimpleDateFormat("dd-MM-yyyy")
-                    val inputDateFormat3 = SimpleDateFormat("yyyy-MM-dd")
-                    val inputDateFormat4 = SimpleDateFormat("yyyy/MM/dd")
-
-                    val outputDateFormat = SimpleDateFormat("yyyy-MM-dd")
-
-                    if (!userData.dateOfBirth.isNullOrEmpty()) {
-                        val date: Date? = when {
-                            userData.dateOfBirth[2].toString() == "/" -> {
-                                inputDateFormat1.parse(userData.dateOfBirth)
-                            }
-                            userData.dateOfBirth[2].toString() == "-" -> {
-                                inputDateFormat2.parse(userData.dateOfBirth)
-                            }
-                            userData.dateOfBirth[4].toString() == "-" -> {
-                                inputDateFormat3.parse(userData.dateOfBirth)
-                            }
-                            userData.dateOfBirth[4].toString() == "/" -> {
-                                inputDateFormat4.parse(userData.dateOfBirth)
-                            }
-                            else -> {
-                                null
-                            }
-                        } as Date
+                    applyScannedName(userData)
 
-                        val outputDateStr: String = outputDateFormat.format(date)
-                        val outputDate: Date = outputDateFormat.parse(outputDateStr) as Date
 
-                        viewModel.selectedDateOfBirth = outputDate
+                    applyScannedDob(userData)
 
-                        dobUtil.showDatePickerDialog(
-                            requireContext(),
-                            viewModel.selectedDateOfBirth,
-                            maxDays = 0,
-                            minDays = -(99*365 + 25)
-                        )
-
-                    }
                     if (!userData.gender.isNullOrEmpty()){
-                        when (userData.gender) {
-                            "M" -> {
-                                viewModel.selectedGenderMaster = viewModel.genderMasterList[0]
-                                binding.genderDropdown.setText(
-                                    viewModel.selectedGenderMaster!!.genderName,
-                                    false
-                                )
-                            }
-
-                            "F" -> {
-                                viewModel.selectedGenderMaster = viewModel.genderMasterList[1]
-                                binding.genderDropdown.setText(
-                                    viewModel.selectedGenderMaster!!.genderName,
-                                    false
-                                )
-                            }
-
-                            else -> {
-                                viewModel.selectedGenderMaster = viewModel.genderMasterList[2]
-                                binding.genderDropdown.setText(
-                                    viewModel.selectedGenderMaster!!.genderName,
-                                    false
-                                )
-                            }
-                        }
-                    }
-                    if(!userData.mobileNumber.isNullOrEmpty()){
-                        binding.phoneNo.setText(userData.mobileNumber)
+                        applyScannedGender(userData)
                     }
+                    applyScannedPhone(userData)
                 }
             }
         }
@@ -531,11 +779,74 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             }
 
         }catch (e:Exception){
-            Toast.makeText(context, "Unable to fetch details", Toast.LENGTH_SHORT).show()
+            Toast.makeText(context, getString(R.string.unable_to_fetch_details), Toast.LENGTH_SHORT).show()
         }
         return PatientAadhaarDetails(name, gender,mobileNumber, dateOfBirth)
     }
 
+
+
+
+    private fun applyScannedName(userData: PatientAadhaarDetails) {
+        val nameParts = userData.name?.split(" ")
+        val firstName = nameParts?.get(0)
+        val lastName = nameParts?.getOrNull(nameParts.size - 1)
+        binding.firstName.text = Editable.Factory.getInstance().newEditable(firstName ?: "")
+        binding.lastName.text = Editable.Factory.getInstance().newEditable(lastName ?: "")
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun applyScannedDob(userData: PatientAadhaarDetails) {
+        val dob = userData.dateOfBirth
+        if (dob.isNullOrEmpty()) return
+
+        // keep same accepted input formats; guard indices to avoid OOB
+        val inputDateFormat1 = SimpleDateFormat("dd/MM/yyyy")
+        val inputDateFormat2 = SimpleDateFormat("dd-MM-yyyy")
+        val inputDateFormat3 = SimpleDateFormat("yyyy-MM-dd")
+        val inputDateFormat4 = SimpleDateFormat("yyyy/MM/dd")
+        val outputDateFormat = SimpleDateFormat("yyyy-MM-dd")
+
+        val date: Date? = when {
+            dob.length > 2 && dob[2] == '/' -> inputDateFormat1.parse(dob)
+            dob.length > 2 && dob[2] == '-' -> inputDateFormat2.parse(dob)
+            dob.length > 4 && dob[4] == '-' -> inputDateFormat3.parse(dob)
+            dob.length > 4 && dob[4] == '/' -> inputDateFormat4.parse(dob)
+            else -> null
+        }
+
+        if (date != null) {
+            val outputDateStr: String = outputDateFormat.format(date)
+            val outputDate: Date = outputDateFormat.parse(outputDateStr) as Date
+            viewModel.selectedDateOfBirth = outputDate
+
+            dobUtil.showDatePickerDialog(
+                requireContext(),
+                viewModel.selectedDateOfBirth,
+                maxDays = 0,
+                minDays = -(99*365 + 25)
+            ).show()
+        }
+    }
+
+    private fun applyScannedGender(userData: PatientAadhaarDetails) {
+        val g = userData.gender ?: return
+        when (g) {
+            "M" -> viewModel.selectedGenderMaster = viewModel.genderMasterList.getOrNull(0)
+            "F" -> viewModel.selectedGenderMaster = viewModel.genderMasterList.getOrNull(1)
+            else -> viewModel.selectedGenderMaster = viewModel.genderMasterList.getOrNull(2)
+        }
+        viewModel.selectedGenderMaster?.let {
+            binding.genderDropdown.setText(it.genderName, false)
+        }
+    }
+
+    private fun applyScannedPhone(userData: PatientAadhaarDetails) {
+        userData.mobileNumber?.takeIf { it.isNotBlank() }?.let {
+            binding.phoneNo.setText(it)
+        }
+    }
+
     private val speechToTextLauncherForFirstName = registerForActivityResult(SpeechToTextContract()) { result ->
         if (result.isNotBlank() && result.isNotEmpty() && !result.any { it.isDigit() }) {
             binding.firstName.setText(result)
@@ -565,31 +876,88 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             binding.phoneNo.setText(last10Digits)
         }
     }
+
+    private val speechToTextLauncherForAgeAtMarriage = registerForActivityResult(SpeechToTextContract()) { result ->
+        if (result.isNotBlank()) {
+            val cleanedResult = result.replace("\\s".toRegex(), "") // Remove all spaces
+            // Age at marriage usually doesn't need substring, but we'll clean spaces
+            binding.ageAtMarriage.setText(cleanedResult)
+        }
+    }
     fun watchAllFields(){
         if (!viewModel.isClickedSS.value!!) {
-            viewModel.firstNameVal.observe(viewLifecycleOwner) {
-                binding.firstNameText.setBoxColor(it, resources.getString(R.string.enter_your_first_name))
-            }
+            watchBasicDetailsFields()
+            watchStatusOfWomanField()
+            watchMaritalStatusField()
+            watchSpouseNameField()
+            watchFatherNameField()
 
-            viewModel.dobVal.observe(viewLifecycleOwner) {
-                binding.dateOfBirthText.setBoxColor(it, resources.getString(R.string.fill_dob))
-            }
-            viewModel.ageVal.observe(viewLifecycleOwner) {
-                binding.ageText.setBoxColor(it, resources.getString(R.string.enter_your_age))
+            viewModel.setIsClickedSS(true)
+        }
+    }
+
+    private fun watchBasicDetailsFields() {
+        viewModel.firstNameVal.observe(viewLifecycleOwner) {
+            binding.firstNameText.setBoxColor(it, resources.getString(R.string.enter_your_first_name))
+        }
+
+        viewModel.dobVal.observe(viewLifecycleOwner) {
+            binding.dateOfBirthText.setBoxColor(it, resources.getString(R.string.fill_dob))
+        }
+        viewModel.ageVal.observe(viewLifecycleOwner) {
+            binding.ageText.setBoxColor(it, resources.getString(R.string.enter_your_age))
+        }
+        viewModel.ageInUnitVal.observe(viewLifecycleOwner) {
+            binding.ageInUnitText.setBoxColor(it, resources.getString(R.string.select_age_in_unit))
+        }
+        viewModel.genderVal.observe(viewLifecycleOwner) {
+            binding.genderText.setBoxColor(it, resources.getString(R.string.select_gender))
+        }
+        viewModel.villageBoolVal.observe(viewLifecycleOwner) {
+            binding.villageText.setBoxColor(it, resources.getString(R.string.select_village))
+        }
+    }
+
+    private fun watchStatusOfWomanField() {
+        viewModel.statusOfWomanVal.observe(viewLifecycleOwner) {
+            if (binding.statusOfWomanText.visibility == View.VISIBLE) {
+                binding.statusOfWomanText.setBoxColor(it, resources.getString(R.string.select_status_of_woman))
             }
-            viewModel.ageInUnitVal.observe(viewLifecycleOwner) {
-                binding.ageInUnitText.setBoxColor(it, resources.getString(R.string.select_age_in_unit))
+        }
+    }
+
+    private fun watchMaritalStatusField() {
+        viewModel.maritalStatusVal.observe(viewLifecycleOwner) {
+            if (binding.maritalStatusText.visibility == View.VISIBLE) {
+                binding.maritalStatusText.setBoxColor(it, resources.getString(R.string.select_marital_status))
             }
-            viewModel.genderVal.observe(viewLifecycleOwner) {
-                binding.genderText.setBoxColor(it, resources.getString(R.string.select_gender))
+        }
+    }
+
+    private fun watchSpouseNameField() {
+        viewModel.spouseNameVal.observe(viewLifecycleOwner) {
+            if (binding.spouseNameText.visibility == View.VISIBLE) {
+                val genderId = viewModel.selectedGenderMaster?.genderID
+                val message = if (genderId == 2) resources.getString(R.string.enter_husband_name)
+                else if (genderId == 1) resources.getString(R.string.enter_wife_name)
+                else resources.getString(R.string.enter_spouse_name)
+                binding.spouseNameText.setBoxColor(it, message)
             }
-            viewModel.villageBoolVal.observe(viewLifecycleOwner) {
-                binding.villageText.setBoxColor(it, resources.getString(R.string.select_village))
+        }
+    }
+
+    private fun watchFatherNameField() {
+        viewModel.fatherNameVal.observe(viewLifecycleOwner) {
+            if (binding.fatherNameText.visibility == View.VISIBLE) {
+                binding.fatherNameText.setBoxColor(it, resources.getString(R.string.enter_father_s_name_error))
             }
-            viewModel.setIsClickedSS(true)
         }
     }
 
+    private fun isValidName(name: String): Boolean {
+        return name.matches(Regex("^[A-Za-z\\s\\-]+$"))
+    }
+
 
     private fun hideMarriedFields(){
         binding.maritalStatusText.visibility = View.GONE
@@ -599,47 +967,127 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    private fun setMarriedFieldsVisibility(){
-        if(viewModel.selectedDateOfBirth != null){
-            bool = DateTimeUtil.calculateAgeInYears(viewModel.selectedDateOfBirth!!) >= 11
-            viewModel.setAgeGreaterThan11(bool)
-            viewModel
-            if(bool) {
-                binding.maritalStatusText.visibility = View.VISIBLE
-                if (viewModel.selectedMaritalStatus != null && viewModel.selectedMaritalStatus!!.status.lowercase() == "married") {
+    private fun setMarriedFieldsVisibility() {
+        val genderId = viewModel.selectedGenderMaster?.genderID
+        val ageInYears = viewModel.enteredAgeYears
+
+        if (viewModel.shouldShowMaritalStatus(genderId, ageInYears)) {
+            binding.maritalStatusText.visibility = View.VISIBLE
+
+            // Enable Marital Status if age changed in Edit mode
+            if (!isReadOnly && isEditModeAfterRegistration && isAgeChangedInEditMode) {
+                binding.maritalStatusDropdown.isEnabled = true
+                binding.maritalStatusText.isEndIconVisible = true
+            }
+
+            val status = viewModel.selectedMaritalStatus?.status?.lowercase()?.trim()
+            when {
+                status?.contains("married") == true && !status.contains("unmarried") && !status.contains("never") -> {
                     binding.fatherNameText.visibility = View.GONE
                     binding.spouseNameText.visibility = View.VISIBLE
 
-                } else if (viewModel.selectedMaritalStatus != null && viewModel.selectedMaritalStatus!!.status.lowercase() == "unmarried") {
+                    // Update hint based on gender
+                    val hintRes = if (genderId == 2) R.string.husband_s_name else if (genderId == 1) R.string.wife_s_name else R.string.spouse_name
+                    binding.spouseNameText.hint = getText(hintRes)
+
+                    binding.spouseName.isEnabled = !isReadOnly &&
+                        (!isEditModeAfterRegistration || isAgeChangedInEditMode || isMaritalStatusChangedInEditMode)
+                    binding.spouseNameText.isEndIconVisible = binding.spouseName.isEnabled
+
+                    val isSpouseNameFilled = binding.spouseName.text?.isNotEmpty() == true && isValidName(binding.spouseName.text.toString())
+                    viewModel.setSpouse(isSpouseNameFilled)
+                    viewModel.setFatherName(true) // Not mandatory if married
+                }
+                status?.contains("unmarried") == true || status?.contains("never") == true || status?.contains("single") == true -> {
                     binding.spouseNameText.visibility = View.GONE
                     binding.fatherNameText.visibility = View.VISIBLE
-                } else {
+                    binding.spouseName.setText("") // Clear if was married before
+
+                    // Allow editing Father Name if we are in Edit mode
+                    binding.fatherNameEditText.isEnabled = !isReadOnly
+                    binding.fatherNameText.isEndIconVisible = binding.fatherNameEditText.isEnabled
+
+                    val isFatherNameFilled = binding.fatherNameEditText.text?.isNotEmpty() == true && isValidName(binding.fatherNameEditText.text.toString())
+                    viewModel.setFatherName(isFatherNameFilled)
+                    viewModel.setSpouse(true) // Not mandatory if not married
+                }
+                else -> {
                     binding.spouseNameText.visibility = View.GONE
                     binding.fatherNameText.visibility = View.GONE
+                    binding.spouseName.setText("") // Clear selection
+                    viewModel.setFatherName(true)
+                    viewModel.setSpouse(true)
                 }
             }
-            else
+        } else {
+            if (!isProgrammaticChange) {
                 hideMarriedFields()
+                viewModel.selectedMaritalStatus = null
+                binding.maritalStatusDropdown.setText("", false)
+                viewModel.setMarital(true) // Hidden, so not mandatory
+                viewModel.setSpouse(true)
+            }
+
+            // Show Father Name for children (Age < 15) and make it mandatory
+            if (ageInYears != null && ageInYears < 15) {
+                binding.fatherNameText.visibility = View.VISIBLE
+
+                // Allow editing Father Name if we are in Edit mode
+                binding.fatherNameEditText.isEnabled = !isReadOnly
+                binding.fatherNameText.isEndIconVisible = binding.fatherNameEditText.isEnabled
+
+                val isFatherNameFilled = binding.fatherNameEditText.text?.isNotEmpty() == true && isValidName(binding.fatherNameEditText.text.toString())
+                viewModel.setFatherName(isFatherNameFilled)
+            } else {
+                viewModel.setFatherName(true)
+            }
         }
     }
 
+
     @RequiresApi(Build.VERSION_CODES.O)
     private fun setChangeListeners(){
 
-        binding.maritalStatusDropdown.setOnItemClickListener { _, _, position, _ ->
-            viewModel.selectedMaritalStatus = viewModel.maritalStatusList[position]
-            viewModel.maritalStatusId = viewModel.maritalStatusList[position].maritalStatusID
-            viewModel.maritalStatusName = viewModel.maritalStatusList[position].status
-            binding.maritalStatusDropdown.setText(viewModel.selectedMaritalStatus!!.status, false)
-            setMarriedFieldsVisibility()
+        // Setup keyboard handling for marital status dropdown
+        binding.maritalStatusDropdown.setupDropdownKeyboardHandling()
+
+        binding.maritalStatusDropdown.setOnItemClickListener { parent, _, position, _ ->
+            val selectedItem = parent.getItemAtPosition(position) as? DropdownList
+            selectedItem?.let { item ->
+                viewModel.selectedMaritalStatus = viewModel.maritalStatusList.find { it.maritalStatusID == item.id }
+                viewModel.maritalStatusId = item.id
+                viewModel.maritalStatusName = item.display
+                binding.maritalStatusDropdown.setText(item.display, false)
+                if (!isReadOnly && isEditModeAfterRegistration && !isProgrammaticChange) {
+                    isMaritalStatusChangedInEditMode = true
+                }
+                setMarriedFieldsVisibility()
+                updateStatusOfWomanVisibility()
+            }
         }
 
-        binding.genderDropdown.setOnItemClickListener { _, _, position, _ ->
-            viewModel.selectedGenderMaster = viewModel.genderMasterList[position]
-            binding.genderDropdown.setText(viewModel.selectedGenderMaster!!.genderName, false)
+        // Setup keyboard handling for gender dropdown
+        binding.genderDropdown.setupDropdownKeyboardHandling()
+
+        // Setup keyboard handling for gender dropdown
+        binding.genderDropdown.setupDropdownKeyboardHandling()
+
+        binding.genderDropdown.setOnItemClickListener { parent, _, position, _ ->
+            val selectedItem = parent.getItemAtPosition(position) as? DropdownList
+            selectedItem?.let { item ->
+                viewModel.selectedGenderMaster = viewModel.genderMasterList.find { it.genderID == item.id }
+                binding.genderDropdown.setText(item.display, false)
+                updateMaritalStatusOptions()
+                setMarriedFieldsVisibility()
+                updateStatusOfWomanVisibility()
+            }
         }
 
         binding.dateOfBirth.setOnClickListener {
+            // Hide keyboard when clicking on date of birth field
+            KeyboardUtils.hideKeyboard(binding.dateOfBirth)
+            KeyboardUtils.hideKeyboardFromActivity(requireContext())
+
             dobUtil.showDatePickerDialog(
                 requireContext(),
                 viewModel.selectedDateOfBirth,
@@ -671,8 +1119,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                val isDobFilled = s?.isNotEmpty() == true
-                viewModel.setFirstName(isDobFilled)
+                val name = s?.toString()?.trim() ?: ""
+                val isValid = name.isNotEmpty() && isValidName(name)
+                viewModel.setFirstName(isValid)
             }
 
             override fun afterTextChanged(s: Editable?) {
@@ -685,8 +1134,10 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                val isDobFilled = s?.isNotEmpty() == true
-                viewModel.setLastName(isDobFilled)
+                val name = s?.toString()?.trim() ?: ""
+                // Last name is optional, but if filled, it must be valid
+                val isValid = name.isEmpty() || isValidName(name)
+                viewModel.setLastName(isValid)
             }
 
             override fun afterTextChanged(s: Editable?) {
@@ -807,7 +1258,7 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
 
         binding.ageAtMarriage.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-                  //No-Ops For Now
+                //No-Ops For Now
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
@@ -820,6 +1271,16 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             }
         })
 
+        binding.fatherNameEditText.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                val name = s?.toString()?.trim() ?: ""
+                val isValid = name.isNotEmpty() && isValidName(name)
+                viewModel.setFatherName(isValid)
+            }
+            override fun afterTextChanged(s: Editable?) {}
+        })
+
     }
 
 
@@ -862,18 +1323,29 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             setAgeToDateOfBirth()
             val isAgeFilled = s?.isNotEmpty() == true
             viewModel.setAge(isAgeFilled)
+            if (!isReadOnly && isEditModeAfterRegistration && !isProgrammaticChange) {
+                isAgeChangedInEditMode = true
+            }
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
         override fun afterTextChanged(s: Editable?) {
             setMarriedFieldsVisibility()
+            updateStatusOfWomanVisibility()
         }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
     private fun setAdapters(){
+        setupVillageAdapterObserver()
+        setupMaritalStatusAdapterObserver()
+        setupGenderAdapterObserver()
+        setupDateObserver()
+    }
+
+    private fun setupVillageAdapterObserver() {
         viewModel.villageVal.observe(viewLifecycleOwner) { state ->
-            when (state!!){
+            when (state!!) {
                 PatientDetailsViewModel.NetworkState.SUCCESS -> {
                     villageAdapter = VillageDropdownAdapter(
                         requireContext(),
@@ -887,45 +1359,116 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                     }
                     binding.villageDropdown.setAdapter(villageAdapter)
                     setVillageDropdownMaxHeight()
+
+                    // Pre-fill if patient data exists
+                    if (patient.districtBranchID != null) {
+                        viewModel.selectedVillage =
+                            viewModel.villageList.find { it.districtBranchID.toInt() == patient.districtBranchID }
+                        viewModel.selectedVillage?.let { v ->
+                            isSettingVillageProgrammatically = true
+                            binding.villageDropdown.setText(v.villageName, false)
+                            binding.villageDropdown.dismissDropDown()
+                            isSettingVillageProgrammatically = false
+                        }
+                    }
                 }
                 else -> {
                     //No-Ops For Now
                 }
             }
         }
+    }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setupMaritalStatusAdapterObserver() {
         viewModel.maritalStatus.observe(viewLifecycleOwner) { state ->
-            when (state!!){
+            when (state!!) {
                 PatientDetailsViewModel.NetworkState.SUCCESS -> {
-                    val dropdownList = viewModel.maritalStatusList.map { DropdownList(it.maritalStatusID, it.status) }
-                    val dropdownAdapter = DropdownAdapter(requireContext(), R.layout.drop_down, dropdownList, binding.maritalStatusDropdown)
+                    val dropdownList =
+                        viewModel.maritalStatusList.map { DropdownList(it.maritalStatusID, it.status) }
+                    val dropdownAdapter = DropdownAdapter(
+                        requireContext(),
+                        R.layout.drop_down,
+                        dropdownList,
+                        binding.maritalStatusDropdown
+                    )
                     binding.maritalStatusDropdown.setAdapter(dropdownAdapter)
+                    // Ensure keyboard handling is set up (in case it wasn't set earlier)
+                    binding.maritalStatusDropdown.setupDropdownKeyboardHandling()
+
+                    // Pre-fill if patient data exists
+                    if (patient.maritalStatusID != null) {
+                        viewModel.selectedMaritalStatus =
+                            viewModel.maritalStatusList.find { it.maritalStatusID == patient.maritalStatusID }
+                        viewModel.selectedMaritalStatus?.let { m ->
+                            isProgrammaticChange = true
+                            viewModel.maritalStatusId = m.maritalStatusID
+                            viewModel.maritalStatusName = m.status
+                            binding.maritalStatusDropdown.setText(m.status, false)
+                            setMarriedFieldsVisibility()
+                            updateStatusOfWomanVisibility()
+
+                            // Fix: Ensure dropdown is enabled for Unmarried status in Edit mode
+                            if (isEditModeAfterRegistration) {
+                                binding.maritalStatusDropdown.isEnabled =
+                                    isUnmarriedStatus(m.maritalStatusID, m.status)
+                            }
+
+                            isProgrammaticChange = false
+                        }
+                    }
                 }
                 else -> {
                     //No-Ops For Now
                 }
             }
         }
+    }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setupGenderAdapterObserver() {
         viewModel.genderMaster.observe(viewLifecycleOwner) { state ->
-            when (state!!){
+            when (state!!) {
                 PatientDetailsViewModel.NetworkState.SUCCESS -> {
-                    val dropdownList = viewModel.genderMasterList.map { DropdownList(it.genderID, it.genderName) }
-                    val dropdownAdapter = DropdownAdapter(requireContext(), R.layout.drop_down, dropdownList, binding.genderDropdown)
+                    val dropdownList =
+                        viewModel.genderMasterList.map { DropdownList(it.genderID, it.genderName) }
+                    val dropdownAdapter = DropdownAdapter(
+                        requireContext(),
+                        R.layout.drop_down,
+                        dropdownList,
+                        binding.genderDropdown
+                    )
                     binding.genderDropdown.setAdapter(dropdownAdapter)
+                    // Setup keyboard handling for gender dropdown
+                    binding.genderDropdown.setupDropdownKeyboardHandling()
+
+                    // Pre-fill if patient data exists
+                    if (patient.genderID != null) {
+                        viewModel.selectedGenderMaster =
+                            viewModel.genderMasterList.find { it.genderID == patient.genderID }
+                        viewModel.selectedGenderMaster?.let { master ->
+                            isProgrammaticChange = true
+                            binding.genderDropdown.setText(master.genderName, false)
+                            setMarriedFieldsVisibility()
+                            updateStatusOfWomanVisibility()
+                            isProgrammaticChange = false
+                        }
+                    }
                 }
                 else -> {
                     //No-Ops For Now
                 }
             }
         }
+    }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setupDateObserver() {
         dobUtil.selectedDate.observe(viewLifecycleOwner) { date ->
-            if(date != null){
+            if (date != null) {
                 setDateOfBirthToAge(date)
             }
         }
-
     }
     private fun setupVillageDropdown() {
 
@@ -939,7 +1482,14 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             isCursorVisible = true
         }
 
+        // Setup keyboard handling for dropdown
+        dropdown.setupDropdownKeyboardHandling()
+
         dropdown.setOnClickListener {
+            // Hide keyboard when dropdown is clicked
+            KeyboardUtils.hideKeyboard(dropdown)
+            KeyboardUtils.hideKeyboardFromActivity(requireContext())
+
             if (::villageAdapter.isInitialized) {
                 villageAdapter.shouldAutoShowDropdown = true
                 isSettingVillageProgrammatically = true
@@ -958,7 +1508,7 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                 villageAdapter.shouldAutoShowDropdown = false
             }
             isSettingVillageProgrammatically = true
-            
+
             dropdown.setText(viewModel.selectedVillage!!.villageName, false)
             dropdown.dismissDropDown()
             hideKeyboard(dropdown)
@@ -967,7 +1517,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
 
         dropdown.addTextChangedListener(object : TextWatcher {
 
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                // Intentionally left empty: village filtering and state updates are handled in
+            }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                 viewModel.setVillageBool(!s.isNullOrEmpty())
@@ -977,7 +1529,9 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                 }
             }
 
-            override fun afterTextChanged(s: Editable?) {}
+            override fun afterTextChanged(s: Editable?) {
+                // No post-change work required for village input. Kept intentionally blank
+            }
         })
     }
 
@@ -992,10 +1546,11 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         val dropdown = binding.villageDropdown
 
         dropdown.post {
+            val defaultMaxHeight = (resources.displayMetrics.heightPixels * 0.4).toInt()
             if (::villageAdapter.isInitialized) {
                 val itemCount = villageAdapter.count
                 if (itemCount > 0) {
-                    var itemHeightPx = 0
+                    var itemHeightPx: Int
                     try {
                         val tempParent = android.widget.FrameLayout(requireContext())
                         val itemView = villageAdapter.getDropDownView(0, null, tempParent)
@@ -1011,23 +1566,21 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
                     val bottomPaddingDp = 16f
                     val bottomPaddingPx = (bottomPaddingDp * resources.displayMetrics.density).toInt()
                     val calculatedHeight = (itemCount * itemHeightPx) + bottomPaddingPx
-                    val maxHeight = (resources.displayMetrics.heightPixels * 0.4).toInt()
-                    dropdown.dropDownHeight = minOf(calculatedHeight, maxHeight)
+                    dropdown.dropDownHeight = minOf(calculatedHeight, defaultMaxHeight)
                 } else {
-                    val maxHeight = (resources.displayMetrics.heightPixels * 0.4).toInt()
-                    dropdown.dropDownHeight = maxHeight
+                    // Prevent large blank popup when filter returns no village rows.
+                    dropdown.dropDownHeight = ViewGroup.LayoutParams.WRAP_CONTENT
                 }
             } else {
-                val maxHeight = (resources.displayMetrics.heightPixels * 0.4).toInt()
-                dropdown.dropDownHeight = maxHeight
+                dropdown.dropDownHeight = defaultMaxHeight
             }
         }
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
     fun setAgeToDateOfBirth(){
-        viewModel.selectedDateOfBirth = DateTimeUtil.calculateDateOfBirth(viewModel.enteredAgeYears!!, viewModel.enteredAgeMonths!!,
-            viewModel.enteredAgeWeeks!!, viewModel.enteredAgeDays!!)
+        viewModel.selectedDateOfBirth = DateTimeUtil.calculateDateOfBirth(viewModel.enteredAgeYears ?: 0, viewModel.enteredAgeMonths ?: 0,
+            viewModel.enteredAgeWeeks ?: 0, viewModel.enteredAgeDays ?: 0)
         binding.dateOfBirth.setText(DateTimeUtil.formattedDate(viewModel.selectedDateOfBirth!!))
         setMarriedFieldsVisibility()
 
@@ -1063,16 +1616,16 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         }
 
         var ageString = ""
-        if(viewModel.enteredAgeYears!! > 0){
-            ageString += viewModel.enteredAgeYears!!.toString() + " years"
+        if((viewModel.enteredAgeYears ?: 0) > 0){
+            ageString += (viewModel.enteredAgeYears ?: 0).toString() + " years"
         }
-        if(viewModel.enteredAgeMonths!! > 0){
+        if((viewModel.enteredAgeMonths ?: 0) > 0){
             if(ageString.isNotEmpty()) ageString += ", "
-            ageString += viewModel.enteredAgeMonths!!.toString() + " months"
+            ageString += (viewModel.enteredAgeMonths ?: 0).toString() + " months"
         }
-        if(viewModel.enteredAgeDays!! > 0){
+        if((viewModel.enteredAgeDays ?: 0) > 0){
             if(ageString.isNotEmpty()) ageString += ", "
-            ageString += viewModel.enteredAgeDays!!.toString() + " days"
+            ageString += (viewModel.enteredAgeDays ?: 0).toString() + " days"
         }
 
         binding.age.setText(ageString)
@@ -1095,7 +1648,10 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         patient.ageUnitID = viewModel.selectedAgeUnit?.id
         patient.parentName = binding.fatherNameEditText.text.toString().trim()
         patient.spouseName = binding.spouseName.text.toString().trim()
-        patient.faceEmbedding = embeddings?.toList()
+        // Only update face embedding if a new photo was captured
+        if (embeddings != null) {
+            patient.faceEmbedding = embeddings?.toList()
+        }
         if (binding.phoneNo.text.toString().isNullOrEmpty()) {
             patient.phoneNo = null
         } else {
@@ -1103,7 +1659,12 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         }
         patient.genderID = viewModel.selectedGenderMaster?.genderID
         patient.registrationDate = Date()
-        patient.benImage = ImgUtils.getEncodedStringForBenImage(requireContext(), currentFileName)
+        // Only update benImage if a new photo was actually taken (currentFileName is set)
+        if (currentFileName != null) {
+            patient.benImage = ImgUtils.getEncodedStringForBenImage(requireContext(), currentFileName)
+        }
+        patient.statusOfWomanID = viewModel.selectedStatusOfWoman?.statusID
+
     }
 
     private fun setLocationDetails(){
@@ -1114,6 +1675,95 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
         patient.districtBranchID = viewModel.selectedVillage?.districtBranchID!!.toInt()
     }
 
+    private fun populateForm(patientInfo: org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo) {
+        val p = patientInfo.patient
+        this.patient = p // Set current patient object
+
+        isProgrammaticChange = true
+        binding.firstName.setText(p.firstName)
+        binding.lastName.setText(p.lastName)
+        binding.phoneNo.setText(p.phoneNo)
+        binding.spouseName.setText(p.spouseName)
+        binding.fatherNameEditText.setText(p.parentName)
+
+        // Age
+        p.age?.let {
+            viewModel.enteredAge = it
+            viewModel.enteredAgeYears = it
+            binding.age.setText("$it years")
+        }
+
+        // Age Unit
+        p.ageUnitID?.let { id ->
+            viewModel.ageUnitList.find { it.id == id }?.let { unit ->
+                viewModel.selectedAgeUnit = unit
+                binding.ageInUnitDropdown.setText(unit.name, false)
+            }
+        }
+
+        binding.ageAtMarriage.setText(p.ageAtMarriage?.toString() ?: "")
+
+        // DOB
+        p.dob?.let {
+            viewModel.selectedDateOfBirth = it
+            binding.dateOfBirth.setText(DateTimeUtil.formattedDate(it))
+        }
+
+        // Photo: benImage is stored as base64 string with optional "data:image/...;base64," prefix
+        p.benImage?.let { img ->
+            val base64Data = if (img.contains(",")) img.substringAfter(",") else img
+            val bitmap = org.piramalswasthya.cho.utils.ImgUtils.decodeBase64ToBitmap(base64Data)
+            if (bitmap != null) {
+                com.bumptech.glide.Glide.with(this).load(bitmap).placeholder(R.drawable.ic_person)
+                    .circleCrop().into(binding.ivImgCapture)
+            } else {
+                binding.ivImgCapture.setImageResource(R.drawable.ic_person)
+            }
+        }
+        // Gender
+        p.genderID?.let { id ->
+            viewModel.genderMasterList.find { it.genderID == id }?.let { master ->
+                viewModel.selectedGenderMaster = master
+                binding.genderDropdown.setText(master.genderName, false)
+            }
+        }
+
+        // Marital Status
+        p.maritalStatusID?.let { id ->
+            viewModel.maritalStatusList.find { it.maritalStatusID == id }?.let { m ->
+                viewModel.selectedMaritalStatus = m
+                viewModel.maritalStatusId = m.maritalStatusID
+                viewModel.maritalStatusName = m.status
+                binding.maritalStatusDropdown.setText(m.status, false)
+            }
+        }
+
+        // Village
+        p.districtBranchID?.let { id ->
+            viewModel.villageList.find { it.districtBranchID.toInt() == id }?.let { v ->
+                viewModel.selectedVillage = v
+                isSettingVillageProgrammatically = true
+                binding.villageDropdown.setText(v.villageName, false)
+                isSettingVillageProgrammatically = false
+            }
+        }
+
+        // Status of Woman
+        p.statusOfWomanID?.let { id ->
+            viewModel.statusOfWomanList.find { it.statusID == id }?.let { s ->
+                viewModel.selectedStatusOfWoman = s
+                binding.statusOfWomanDropdown.setText(s.statusName, false)
+                viewModel.setStatusOfWoman(true)
+            }
+        }
+
+        // Correct visibility states based on populated data
+        setMarriedFieldsVisibility()
+        updateStatusOfWomanVisibility()
+
+        isProgrammaticChange = false
+    }
+
     override fun getFragmentId(): Int {
         return R.id.fragment_add_patient_location
     }
@@ -1122,41 +1772,308 @@ class PatientDetailsFragment : Fragment() , NavigationAdapter {
             return false
         }
 
+        if (binding.statusOfWomanText.visibility == View.VISIBLE && !viewModel.statusOfWomanVal.value!!) {
+            return false
+        }
+
+        // Check Marital Status if visible
+        if (binding.maritalStatusText.visibility == View.VISIBLE && !viewModel.maritalStatusVal.value!!) {
+            return false
+        }
+
+        if (binding.spouseNameText.visibility == View.VISIBLE && !viewModel.spouseNameVal.value!!) {
+            return false
+        }
+
+        if (binding.fatherNameText.visibility == View.VISIBLE && !viewModel.fatherNameVal.value!!) {
+            binding.fatherNameText.setBoxColor(false, resources.getString(R.string.enter_father_s_name_error))
+            return false
+        }
         return true
     }
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onSubmitAction() {
+        if (isReadOnly) {
+            requireActivity().finish()
+            return
+        }
+
         watchAllFields()
         if (checkVisibleFieldIsEmpty()) {
             setPatientDetails()
             setLocationDetails()
-            patient.patientID = generateUuid()
-            viewModel.insertPatient(patient)
-            viewModel.isDataSaved.observe(viewLifecycleOwner){ state ->
-                when(state!!){
-                    true -> {
-                        WorkerUtils.triggerAmritSyncWorker(requireContext())
-                        if(preferenceDao.isUserCHO()){
-                            val intent = Intent(context, EditPatientDetailsActivity::class.java)
-                            intent.putExtra("benVisitInfo", viewModel.benVisitInfo)
-                            startActivity(intent)
-                        }
-                        else{
-                            requireActivity().finish()
+
+            if (isEditModeAfterRegistration) {
+                patient.syncState = SyncState.UNSYNCED
+                viewModel.updatePatient(patient)
+            } else {
+                if (patient.patientID.isBlank() || patient.patientID == "null") {
+                    // Initial Registration
+                    patient.patientID = generateUuid()
+                }
+                viewModel.insertPatient(patient)
+            }
+        }
+    }
+
+
+    override fun onCancelAction() {
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.are_you_sure))
+            .setMessage(getString(R.string.cancel_confirmation_message))
+            .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
+                dialog.dismiss()
+                requireActivity().finish()
+            }
+            .setNegativeButton(getString(R.string.no)) { dialog, _ ->
+                dialog.dismiss()
+            }
+            .show()
+    }
+
+
+    private suspend fun compareFacesL2Norm(newEmbedding: FloatArray): Patient? {
+        var bestMatch: Patient? = null
+        var bestDistance = Float.MAX_VALUE
+
+        val patients = viewModel.getAllPatientsForFaceComparison()
+
+        kotlinx.coroutines.withContext(dispatcherProvider.default) {
+            for (patient in patients) {
+                val patientEmbedding = patient.faceEmbedding?.toFloatArray()
+                if (patientEmbedding == null || patientEmbedding.isEmpty()) {
+                    continue
+                }
+
+                val distance = l2Norm(newEmbedding, patientEmbedding)
+                if (distance < bestDistance) {
+                    bestDistance = distance
+                    bestMatch = patient
+                }
+            }
+        }
+
+        // L2 threshold for FaceNet model
+        return if (bestDistance < Models.FACENET.l2Threshold) bestMatch else null
+    }
+
+    private fun l2Norm(x1: FloatArray, x2: FloatArray): Float {
+        var sum = 0.0f
+        for (i in x1.indices) {
+            sum += (x1[i] - x2[i]).pow(2)
+        }
+        return kotlin.math.sqrt(sum)
+    }
+
+    private fun enableFullBoxClick(dropdown: AutoCompleteTextView) {
+        dropdown.setOnTouchListener { _, event ->
+            if (dropdown.isEnabled && event.action == MotionEvent.ACTION_UP) {
+                dropdown.showDropDown()
+            }
+            false
+        }
+
+        dropdown.setOnFocusChangeListener { _, hasFocus ->
+            if (dropdown.isEnabled && hasFocus) dropdown.showDropDown()
+        }
+    }
+    private fun setupStatusOfWomanDropdown() {
+        viewModel.statusOfWoman.observe(viewLifecycleOwner) { state ->
+            when (state) {
+                PatientDetailsViewModel.NetworkState.SUCCESS -> {
+                    updateStatusOfWomanVisibility()
+
+                    // Pre-fill if patient data exists
+                    if (patient.statusOfWomanID != null) {
+                        val status = viewModel.statusOfWomanList.find { it.statusID == patient.statusOfWomanID }
+                        status?.let { s ->
+                            isProgrammaticChange = true
+                            viewModel.selectedStatusOfWoman = s
+                            patient.statusOfWomanID = s.statusID
+                            binding.statusOfWomanDropdown.setText(s.statusName, false)
+                            viewModel.setStatusOfWoman(true)
+                            isProgrammaticChange = false
                         }
-                        Toast.makeText(requireContext(), getString(R.string.patient_registered_successfully), Toast.LENGTH_SHORT).show()
-                    }
-                    else -> {
-                        //No-Ops For Now we can display error message like something went wrng
                     }
                 }
+                else -> {
+                    //No-Ops For Now
+                }
+            }
+        }
+
+        binding.statusOfWomanDropdown.setupDropdownKeyboardHandling()
+
+        binding.statusOfWomanDropdown.setOnItemClickListener { parent, _, position, _ ->
+            val selectedItem = parent.getItemAtPosition(position) as? DropdownList
+            selectedItem?.let { item ->
+                viewModel.selectedStatusOfWoman = viewModel.statusOfWomanList.find { it.statusID == item.id }
+                patient.statusOfWomanID = viewModel.selectedStatusOfWoman?.statusID
+                binding.statusOfWomanDropdown.setText(item.display, false)
+                viewModel.setStatusOfWoman(true)
             }
         }
     }
 
-    override fun onCancelAction() {
-        requireActivity().finish()
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun updateStatusOfWomanVisibility() {
+        val genderId = viewModel.selectedGenderMaster?.genderID
+        val ageInYears = viewModel.enteredAgeYears
+        val maritalStatusName = viewModel.selectedMaritalStatus?.status
+
+        if (viewModel.shouldShowStatusOfWoman(genderId, ageInYears, maritalStatusName)) {
+            handleStatusOfWomanVisible(genderId, ageInYears)
+        } else {
+            handleStatusOfWomanHidden()
+        }
     }
 
-}
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun handleStatusOfWomanVisible(genderId: Int?, ageInYears: Int?) {
+        binding.statusOfWomanText.visibility = View.VISIBLE
+
+        val canEdit = !isReadOnly || (isEditModeAfterRegistration && isAgeChangedInEditMode)
+        binding.statusOfWomanDropdown.isEnabled = canEdit
+        binding.statusOfWomanText.isEndIconVisible = canEdit
+
+        val maritalStatusName = viewModel.selectedMaritalStatus?.status?.trim()
+        viewModel.filteredStatusOfWomanList = viewModel.getFilteredStatusOfWomanOptions(
+            genderId,
+            ageInYears,
+            viewModel.selectedMaritalStatus?.maritalStatusID,
+            maritalStatusName
+        )
+
+        setupStatusOfWomanDropdownContent()
+
+        // Re-validate Father Name if status of woman changes (e.g. to Adolescent Girl)
+        val mStatus = viewModel.selectedMaritalStatus?.status?.lowercase()
+        val statusOfWoman = viewModel.selectedStatusOfWoman?.statusName?.lowercase()
+
+        if (statusOfWoman == "adolescent" || mStatus == "unmarried") {
+            binding.fatherNameText.hint = getText(R.string.father_s_name)
+            val isFatherNameFilled = binding.fatherNameEditText.text?.isNotEmpty() == true &&
+                    isValidName(binding.fatherNameEditText.text.toString())
+            viewModel.setFatherName(isFatherNameFilled)
+        }
+    }
 
+    private fun handleStatusOfWomanHidden() {
+        binding.statusOfWomanText.visibility = View.GONE
+        if (!isProgrammaticChange) {
+            viewModel.selectedStatusOfWoman = null
+            patient.statusOfWomanID = null
+        }
+        viewModel.setStatusOfWoman(true)
+    }
+
+    private fun setupStatusOfWomanDropdownContent() {
+        if (viewModel.filteredStatusOfWomanList.isNotEmpty()) {
+            val dropdownList = viewModel.filteredStatusOfWomanList.map {
+                DropdownList(it.statusID, it.statusName)
+            }
+            statusOfWomanAdapter = DropdownAdapter(
+                requireContext(),
+                R.layout.drop_down,
+                dropdownList,
+                binding.statusOfWomanDropdown
+            )
+            binding.statusOfWomanDropdown.setAdapter(statusOfWomanAdapter)
+
+            validateCurrentStatusOfWomanSelection()
+            restoreStatusOfWomanSelection()
+            autoSelectIsSingleOption()
+        } else {
+            clearStatusOfWomanDropdown()
+        }
+    }
+
+    private fun validateCurrentStatusOfWomanSelection() {
+        // Check if current selection is still valid
+        if (viewModel.selectedStatusOfWoman != null &&
+            viewModel.filteredStatusOfWomanList.none { it.statusID == viewModel.selectedStatusOfWoman!!.statusID }
+        ) {
+            viewModel.selectedStatusOfWoman = null
+            patient.statusOfWomanID = null
+            binding.statusOfWomanDropdown.setText("", false)
+            viewModel.setStatusOfWoman(false)
+        }
+    }
+
+    private fun restoreStatusOfWomanSelection() {
+        // Restore text if already selected
+        viewModel.selectedStatusOfWoman?.let { s ->
+            val oldFlag = isProgrammaticChange
+            isProgrammaticChange = true
+            binding.statusOfWomanDropdown.setText(s.statusName, false)
+            isProgrammaticChange = oldFlag
+        }
+    }
+
+    private fun autoSelectIsSingleOption() {
+        // If only one option and none selected, auto-select it
+        if (viewModel.selectedStatusOfWoman == null && viewModel.filteredStatusOfWomanList.size == 1) {
+            viewModel.selectedStatusOfWoman = viewModel.filteredStatusOfWomanList[0]
+            patient.statusOfWomanID = viewModel.selectedStatusOfWoman?.statusID
+            binding.statusOfWomanDropdown.setText(
+                viewModel.selectedStatusOfWoman!!.statusName,
+                false
+            )
+            viewModel.setStatusOfWoman(true)
+        } else if (viewModel.selectedStatusOfWoman != null) {
+            // Already selected, ensure validation is true
+            viewModel.setStatusOfWoman(true)
+        }
+    }
+
+    private fun clearStatusOfWomanDropdown() {
+        if (!isProgrammaticChange) {
+            // List is empty (e.g. Marital Status not selected yet), clear dropdown
+            statusOfWomanAdapter = DropdownAdapter(
+                requireContext(),
+                R.layout.drop_down,
+                emptyList(),
+                binding.statusOfWomanDropdown
+            )
+            binding.statusOfWomanDropdown.setAdapter(statusOfWomanAdapter)
+            viewModel.selectedStatusOfWoman = null
+            patient.statusOfWomanID = null
+            binding.statusOfWomanDropdown.setText("", false)
+            viewModel.setStatusOfWoman(false)
+        }
+    }
+
+    private fun isUnmarriedStatus(maritalStatusId: Int?, maritalStatusName: String?): Boolean {
+        if (maritalStatusId == 1) return true
+        val currentStatus = maritalStatusName?.lowercase(Locale.ROOT)?.trim().orEmpty()
+        return currentStatus.contains("unmarried") ||
+            currentStatus.contains("never") ||
+            currentStatus.contains("single")
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun updateMaritalStatusOptions() {
+        val genderId = viewModel.selectedGenderMaster?.genderID
+        val filteredList = viewModel.getFilteredMaritalStatusOptions(genderId)
+
+        val dropdownList = filteredList.map { DropdownList(it.maritalStatusID, it.status) }
+        val dropdownAdapter =
+            DropdownAdapter(requireContext(), R.layout.drop_down, dropdownList, binding.maritalStatusDropdown)
+        binding.maritalStatusDropdown.setAdapter(dropdownAdapter)
+
+        // Restore text if already selected
+        viewModel.selectedMaritalStatus?.let {
+            val oldFlag = isProgrammaticChange
+            isProgrammaticChange = true
+            binding.maritalStatusDropdown.setText(it.status, false)
+            isProgrammaticChange = oldFlag
+        }
+
+        // If current selection is no longer in filtered list, clear it
+        if (!isProgrammaticChange && viewModel.selectedMaritalStatus != null && filteredList.none { it.maritalStatusID == viewModel.selectedMaritalStatus!!.maritalStatusID }) {
+            viewModel.selectedMaritalStatus = null
+            binding.maritalStatusDropdown.setText("", false)
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsViewModel.kt b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsViewModel.kt
index 18aa2daf2..50af1dde2 100644
--- a/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsViewModel.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/ui/register_patient_activity/patient_details/PatientDetailsViewModel.kt
@@ -14,7 +14,10 @@ import org.piramalswasthya.cho.model.GenderMaster
 import org.piramalswasthya.cho.model.MaritalStatusMaster
 import org.piramalswasthya.cho.model.Patient
 import org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo
+import org.piramalswasthya.cho.model.StatusOfWomanMaster
 import org.piramalswasthya.cho.model.VillageLocationData
+import org.piramalswasthya.cho.database.room.dao.StatusOfWomanDao
+import org.piramalswasthya.cho.database.room.dao.PatientDao
 import org.piramalswasthya.cho.repositories.LanguageRepo
 import org.piramalswasthya.cho.repositories.MaleMasterDataRepository
 import org.piramalswasthya.cho.repositories.PatientRepo
@@ -24,6 +27,7 @@ import org.piramalswasthya.cho.repositories.VaccineAndDoseTypeRepo
 import org.piramalswasthya.cho.repositories.VisitReasonsAndCategoriesRepo
 import org.piramalswasthya.cho.utils.AgeUnitEnum
 import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
@@ -32,12 +36,14 @@ class PatientDetailsViewModel @Inject constructor(
     private val prefDao: PreferenceDao,
     private val userRepo: UserRepo,
     private val userDao: UserDao,
-    private val patientRepo: PatientRepo,
+    val patientRepo: PatientRepo,
+    private val patientDao: PatientDao,
     private val registrarMasterDataRepo: RegistrarMasterDataRepo,
     private val languageRepo: LanguageRepo,
     private val visitReasonsAndCategoriesRepo: VisitReasonsAndCategoriesRepo,
     private val vaccineAndDoseTypeRepo: VaccineAndDoseTypeRepo,
-    private val malMasterDataRepo: MaleMasterDataRepository
+    private val malMasterDataRepo: MaleMasterDataRepository,
+    private val statusOfWomanDao: StatusOfWomanDao
 ) : ViewModel() {
 
     enum class NetworkState {
@@ -105,6 +111,10 @@ class PatientDetailsViewModel @Inject constructor(
     val ageAtMarraigeVal: MutableLiveData<Boolean>
         get() = _ageAtMarraigeVal
 
+    private val _fatherNameVal = MutableLiveData<Boolean>(false)
+    val fatherNameVal: MutableLiveData<Boolean>
+        get() = _fatherNameVal
+
     private val _phoneN=MutableLiveData<PhoneNumberValidation>()
     val phoneN: MutableLiveData<PhoneNumberValidation>
         get() = _phoneN
@@ -147,10 +157,10 @@ class PatientDetailsViewModel @Inject constructor(
     var enteredAge: Int?  = null
     var maritalStatusId: Int?  = null
     var maritalStatusName: String?  = null
-    var enteredAgeYears: Int?  = 0
-    var enteredAgeMonths: Int?  = 0
-    var enteredAgeWeeks: Int?  = 0
-    var enteredAgeDays: Int?  = 0
+    var enteredAgeYears: Int?  = null
+    var enteredAgeMonths: Int?  = null
+    var enteredAgeWeeks: Int?  = null
+    var enteredAgeDays: Int?  = null
     var selectedDateOfBirth: Date?  = null
     var selectedAgeUnit : AgeUnit? = AgeUnit(3,"Years");
     var selectedMaritalStatus : MaritalStatusMaster? = null;
@@ -158,21 +168,38 @@ class PatientDetailsViewModel @Inject constructor(
     var selectedVillage : VillageLocationData? = null;
     lateinit var benVisitInfo: PatientDisplayWithVisitInfo
 
+    // Status of Woman
+    private val _statusOfWoman = MutableLiveData(NetworkState.IDLE)
+    val statusOfWoman: LiveData<NetworkState>
+        get() = _statusOfWoman
+
+    private val _statusOfWomanVal = MutableLiveData<Boolean>(false)
+    val statusOfWomanVal: MutableLiveData<Boolean>
+        get() = _statusOfWomanVal
+    var statusOfWomanList: List<StatusOfWomanMaster> = mutableListOf()
+    var filteredStatusOfWomanList: List<StatusOfWomanMaster> = mutableListOf()
+    var selectedStatusOfWoman: StatusOfWomanMaster? = null
+
     init {
         viewModelScope.launch {
             fetchAgeUnits()
             fetchMaritalStatus()
             fetchGenderMaster()
             fetchVillages()
+            fetchStatusOfWoman()
         }
     }
-   fun setDob(boolean: Boolean){
-       _dobVal.value = boolean
-   }
+    fun setDob(boolean: Boolean){
+        _dobVal.value = boolean
+    }
     fun setFirstName(boolean: Boolean){
         _firstNameVal.value = boolean
     }
 
+    fun setIsDataSaved(value: Boolean?) {
+        _isDataSaved.value = value ?: false
+    }
+
     fun setDataSaved(value: Boolean) {
         _isDataSaved.postValue(value)
     }
@@ -187,7 +214,7 @@ class PatientDetailsViewModel @Inject constructor(
     }
     fun setPhoneN(boolean: Boolean, string: String){
         val phoneNumberValidation = PhoneNumberValidation(boolean, string)
-         _phoneN.value = phoneNumberValidation
+        _phoneN.value = phoneNumberValidation
     }
     fun setGender(boolean: Boolean){
         _genderVal.value = boolean
@@ -201,12 +228,15 @@ class PatientDetailsViewModel @Inject constructor(
     }   fun setSpouse(boolean: Boolean){
         _spouseNameVal.value = boolean
     }
-       fun setAgeGreaterThan11(boolean: Boolean){
-           _ageGreaterThan11.value = boolean
-       }
-     fun setIsClickedSS(boolean: Boolean){
-         _isClickedSS.value = boolean
-     }
+    fun setFatherName(boolean: Boolean){
+        _fatherNameVal.value = boolean
+    }
+    fun setAgeGreaterThan11(boolean: Boolean){
+        _ageGreaterThan11.value = boolean
+    }
+    fun setIsClickedSS(boolean: Boolean){
+        _isClickedSS.value = boolean
+    }
 
 
     suspend fun fetchAgeUnits(){
@@ -285,4 +315,91 @@ class PatientDetailsViewModel @Inject constructor(
         }
     }
 
+    fun updatePatient(patient: Patient) {
+        viewModelScope.launch {
+            patientRepo.updateRecord(patient)
+            benVisitInfo = patientRepo.getPatientDisplayListForNurseByPatient(patient.patientID)
+            _isDataSaved.value = true
+        }
+    }
+
+    fun setStatusOfWoman(boolean: Boolean) {
+        _statusOfWomanVal.value = boolean
+    }
+
+
+    private suspend fun fetchStatusOfWoman() {
+        _statusOfWoman.value = NetworkState.LOADING
+        try {
+            statusOfWomanList = statusOfWomanDao.getAllStatusOfWoman()
+            _statusOfWoman.value = NetworkState.SUCCESS
+        } catch (_: Exception) {
+            _statusOfWoman.value = NetworkState.FAILURE
+        }
+    }
+
+    fun getFilteredStatusOfWomanOptions(
+        genderId: Int?,
+        ageInYears: Int?,
+        maritalStatusId: Int?,
+        maritalStatusName: String?
+    ): List<StatusOfWomanMaster> {
+        if (genderId != 2 || ageInYears == null || ageInYears < 15) return emptyList()
+
+        // Age >= 50: always Elderly Woman regardless of marital status
+        if (ageInYears >= 50) return filterStatusOfWomanByCodes("EL")
+
+        val status = maritalStatusName?.trim()?.lowercase()
+
+        return when {
+            // Age 15-19, Unmarried -> Adolescent Girl
+            status == "unmarried" && ageInYears in 15..19 -> filterStatusOfWomanByCodes("AD")
+            // Age 20-49, Unmarried -> Not Applicable
+            status == "unmarried" -> filterStatusOfWomanByCodes("NA")
+            // Age 15-49, Married -> Eligible Couple, Pregnant Woman, Postnatal, Permanent Sterilization
+            status == "married" -> filterStatusOfWomanByCodes("EC", "PW", "PN", "ST")
+            else -> emptyList()
+        }
+    }
+
+    private fun filterStatusOfWomanByCodes(vararg codes: String): List<StatusOfWomanMaster> {
+        val codeSet = codes.map { it.uppercase(Locale.ROOT) }.toSet()
+        return statusOfWomanList.filter { it.statusCode.uppercase(Locale.ROOT) in codeSet }
+    }
+
+
+    fun shouldShowStatusOfWoman(genderId: Int?, ageInYears: Int?, maritalStatusName: String?): Boolean {
+        if (genderId != 2 || ageInYears == null || ageInYears < 15) return false
+        // Age >= 50: show regardless of marital status
+        if (ageInYears >= 50) return true
+        val status = maritalStatusName?.trim()?.lowercase() ?: return false
+        return status == "married" || status == "unmarried"
+    }
+
+    
+    fun shouldShowMaritalStatus(genderId: Int?, ageInYears: Int?): Boolean {
+        // Show only if gender is selected and age >= 15 years
+        return genderId != null && ageInYears != null && ageInYears >= 15
+    }
+
+    /**
+     * Returns filtered Marital Status options based on gender.
+     * Widow/Widower logic.
+     */
+    fun getFilteredMaritalStatusOptions(genderId: Int?): List<MaritalStatusMaster> {
+        val list = maritalStatusList
+        return when (genderId) {
+            1 -> list.filter { it.status.lowercase() != "widow" } // Male: No "Widow" (Show Widower)
+            2 -> list.filter { it.status.lowercase() != "widower" } // Female: No "Widower" (Show Widow)
+            else -> list
+        }
+    }
+
+    /**
+     * Get all patients for face comparison.
+     */
+    suspend fun getAllPatientsForFaceComparison(): List<Patient> {
+        return patientDao.getAllPatients()
+        }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/WebViewActivity.kt b/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/WebViewActivity.kt
deleted file mode 100644
index cd79f9aea..000000000
--- a/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/WebViewActivity.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.piramalswasthya.cho.ui.web_view_activity
-
-//import android.support.customtabs.CustomTabsIntent
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.widget.Toast
-import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import androidx.browser.customtabs.CustomTabsIntent
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.json.JSONObject
-import org.piramalswasthya.cho.R
-import org.piramalswasthya.cho.database.room.dao.PatientDao
-import org.piramalswasthya.cho.databinding.ActivityWebViewBinding
-import org.piramalswasthya.cho.model.EsanjeevniPatient
-import org.piramalswasthya.cho.model.NetworkBody
-import org.piramalswasthya.cho.network.ESanjeevaniApiService
-import org.piramalswasthya.cho.ui.web_view_activity.web_view.WebViewFragment
-import java.security.MessageDigest
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class WebViewActivity : AppCompatActivity() {
-    @Inject
-    lateinit var patientDao: PatientDao
-
-    @Inject
-    lateinit var apiService : ESanjeevaniApiService
-
-
-    private var _binding : ActivityWebViewBinding? = null
-
-
-    private val binding  : ActivityWebViewBinding
-        get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        _binding = ActivityWebViewBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        launchESanjeenvani()
-    }
-
-
-    @SuppressLint("QueryPermissionsNeeded")
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun launchESanjeenvani(){
-        var username = intent.getStringExtra("usernameEs")!!
-        var passWord = encryptSHA512(encryptSHA512(intent.getStringExtra("passwordEs")!!) + encryptSHA512("token"))
-
-        //creating object using encrypted Password and other details
-        var networkBody = NetworkBody(
-            username,
-            passWord,
-            "token",
-            "11001"
-        )
-
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val patientId = intent.getStringExtra("patientId")!!
-                val patientById = patientDao.getPatientById(patientId)
-                val patient = EsanjeevniPatient(patientById)
-                val savePatientResponse = apiService.savePatient(patient)
-                val responseBody = savePatientResponse.body()?.string()
-                if(responseBody.let { JSONObject(it).getInt("msgCode") }!=1)
-                {
-                    Toast.makeText(baseContext, responseBody.let { JSONObject(it).getString("message") }, Toast.LENGTH_LONG).show()
-                    finish()
-                }
-                else {
-                    val response = apiService.getAuthRefIdForWebView(networkBody)
-                    if (response != null) {
-                        val referenceId = response.model.referenceId
-                        val url = getString(R.string.url_uat_esanjeevani) + referenceId
-                        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-
-                        if (intent.resolveActivity(packageManager) != null) {
-                            startActivity(intent)
-                        } else {
-                            Toast.makeText(baseContext, "No browser found", Toast.LENGTH_LONG).show()
-                        }
-
-//                        val fragmentWebView = WebViewFragment(url);
-//                        supportFragmentManager.beginTransaction()
-//                            .replace(binding.webView.id, fragmentWebView).commit()
-                    } else {
-                        finish()
-                        Toast.makeText(baseContext, getString(R.string.something_went_wrong), Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-            }
-            catch (e: Exception){
-                finish()
-                Toast.makeText(baseContext, getString(R.string.something_went_wrong), Toast.LENGTH_SHORT)
-                    .show()
-            }
-        }
-    }
-
-    suspend fun apicall(){
-
-
-    }
-
-    override fun onBackPressed() {
-        finish()
-//        onDestroy()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
-    private fun encryptSHA512(input: String): String {
-        val digest = MessageDigest.getInstance("SHA-512")
-        val hashBytes = digest.digest(input.toByteArray())
-        return hashBytes.joinToString("") { "%02x".format(it) }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/web_view/WebViewFragment.kt b/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/web_view/WebViewFragment.kt
deleted file mode 100644
index 139cb0682..000000000
--- a/app/src/main/java/org/piramalswasthya/cho/ui/web_view_activity/web_view/WebViewFragment.kt
+++ /dev/null
@@ -1,294 +0,0 @@
-package org.piramalswasthya.cho.ui.web_view_activity.web_view
-
-import android.Manifest
-import android.app.ProgressDialog
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Environment
-import android.provider.MediaStore
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.PermissionRequest
-import android.webkit.ValueCallback
-import android.webkit.WebChromeClient
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.content.FileProvider
-import androidx.fragment.app.Fragment
-import dagger.hilt.android.AndroidEntryPoint
-import org.piramalswasthya.cho.R
-import org.piramalswasthya.cho.databinding.FragmentWebViewBinding
-import java.io.File
-import java.io.IOException
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-
-@AndroidEntryPoint
-class WebViewFragment constructor(
-    private val webUrl: String,
-): Fragment(R.layout.fragment_web_view) {
-
-    private val CAMERA_PERMISSION_REQUEST_CODE = 100
-    private val MIC_PERMISSION_REQUEST_CODE = 101
-    private lateinit var progressDialog: ProgressDialog
-
-    private var _binding: FragmentWebViewBinding? = null
-    private val binding: FragmentWebViewBinding
-        get() = _binding!!
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        _binding = FragmentWebViewBinding.inflate(layoutInflater, container, false)
-        return binding.root
-    }
-
-    private var filePathCallback: ValueCallback<Array<Uri>>? = null
-    private var mediaFile: File? = null
-
-    private val filePickerLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        if (result.resultCode == AppCompatActivity.RESULT_OK) {
-            handleSelectedFiles(result.resultCode, result.data)
-        } else {
-            filePathCallback?.onReceiveValue(null)
-            filePathCallback = null
-        }
-    }
-
-    private val cameraCaptureLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        if (result.resultCode == AppCompatActivity.RESULT_OK) {
-            val mediaUri: Uri = Uri.fromFile(mediaFile)
-            val results = arrayOf(mediaUri)
-            filePathCallback?.onReceiveValue(results)
-            filePathCallback = null
-        } else {
-            filePathCallback?.onReceiveValue(null)
-            filePathCallback = null
-        }
-    }
-
-
-    private val mediaCaptureLauncher: ActivityResultLauncher<Intent> = registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        if (result.resultCode == AppCompatActivity.RESULT_OK) {
-            val mediaUri: Uri = Uri.fromFile(mediaFile)
-            val results = arrayOf(mediaUri)
-            filePathCallback?.onReceiveValue(results)
-            filePathCallback = null
-        } else {
-            filePathCallback?.onReceiveValue(null)
-            filePathCallback = null
-        }
-    }
-
-    private fun handleSelectedFiles(resultCode: Int, data: Intent?) {
-        val results = WebChromeClient.FileChooserParams.parseResult(resultCode, data)
-        filePathCallback?.onReceiveValue(results)
-        filePathCallback = null
-    }
-
-    private fun createAudioCaptureIntent(): Intent? {
-        val audioCaptureIntent = Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION)
-        if (audioCaptureIntent.resolveActivity(requireActivity().packageManager) != null) {
-            try {
-                mediaFile = createMediaFile("AUDIO", ".3gp")
-                val audioUri = Uri.fromFile(mediaFile)
-                audioCaptureIntent.putExtra(MediaStore.EXTRA_OUTPUT, audioUri)
-            } catch (e: IOException) {
-                e.printStackTrace()
-                filePathCallback?.onReceiveValue(null)
-                filePathCallback = null
-                return null
-            }
-        }
-        return audioCaptureIntent
-    }
-
-    private fun createVideoCaptureIntent(): Intent? {
-        val videoCaptureIntent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
-        if (videoCaptureIntent.resolveActivity(requireActivity().packageManager) != null) {
-            try {
-                mediaFile = createMediaFile("VIDEO", ".mp4")
-                val videoUri = FileProvider.getUriForFile(
-                    requireContext(),
-                    "org.piramalswasthya.cho.fileprovider",
-                    mediaFile!!
-                )
-                videoCaptureIntent.putExtra(MediaStore.EXTRA_OUTPUT, videoUri)
-            } catch (e: IOException) {
-                e.printStackTrace()
-                filePathCallback?.onReceiveValue(null)
-                filePathCallback = null
-                return null
-            }
-        }
-        return videoCaptureIntent
-    }
-
-    private fun createImageCaptureIntent(): Intent? {
-        val videoCaptureIntent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
-        if (videoCaptureIntent.resolveActivity(requireActivity().packageManager) != null) {
-            try {
-                mediaFile = createMediaFile("IMAGE", ".png")
-                val videoUri = FileProvider.getUriForFile(
-                    requireContext(),
-                    "your.package.name.fileprovider",
-                    mediaFile!!
-                )
-                videoCaptureIntent.putExtra(MediaStore.EXTRA_OUTPUT, videoUri)
-            } catch (e: IOException) {
-                e.printStackTrace()
-                filePathCallback?.onReceiveValue(null)
-                filePathCallback = null
-                return null
-            }
-        }
-        return videoCaptureIntent
-    }
-
-    private fun createMediaFile(prefix: String, extension: String): File {
-        val timeStamp: String =
-            SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-        val mediaFileName = "$prefix-$timeStamp"
-        val storageDir: File = requireContext().getExternalFilesDir(Environment.DIRECTORY_DCIM)!!
-        return File.createTempFile(mediaFileName, extension, storageDir)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        progressDialog = ProgressDialog.show(activity, "Loading", "Loading eSanjeevani Please wait...", true)
-        progressDialog.setCancelable(false)
-        binding.webview.settings.javaScriptEnabled = true
-        binding.webview.settings.domStorageEnabled = true
-        binding.webview.settings.loadWithOverviewMode = true
-        binding.webview.settings.mediaPlaybackRequiresUserGesture = false
-        binding.webview.settings.useWideViewPort = true
-        binding.webview.settings.allowContentAccess = true
-
-        binding.webview.settings.allowFileAccess = true
-        binding.webview.settings.allowFileAccessFromFileURLs = true
-        binding.webview.settings.allowUniversalAccessFromFileURLs = true
-        binding.webview.settings.loadsImagesAutomatically = true
-
-
-        binding.webview.webViewClient = WebViewClient()
-
-        binding.webview.webViewClient = object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-                progressDialog.show()
-                view.loadUrl(url)
-                return true
-            }
-
-            override fun onPageFinished(view: WebView, url: String) {
-                super.onPageFinished(view, url)
-                progressDialog.dismiss()
-            }
-        }
-
-        binding.webview.webChromeClient = object : WebChromeClient() {
-
-
-            override fun onShowFileChooser(
-                webView: WebView?,
-                filePathCallback: ValueCallback<Array<Uri>>?,
-                fileChooserParams: FileChooserParams?
-            ): Boolean {
-                this@WebViewFragment.filePathCallback = filePathCallback
-
-                val contentSelectionIntent = Intent(Intent.ACTION_GET_CONTENT)
-                contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE)
-                contentSelectionIntent.type = fileChooserParams?.acceptTypes?.firstOrNull() ?: "*/*"
-
-                val captureIntent: Intent? = createVideoCaptureIntent()
-
-                val chooserIntent = Intent(Intent.ACTION_CHOOSER)
-                chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent)
-                chooserIntent.putExtra(Intent.EXTRA_TITLE, "Choose an action")
-                chooserIntent.putExtra(
-                    Intent.EXTRA_INITIAL_INTENTS,
-                    if (captureIntent != null) arrayOf(captureIntent) else emptyArray()
-                )
-
-                filePickerLauncher.launch(chooserIntent)
-                return true
-            }
-
-            override fun onPermissionRequest(request: PermissionRequest) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    when {
-                        request.resources.contains("android.webkit.resource.VIDEO_CAPTURE") -> {
-                            requestCameraPermission()
-                        }
-                        request.resources.contains("android.webkit.resource.AUDIO_CAPTURE") -> {
-                            requestMicPermission()
-                        }
-                    }
-                }
-            }
-
-        }
-
-
-        binding.webview.loadUrl(webUrl)
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        when (requestCode) {
-            CAMERA_PERMISSION_REQUEST_CODE, MIC_PERMISSION_REQUEST_CODE -> {
-                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    // Permission granted, reload the WebView or perform necessary actions
-                    binding.webview.reload()
-                } else {
-                    // Permission denied, handle accordingly
-                    // You may want to show a message or take other actions
-                    Toast.makeText(requireContext(), "Permission denied", Toast.LENGTH_SHORT).show()
-                }
-            }
-        }
-    }
-
-
-
-    private fun requestCameraPermission() {
-        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.CAMERA), CAMERA_PERMISSION_REQUEST_CODE)
-        }
-    }
-
-    private fun requestMicPermission() {
-        if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(requireActivity(), arrayOf(Manifest.permission.RECORD_AUDIO), MIC_PERMISSION_REQUEST_CODE)
-        }
-    }
-
-    override fun onDestroyView() {
-        // Destroy the WebView when the fragment view is destroyed
-         binding?.webview?.let {
-            it.stopLoading()
-            it.destroy()
-        }
-        super.onDestroyView()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/BindingUtils.kt b/app/src/main/java/org/piramalswasthya/cho/utils/BindingUtils.kt
index 3a3607d99..b3bf98683 100644
--- a/app/src/main/java/org/piramalswasthya/cho/utils/BindingUtils.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/BindingUtils.kt
@@ -4,23 +4,127 @@ import android.view.View
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.core.view.doOnAttach
 import androidx.databinding.BindingAdapter
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.utils.DateTimeUtil
+import timber.log.Timber
+import java.util.Date
 
+private const val TAG_RECORD_COUNT_JOB = 0x7f010000 // Arbitrary tag ID
+private const val TAG_RED_BORDER_JOB = 0x7f010001 // Arbitrary tag ID for red border job
 
-    @BindingAdapter("showLayout")
-    fun Button.setVisibilityOfLayout(show: Boolean?) {
-        show?.let {
-            visibility = if (it) View.VISIBLE else View.GONE
-        }
-    }@BindingAdapter("showLayout")
-    fun ImageView.setVisibilityOfLayout(show: Boolean?) {
-        show?.let {
-            visibility = if (it) View.VISIBLE else View.GONE
+
+@BindingAdapter("showLayout")
+fun Button.setVisibilityOfLayout(show: Boolean?) {
+    show?.let {
+        visibility = if (it) View.VISIBLE else View.GONE
+    }
+}
+
+@BindingAdapter("showLayout")
+fun ImageView.setVisibilityOfLayout(show: Boolean?) {
+    show?.let {
+        visibility = if (it) View.VISIBLE else View.GONE
+    }
+}
+
+@BindingAdapter("showLayout")
+fun LinearLayout.setVisibilityOfLayout(show: Boolean?) {
+    show?.let {
+        visibility = if (it) View.VISIBLE else View.GONE
+    }
+}
+
+@BindingAdapter("recordCount")
+fun TextView.setRecordCount(count: Flow<Int>?) {
+    // Cancel any previous collection job
+    val previousJob = getTag(TAG_RECORD_COUNT_JOB) as? Job
+    previousJob?.cancel()
+
+    if (count == null) {
+        text = null
+        return
+    }
+
+    text = null
+
+    // Defer until the view is attached so findViewTreeLifecycleOwner() can resolve.
+    // RecyclerView calls onBindViewHolder before the item is attached, so a synchronous
+    // lookup here would always return null and silently drop the Flow.
+    doOnAttach {
+        val lifecycleOwner = findViewTreeLifecycleOwner() ?: return@doOnAttach
+        val job = lifecycleOwner.lifecycleScope.launch {
+            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                try {
+                    count.collect {
+                        text = it.toString()
+                    }
+                } catch (e: Exception) {
+                    Timber.d("Exception at record count : $e collected")
+                }
+            }
         }
+        setTag(TAG_RECORD_COUNT_JOB, job)
+    }
+}
+
+@BindingAdapter("allowRedBorder", "recordCount")
+fun CardView.setRedBorder(allowRedBorder: Boolean, count: Flow<Int>?) {
+    // Cancel any previous collection job
+    val previousJob = getTag(TAG_RED_BORDER_JOB) as? Job
+    previousJob?.cancel()
+
+    if (count == null) {
+        setBackgroundResource(0)
+        return
     }
-    @BindingAdapter("showLayout")
-    fun LinearLayout.setVisibilityOfLayout(show: Boolean?) {
-        show?.let {
-            visibility = if (it) View.VISIBLE else View.GONE
+
+    setBackgroundResource(0)
+
+    doOnAttach {
+        val lifecycleOwner = findViewTreeLifecycleOwner() ?: return@doOnAttach
+        val job = lifecycleOwner.lifecycleScope.launch {
+            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                try {
+                    count.collect {
+                        if (it > 0 && allowRedBorder) {
+                            setBackgroundResource(R.drawable.red_border)
+                        } else {
+                            setBackgroundResource(0)
+                        }
+                    }
+                } catch (e: Exception) {
+                    Timber.d("Exception at red border : $e collected")
+                }
+            }
         }
-    }
\ No newline at end of file
+        setTag(TAG_RED_BORDER_JOB, job)
+    }
+}
+
+@BindingAdapter("imageResource")
+fun ImageView.setImageResourceBinding(resourceId: Int?) {
+    resourceId?.let {
+        setImageResource(it)
+    }
+}
+
+@BindingAdapter("ageFromDate")
+fun TextView.setAgeFromDate(dateOfBirth: Date?) {
+    text = if (dateOfBirth != null) {
+        DateTimeUtil.calculateAgeString(dateOfBirth)
+    } else {
+        "NA"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/DateTimeUtil.kt b/app/src/main/java/org/piramalswasthya/cho/utils/DateTimeUtil.kt
index ab3925512..7efcd8295 100644
--- a/app/src/main/java/org/piramalswasthya/cho/utils/DateTimeUtil.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/DateTimeUtil.kt
@@ -78,6 +78,8 @@ class DateTimeUtil {
 
     companion object {
 
+        private const val ZERO_DAYS_AGE_TEXT = "0 days"
+
         val ageUnitMap = mapOf(
             AgeUnitEnum.YEARS to "y",
             AgeUnitEnum.MONTHS to "m",
@@ -378,8 +380,16 @@ class DateTimeUtil {
             }
         }
 
-        @RequiresApi(Build.VERSION_CODES.O)
         fun calculateAgeString(dateOfBirth: Date): String {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                calculateAgeStringModern(dateOfBirth)
+            } else {
+                calculateAgeStringLegacy(dateOfBirth)
+            }
+        }
+
+        @RequiresApi(Build.VERSION_CODES.O)
+        private fun calculateAgeStringModern(dateOfBirth: Date): String {
             val birthDate = dateOfBirth.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
             val currentDate = LocalDate.now()
 
@@ -404,7 +414,61 @@ class DateTimeUtil {
 
             }
 
-            return ageString
+            return ageString.ifBlank { ZERO_DAYS_AGE_TEXT }
+        }
+
+        private fun calculateAgeStringLegacy(dateOfBirth: Date): String {
+            val birthCalendar = Calendar.getInstance()
+            birthCalendar.time = dateOfBirth
+            val currentCalendar = Calendar.getInstance()
+
+            var years = currentCalendar.get(Calendar.YEAR) - birthCalendar.get(Calendar.YEAR)
+            var months = currentCalendar.get(Calendar.MONTH) - birthCalendar.get(Calendar.MONTH)
+            var days = currentCalendar.get(Calendar.DAY_OF_MONTH) - birthCalendar.get(Calendar.DAY_OF_MONTH)
+
+            // Adjust for negative days
+            if (days < 0) {
+                months--
+                // Get the actual number of days in the previous month
+                val tempCalendar = Calendar.getInstance()
+                tempCalendar.set(Calendar.YEAR, currentCalendar.get(Calendar.YEAR))
+                tempCalendar.set(Calendar.MONTH, currentCalendar.get(Calendar.MONTH))
+                tempCalendar.set(Calendar.DAY_OF_MONTH, 1)
+                tempCalendar.add(Calendar.DAY_OF_MONTH, -1)
+                val daysInPreviousMonth = tempCalendar.get(Calendar.DAY_OF_MONTH)
+                days += daysInPreviousMonth
+            }
+
+            // Adjust for negative months
+            if (months < 0) {
+                years--
+                months += 12
+            }
+
+            // Adjust for negative years (shouldn't happen, but safety check)
+            if (years < 0) {
+                return ZERO_DAYS_AGE_TEXT
+            }
+
+            // Match the modern implementation's logic: use modulo for months and days
+            months = months % 12
+            days = days % 30
+
+            var ageString = ""
+            if (years > 0) {
+                ageString += "$years years"
+            } else {
+                if (months > 0) {
+                    if (ageString.isNotEmpty()) ageString += ", "
+                    ageString += "$months months"
+                }
+                if (days > 0) {
+                    if (ageString.isNotEmpty()) ageString += ", "
+                    ageString += "$days days"
+                }
+            }
+
+            return ageString.ifBlank { ZERO_DAYS_AGE_TEXT }
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
@@ -460,6 +524,22 @@ class DateTimeUtil {
 
 }
 
+/**
+ * Applies min/max date bounds only when provided. Using 0 as a fallback when null
+ * restricts the picker to epoch (1970-01-01) and crashes if the initial date is later.
+ * max must never be less than min — that also crashes the platform DatePicker.
+ */
+fun DatePicker.applySafeDateConstraints(min: Long?, max: Long?) {
+    when {
+        min != null && max != null -> {
+            minDate = min
+            maxDate = maxOf(min, max)
+        }
+        min != null -> minDate = min
+        max != null -> maxDate = max
+    }
+}
+
 data class AgePicker(val years: Int, val months: Int, val weeks: Int, val days: Int)
 
 
@@ -474,4 +554,3 @@ enum class AgeUnitEnum {
     WEEKS,
     DAYS
 }
-
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/ESanjeevaniLauncher.kt b/app/src/main/java/org/piramalswasthya/cho/utils/ESanjeevaniLauncher.kt
new file mode 100644
index 000000000..c16dee1b3
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/ESanjeevaniLauncher.kt
@@ -0,0 +1,65 @@
+package org.piramalswasthya.cho.utils
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.widget.Toast
+import org.json.JSONObject
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.model.EsanjeevniPatient
+import org.piramalswasthya.cho.model.NetworkBody
+import org.piramalswasthya.cho.network.ESanjeevaniApiService
+import java.security.MessageDigest
+
+object ESanjeevaniLauncher {
+
+    suspend fun launch(
+        context: Context,
+        patientDao: PatientDao,
+        apiService: ESanjeevaniApiService,
+        patientId: String,
+        username: String,
+        password: String
+    ) {
+        val passWord = encryptSHA512(encryptSHA512(password) + encryptSHA512("token"))
+        val networkBody = NetworkBody(username, passWord, "token", "11001")
+
+        try {
+            val patientById = patientDao.getPatientById(patientId)
+            val patient = EsanjeevniPatient(patientById)
+            val savePatientResponse = apiService.savePatient(patient)
+            val responseBody = savePatientResponse.body()?.string()
+            if (responseBody.let { JSONObject(it).getInt("msgCode") } != 1) {
+                Toast.makeText(
+                    context,
+                    responseBody.let { JSONObject(it).getString("message") },
+                    Toast.LENGTH_LONG
+                ).show()
+            } else {
+                val response = apiService.getAuthRefIdForWebView(networkBody)
+                val referenceId = response.model.referenceId
+                val url = context.getString(R.string.url_uat_esanjeevani) + referenceId
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+
+                if (intent.resolveActivity(context.packageManager) != null) {
+                    context.startActivity(intent)
+                } else {
+                    Toast.makeText(context, "No browser found", Toast.LENGTH_LONG).show()
+                }
+            }
+        } catch (e: Exception) {
+            Toast.makeText(
+                context,
+                context.getString(R.string.something_went_wrong),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
+    private fun encryptSHA512(input: String): String {
+        val digest = MessageDigest.getInstance("SHA-512")
+        val hashBytes = digest.digest(input.toByteArray())
+        return hashBytes.joinToString("") { "%02x".format(it) }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/FaceSearchHelper.kt b/app/src/main/java/org/piramalswasthya/cho/utils/FaceSearchHelper.kt
new file mode 100644
index 000000000..6294c6bf4
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/FaceSearchHelper.kt
@@ -0,0 +1,299 @@
+package org.piramalswasthya.cho.utils
+
+import android.Manifest
+import android.app.AlertDialog
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.graphics.ImageDecoder
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
+import android.util.Log
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat.checkSelfPermission
+import androidx.core.content.FileProvider
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.bumptech.glide.Glide
+import com.google.mediapipe.framework.image.BitmapImageBuilder
+import com.google.mediapipe.tasks.core.BaseOptions
+import com.google.mediapipe.tasks.vision.core.RunningMode
+import com.google.mediapipe.tasks.vision.facedetector.FaceDetector
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.R
+import org.piramalswasthya.cho.database.room.dao.PatientDao
+import org.piramalswasthya.cho.facenet.FaceNetModel
+import org.piramalswasthya.cho.facenet.Models
+import org.piramalswasthya.cho.model.Patient
+import org.piramalswasthya.cho.ui.commons.SpeechToTextContract
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import kotlin.math.pow
+
+/**
+ * Reusable helper for search-by-voice (speech-to-text) and search-by-camera (face detection)
+ * functionality in RMNCH fragments.
+ *
+ * Usage:
+ *   1. Create an instance in the fragment **before** `onViewCreated`:
+ *      ```
+ *      private val faceSearchHelper = FaceSearchHelper(this, patientDao) { matched ->
+ *          // handle matched Patient
+ *      }
+ *      ```
+ *   2. In `onViewCreated` / `setupSearch()`, wire the UI:
+ *      ```
+ *      binding.searchTil.setEndIconOnClickListener { faceSearchHelper.launchSpeechToText() }
+ *      binding.cameraIcon.setOnClickListener { faceSearchHelper.launchCameraSearch() }
+ *      ```
+ *   3. Receive the match callback or handle the speech-to-text result via [onSpeechResult].
+ */
+class FaceSearchHelper(
+    private val fragment: Fragment,
+    private val patientDao: PatientDao,
+    private val isCameraSearchEnabled: Boolean = true,
+    private val onSpeechResult: ((String) -> Unit)? = null,
+    private val onFaceMatchResult: ((Patient?) -> Unit)? = null
+) {
+
+    // FaceNet
+    private val modelInfo = Models.FACENET
+    private val useGpu = false
+    private val useXNNPack = true
+    private lateinit var faceNetModel: FaceNetModel
+
+    // Camera
+    private var photoURI: Uri? = null
+    private var currentFileName: String? = null
+
+    // ── Activity-result launchers (MUST be registered at fragment init time) ──
+
+    val speechToTextLauncher: ActivityResultLauncher<Unit> =
+        fragment.registerForActivityResult(SpeechToTextContract()) { result ->
+            if (result.isNotBlank() && !result.any { it.isDigit() }) {
+                onSpeechResult?.invoke(result)
+            }
+        }
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    private val permissionLauncher: ActivityResultLauncher<Array<String>> =
+        fragment.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
+            if (permissions.values.all { it }) {
+                takePicture()
+            } else {
+                Toast.makeText(
+                    fragment.requireContext(),
+                    fragment.getString(R.string.permission_to_access_the_camera_denied),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
+
+    private val takePictureLauncher: ActivityResultLauncher<Uri> =
+        fragment.registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+            if (success) handleCapturedPhoto()
+        }
+
+    // ── Public API ──
+
+    /** Launch the speech-to-text recogniser. */
+    fun launchSpeechToText() {
+        speechToTextLauncher.launch(Unit)
+    }
+
+    /** Show a loading dialog, initialise FaceNet, then open the camera. */
+    fun launchCameraSearch() {
+        if (!isCameraSearchEnabled) return
+        val ctx = fragment.requireContext()
+        val dialogView = fragment.layoutInflater.inflate(R.layout.dialog_progress, null)
+        dialogView.findViewById<ImageView>(R.id.loading_gif)?.let {
+            Glide.with(fragment).load(R.drawable.face).into(it)
+        }
+        val dialog = AlertDialog.Builder(ctx)
+            .setView(dialogView)
+            .setCancelable(false)
+            .create()
+        dialog.show()
+
+        fragment.lifecycleScope.launch(Dispatchers.IO) {
+            faceNetModel = FaceNetModel(fragment.requireActivity(), modelInfo, useGpu, useXNNPack)
+            withContext(Dispatchers.Main) {
+                if (fragment.isAdded) {
+                    dialog.dismiss()
+                    checkAndRequestCameraPermission()
+                }
+            }
+        }
+    }
+
+    // ── Internal camera flow ──
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    private fun checkAndRequestCameraPermission() {
+        val ctx = fragment.requireContext()
+        if (checkSelfPermission(ctx, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED ||
+            checkSelfPermission(ctx, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+        ) {
+            takePicture()
+        } else {
+            permissionLauncher.launch(
+                arrayOf(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+            )
+        }
+    }
+
+    private fun takePicture() {
+        val ctx = fragment.requireContext()
+        val photoFile: File? = try {
+            createImageFile(ctx)
+        } catch (_: Exception) {
+            null
+        }
+        photoFile?.also {
+            val uri = FileProvider.getUriForFile(ctx, ctx.packageName + ".provider", it)
+            photoURI = uri
+            takePictureLauncher.launch(uri)
+        }
+    }
+
+    private fun createImageFile(ctx: android.content.Context): File {
+        val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.getDefault()).format(Date())
+        val storageDir = ctx.getExternalFilesDir("images")
+        currentFileName = "JPEG_${timeStamp}_.jpeg"
+        var file = File(storageDir, currentFileName)
+        var counter = 1
+        while (file.exists()) {
+            currentFileName = "JPEG_${timeStamp}_$counter.jpeg"
+            file = File(storageDir, currentFileName)
+            counter++
+        }
+        return file
+    }
+
+    // ── Face detection & matching ──
+
+    private fun handleCapturedPhoto() {
+        val ctx = fragment.requireContext()
+        val uri = photoURI
+        if (uri == null) {
+            Toast.makeText(ctx, "Photo capture failed. Please try again.", Toast.LENGTH_SHORT).show()
+            return
+        }
+        try {
+            val baseOpts = BaseOptions.builder().setModelAssetPath("blaze_face_short_range.tflite")
+            val options = FaceDetector.FaceDetectorOptions.builder()
+                .setBaseOptions(baseOpts.build())
+                .setMinDetectionConfidence(0.75f)
+                .setRunningMode(RunningMode.IMAGE)
+                .build()
+            val faceDetector = FaceDetector.createFromOptions(ctx, options)
+
+            val maxDimension = 1024
+            val imageBitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                val source = ImageDecoder.createSource(ctx.contentResolver, uri)
+                ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
+                    val size = info.size
+                    val sampleSize = maxOf(size.width, size.height) / maxDimension
+                    if (sampleSize > 1) decoder.setTargetSampleSize(sampleSize)
+                    decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+                }
+            } else {
+                @Suppress("DEPRECATION")
+                MediaStore.Images.Media.getBitmap(ctx.contentResolver, uri)
+            }.copy(Bitmap.Config.ARGB_8888, true)
+
+            val mpImage = BitmapImageBuilder(imageBitmap).build()
+            val detectionResult = faceDetector.detect(mpImage)
+
+            when {
+                detectionResult.detections().isEmpty() -> {
+                    Toast.makeText(ctx, "No face detected", Toast.LENGTH_SHORT).show()
+                    faceDetector.close()
+                    return
+                }
+                detectionResult.detections().size > 1 -> {
+                    Toast.makeText(ctx, "Multiple faces detected", Toast.LENGTH_SHORT).show()
+                    faceDetector.close()
+                    return
+                }
+            }
+
+            val detection = detectionResult.detections()[0]
+            val box = detection.boundingBox()
+
+            if (box.right <= box.left || box.bottom <= box.top) {
+                Toast.makeText(ctx, "Invalid face detection", Toast.LENGTH_SHORT).show()
+                faceDetector.close()
+                return
+            }
+
+            val left = box.left.toInt().coerceAtLeast(0)
+            val top = box.top.toInt().coerceAtLeast(0)
+            val right = box.right.toInt().coerceAtMost(imageBitmap.width)
+            val bottom = box.bottom.toInt().coerceAtMost(imageBitmap.height)
+            val width = right - left
+            val height = bottom - top
+
+            if (width <= 0 || height <= 0 || left >= imageBitmap.width || top >= imageBitmap.height) {
+                Toast.makeText(ctx, "Invalid face detection", Toast.LENGTH_SHORT).show()
+                faceDetector.close()
+                return
+            }
+
+            val faceBitmap = Bitmap.createBitmap(imageBitmap, left, top, width, height)
+            faceDetector.close()
+
+            val embeddings = faceNetModel.getFaceEmbedding(faceBitmap)
+            if (embeddings == null) {
+                Toast.makeText(ctx, "Failed to generate face embeddings", Toast.LENGTH_SHORT).show()
+                return
+            }
+
+            fragment.lifecycleScope.launch {
+                val matchedPatient = compareFacesL2Norm(embeddings)
+                onFaceMatchResult?.invoke(matchedPatient)
+            }
+
+        } catch (e: Exception) {
+            Log.e("FaceSearchHelper", "Face detection failed", e)
+            Toast.makeText(ctx, "Face detection failed: ${e.message}", Toast.LENGTH_SHORT).show()
+        }
+    }
+
+    private suspend fun compareFacesL2Norm(newEmbedding: FloatArray): Patient? {
+        var bestMatch: Patient? = null
+        var bestDistance = Float.MAX_VALUE
+
+        val patients = withContext(Dispatchers.IO) { patientDao.getAllPatients() }
+        withContext(Dispatchers.Default) {
+            for (patient in patients) {
+                val patientEmbedding = patient.faceEmbedding?.toFloatArray()
+                if (patientEmbedding == null || patientEmbedding.isEmpty()) continue
+
+                val distance = l2Norm(newEmbedding, patientEmbedding)
+                if (distance < bestDistance) {
+                    bestDistance = distance
+                    bestMatch = patient
+                }
+            }
+        }
+
+        return if (bestDistance < Models.FACENET.l2Threshold) bestMatch else null
+    }
+
+    private fun l2Norm(x1: FloatArray, x2: FloatArray): Float {
+        var sum = 0.0f
+        for (i in x1.indices) {
+            sum += (x1[i] - x2[i]).pow(2)
+        }
+        return kotlin.math.sqrt(sum)
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/ImgUtils.kt b/app/src/main/java/org/piramalswasthya/cho/utils/ImgUtils.kt
index 248a19124..54dd3ffc8 100644
--- a/app/src/main/java/org/piramalswasthya/cho/utils/ImgUtils.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/ImgUtils.kt
@@ -3,10 +3,12 @@ package org.piramalswasthya.cho.utils
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.net.Uri
 import android.os.Build
 import java.util.Base64
 import android.util.Base64 as base64
 import androidx.annotation.RequiresApi
+import timber.log.Timber
 import java.io.ByteArrayOutputStream
 import java.io.File
 
@@ -21,35 +23,40 @@ object ImgUtils {
     }
     @RequiresApi(Build.VERSION_CODES.O)
     fun getEncodedStringForBenImage(context: Context, fileName: String?): String? {
-        if (!fileName.isNullOrEmpty()) {
-            val file = File(context.getExternalFilesDir("images"), fileName)
-
-            if (file.exists()) {
-                try {
-                    val options = BitmapFactory.Options()
-                    options.inSampleSize = 4
-                    val bm = BitmapFactory.decodeFile(file.path, options)
-                    val stream = ByteArrayOutputStream()
-                    bm.compress(Bitmap.CompressFormat.JPEG, 20, stream)
-                    val byteFormat = stream.toByteArray()
-                    if (!Base64.getEncoder().encodeToString(byteFormat).isNullOrEmpty()) {
-                        return "data:image/png;base64," + Base64.getEncoder()
-                            .encodeToString(byteFormat)
-                    }
-                    return null
-
-                } catch (e: Exception) {
-                    // Handle the IOException here, log or return null as needed
-                    e.printStackTrace()
-                    return null
-                }
-            } else {
-                // Handle the case where the file doesn't exist, log or return null as needed
-                return null
+        if (fileName.isNullOrEmpty()) return null
+
+        val file = File(context.getExternalFilesDir("images"), fileName)
+        if (!file.exists()) return null
+
+        return try {
+            val options = BitmapFactory.Options()
+            options.inSampleSize = 4
+            var bm = BitmapFactory.decodeFile(file.path, options)
+
+            // Correct EXIF rotation — camera photos are often saved sideways
+            val exif = android.media.ExifInterface(file.path)
+            val orientation = exif.getAttributeInt(
+                android.media.ExifInterface.TAG_ORIENTATION,
+                android.media.ExifInterface.ORIENTATION_NORMAL
+            )
+            val matrix = android.graphics.Matrix()
+            when (orientation) {
+                android.media.ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+                android.media.ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
+                android.media.ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
             }
-        }
-        else {
-            return null
+            if (!matrix.isIdentity) {
+                bm = Bitmap.createBitmap(bm, 0, 0, bm.width, bm.height, matrix, true)
+            }
+
+            val stream = ByteArrayOutputStream()
+            bm.compress(Bitmap.CompressFormat.JPEG, 20, stream)
+            val byteFormat = stream.toByteArray()
+            val encoded = Base64.getEncoder().encodeToString(byteFormat)
+            if (encoded.isNullOrEmpty()) null else "data:image/png;base64,$encoded"
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
         }
     }
 
@@ -75,4 +82,101 @@ object ImgUtils {
         return BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.size)
     }
 
+    /**
+     * Turns a gallery/camera URI or local path into a compressed data-URI base64
+     * string for API upload. Downsamples 4× and re-encodes JPEG at quality 20 so
+     * the resulting payload fits comfortably inside server-side column limits —
+     * a raw multi-MB photo would otherwise blow up the ancVisit/saveAll endpoint
+     * with a `statusCode:5000 "Saving anc data to db failed"`. EXIF rotation is
+     * preserved when the source has a file path we can read it from.
+     * Leaves values that already look like API/base64 payloads unchanged.
+     */
+    fun encodeLocalImageValueForUpload(context: Context, value: String?): String? {
+        val v = value?.trim().orEmpty()
+        if (v.isEmpty()) return null
+        if (v.startsWith("data:image/", ignoreCase = true)) return v
+        if (!v.contains("://") && v.length > 200) return v
+
+        return try {
+            val options = BitmapFactory.Options().apply { inSampleSize = 4 }
+            val exifPath: String? = if (!v.contains("://") && v.startsWith("/")) v else null
+
+            // Decode straight from the file / InputStream so inSampleSize=4 caps
+            // peak memory at ~(width/4 × height/4 × 4 bytes). readBytes() would
+            // first materialise the full multi-MB JPEG on the heap, defeating
+            // the downsample and OOM-ing on low-RAM devices.
+            var bitmap: Bitmap = if (exifPath != null) {
+                if (!File(exifPath).exists()) return null
+                BitmapFactory.decodeFile(exifPath, options) ?: return null
+            } else {
+                val uri = Uri.parse(v)
+                context.contentResolver.openInputStream(uri)?.use { input ->
+                    BitmapFactory.decodeStream(input, null, options)
+                } ?: return null
+            }
+
+            // EXIF rotation is only retrievable from a file on disk.
+            if (exifPath != null) {
+                val exif = android.media.ExifInterface(exifPath)
+                val orientation = exif.getAttributeInt(
+                    android.media.ExifInterface.TAG_ORIENTATION,
+                    android.media.ExifInterface.ORIENTATION_NORMAL
+                )
+                val matrix = android.graphics.Matrix()
+                when (orientation) {
+                    android.media.ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+                    android.media.ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
+                    android.media.ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
+                }
+                if (!matrix.isIdentity) {
+                    val rotated = Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
+                    if (rotated !== bitmap) bitmap.recycle()
+                    bitmap = rotated
+                }
+            }
+
+            val out = ByteArrayOutputStream()
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 20, out)
+            bitmap.recycle()
+            val encoded = base64.encodeToString(out.toByteArray(), base64.NO_WRAP)
+            "data:image/jpeg;base64,$encoded"
+        } catch (e: Exception) {
+            Timber.e(e, "encodeLocalImageValueForUpload failed for value prefix=${v.take(48)}")
+            null
+        }
+    }
+
+    /**
+     * Persists a picked image (content://, file://, or absolute path) into
+     * app-private internal storage and returns its absolute path. Returning
+     * a path keeps Room rows tiny — base64 encoding only happens at upload.
+     *
+     * Idempotent: an existing absolute path is returned as-is. Legacy data-URI
+     * base64 values return null (their payload can't be safely materialised
+     * here; the v146→147 migration scrubs them anyway).
+     */
+    fun saveImageToInternalStorage(context: Context, source: String?): String? {
+        val raw = source?.trim().orEmpty()
+        if (raw.isEmpty()) return null
+        if (raw.startsWith("data:image", ignoreCase = true)) return null
+        if (!raw.contains("://") && raw.startsWith("/")) {
+            return if (File(raw).exists()) raw else null
+        }
+        return try {
+            val uri = Uri.parse(raw)
+            val dir = File(context.filesDir, "abortion_images").apply { mkdirs() }
+            val outFile = File(
+                dir,
+                "img_${System.currentTimeMillis()}_${java.util.UUID.randomUUID()}.jpg"
+            )
+            context.contentResolver.openInputStream(uri)?.use { input ->
+                outFile.outputStream().use { output -> input.copyTo(output) }
+            } ?: return null
+            outFile.absolutePath
+        } catch (e: Exception) {
+            Timber.e(e, "saveImageToInternalStorage failed for prefix=${raw.take(48)}")
+            null
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/InAppUpdateHelper.kt b/app/src/main/java/org/piramalswasthya/cho/utils/InAppUpdateHelper.kt
index 654375f1c..6ff56ab2a 100644
--- a/app/src/main/java/org/piramalswasthya/cho/utils/InAppUpdateHelper.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/InAppUpdateHelper.kt
@@ -140,9 +140,9 @@ class InAppUpdateHelper(
     private fun showUpdateDownloadedSnackbar() {
         Snackbar.make(
             activity.findViewById(android.R.id.content),
-            "An update is ready to install.",
+            activity.getString(org.piramalswasthya.cho.R.string.update_ready_to_install),
             Snackbar.LENGTH_INDEFINITE
-        ).setAction("Restart") {
+        ).setAction(activity.getString(org.piramalswasthya.cho.R.string.restart)) {
             appUpdateManager.completeUpdate()
         }.show()
     }
@@ -150,9 +150,9 @@ class InAppUpdateHelper(
     private fun showRetrySnackbar() {
         Snackbar.make(
             activity.findViewById(android.R.id.content),
-            "Update was canceled or failed.",
+            activity.getString(org.piramalswasthya.cho.R.string.update_canceled_or_failed),
             Snackbar.LENGTH_LONG
-        ).setAction("Try Again") {
+        ).setAction(activity.getString(org.piramalswasthya.cho.R.string.try_again_btn)) {
             checkForUpdate()
         }.show()
     }
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/KeyboardUtils.kt b/app/src/main/java/org/piramalswasthya/cho/utils/KeyboardUtils.kt
new file mode 100644
index 000000000..0cc3b3844
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/KeyboardUtils.kt
@@ -0,0 +1,112 @@
+package org.piramalswasthya.cho.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.AutoCompleteTextView
+
+object KeyboardUtils {
+
+    fun hideKeyboard(view: View) {
+        val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        view.windowToken?.let {
+            imm?.hideSoftInputFromWindow(it, InputMethodManager.HIDE_NOT_ALWAYS)
+            imm?.hideSoftInputFromWindow(it, 0)
+        }
+        view.rootView?.let { rootView ->
+            rootView.windowToken?.let {
+                imm?.hideSoftInputFromWindow(it, InputMethodManager.HIDE_NOT_ALWAYS)
+                imm?.hideSoftInputFromWindow(it, 0)
+            }
+        }
+        val activity = (view.context as? android.app.Activity)
+        activity?.currentFocus?.windowToken?.let {
+            imm?.hideSoftInputFromWindow(it, InputMethodManager.HIDE_NOT_ALWAYS)
+            imm?.hideSoftInputFromWindow(it, 0)
+        }
+    }
+
+    fun hideKeyboardFromActivity(context: Context) {
+        val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        val activity = (context as? android.app.Activity) ?: return
+        val view = activity.currentFocus ?: activity.window.decorView.rootView
+        view.windowToken?.let {
+            imm?.hideSoftInputFromWindow(it, InputMethodManager.HIDE_NOT_ALWAYS)
+            imm?.hideSoftInputFromWindow(it, 0)
+        }
+    }
+}
+
+@SuppressLint("ClickableViewAccessibility")
+fun AutoCompleteTextView.setupDropdownKeyboardHandling() {
+    val existingFocusListener = onFocusChangeListener
+
+    showSoftInputOnFocus = false
+
+    val lastClickTimeTag = "last_click_time"
+    val tagExistingClickListener = View.generateViewId()
+
+    isFocusable = true
+    isFocusableInTouchMode = true
+    isClickable = true
+
+    val existingClickListener = getTag(tagExistingClickListener) as? View.OnClickListener
+
+    setOnTouchListener { view, event ->
+        when (event.action) {
+            MotionEvent.ACTION_UP -> {
+                if (isRapidClick(lastClickTimeTag.hashCode())) return@setOnTouchListener true
+
+                hideKeyboardForSelfAndActivity()
+
+                performClickSafely(view, existingClickListener)
+
+                toggleDropdownState()
+
+                return@setOnTouchListener true
+            }
+            MotionEvent.ACTION_DOWN -> {
+                hideKeyboardForSelfAndActivity()
+            }
+            else -> Unit
+        }
+        false
+    }
+
+    setOnFocusChangeListener { view, hasFocus ->
+        if (hasFocus) {
+            hideKeyboardForSelfAndActivity()
+        }
+        existingFocusListener?.onFocusChange(view, hasFocus)
+    }
+}
+
+// --- Small, focused helpers to reduce cognitive complexity of the public method ---
+private fun AutoCompleteTextView.hideKeyboardForSelfAndActivity() {
+    KeyboardUtils.hideKeyboard(this)
+    KeyboardUtils.hideKeyboardFromActivity(context)
+}
+
+private fun AutoCompleteTextView.isRapidClick(lastClickTimeTagHash: Int): Boolean {
+    val currentTime = System.currentTimeMillis()
+    val lastClickTime = getTag(lastClickTimeTagHash) as? Long ?: 0L
+    if (currentTime - lastClickTime < 300) return true
+    setTag(lastClickTimeTagHash, currentTime)
+    return false
+}
+
+private fun AutoCompleteTextView.performClickSafely(view: View, existingClickListener: View.OnClickListener?) {
+    existingClickListener?.onClick(view)
+    view.performClick()
+}
+
+private fun AutoCompleteTextView.toggleDropdownState() {
+    if (adapter == null || adapter.count == 0) return
+    if (isPopupShowing) {
+        dismissDropDown()
+    } else {
+        showDropDown()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/MasterDataLocalizer.kt b/app/src/main/java/org/piramalswasthya/cho/utils/MasterDataLocalizer.kt
new file mode 100644
index 000000000..ce1c46472
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/MasterDataLocalizer.kt
@@ -0,0 +1,85 @@
+package org.piramalswasthya.cho.utils
+
+import android.content.Context
+import android.content.res.Resources
+import org.piramalswasthya.cho.R
+import java.util.Locale
+
+object MasterDataLocalizer {
+
+    private data class LocaleMaps(
+        val forward: Map<String, String>,
+        val reverse: Map<String, String>
+    )
+
+    private val chiefComplaintCache = mutableMapOf<Locale, LocaleMaps>()
+    private val durationUnitCache = mutableMapOf<Locale, LocaleMaps>()
+
+    fun localizeChiefComplaint(context: Context, englishCanonical: String?): String {
+        if (englishCanonical.isNullOrEmpty()) return englishCanonical.orEmpty()
+        return chiefComplaintMaps(context).forward[englishCanonical] ?: englishCanonical
+    }
+
+    fun canonicalizeChiefComplaint(context: Context, displayedText: String?): String? {
+        if (displayedText.isNullOrEmpty()) return null
+        val maps = chiefComplaintMaps(context)
+        if (maps.forward.containsKey(displayedText)) return displayedText
+        return maps.reverse[displayedText]
+    }
+
+    fun localizeDurationUnit(context: Context, englishCanonical: String?): String {
+        if (englishCanonical.isNullOrEmpty()) return englishCanonical.orEmpty()
+        return durationUnitMaps(context).forward[englishCanonical] ?: englishCanonical
+    }
+
+    fun canonicalizeDurationUnit(context: Context, displayedText: String?): String? {
+        if (displayedText.isNullOrEmpty()) return null
+        val maps = durationUnitMaps(context)
+        if (maps.forward.containsKey(displayedText)) return displayedText
+        return maps.reverse[displayedText]
+    }
+
+    private fun chiefComplaintMaps(context: Context): LocaleMaps =
+        cachedMaps(
+            context,
+            chiefComplaintCache,
+            R.array.chief_complaint_en_keys,
+            R.array.chief_complaint_localized
+        )
+
+    private fun durationUnitMaps(context: Context): LocaleMaps =
+        cachedMaps(
+            context,
+            durationUnitCache,
+            R.array.duration_units_en_keys,
+            R.array.duration_units_localized
+        )
+
+    private fun cachedMaps(
+        context: Context,
+        cache: MutableMap<Locale, LocaleMaps>,
+        keysArrayId: Int,
+        valuesArrayId: Int
+    ): LocaleMaps {
+        val locale = currentLocale(context.resources)
+        cache[locale]?.let { return it }
+        val keys = context.resources.getStringArray(keysArrayId)
+        val values = context.resources.getStringArray(valuesArrayId)
+        val pairs = keys.zip(values).filter { it.first.isNotEmpty() && it.second.isNotEmpty() }
+        val forward = pairs.toMap()
+        val reverse = pairs.associate { (en, localized) -> localized to en }
+        val maps = LocaleMaps(forward, reverse)
+        cache[locale] = maps
+        return maps
+    }
+
+    @Suppress("DEPRECATION")
+    private fun currentLocale(resources: Resources): Locale {
+        val config = resources.configuration
+        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            config.locales.get(0) ?: Locale.getDefault()
+        } else {
+            config.locale ?: Locale.getDefault()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/utils/RMNCHAUtils.kt b/app/src/main/java/org/piramalswasthya/cho/utils/RMNCHAUtils.kt
new file mode 100644
index 000000000..5d7251556
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/utils/RMNCHAUtils.kt
@@ -0,0 +1,116 @@
+package org.piramalswasthya.cho.utils
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.EditText
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import org.piramalswasthya.cho.model.Patient
+
+/**
+ * Utility functions for RMNCHA+ Activities to reduce code duplication
+ */
+
+/**
+ * Extension function to filter patients by common search fields
+ * Searches in: firstName, lastName, spouseName, phoneNo, beneficiaryID
+ */
+fun <T : Any> List<T>.filterPatientsByQuery(
+    query: String,
+    patientExtractor: (T) -> Patient
+): List<T> {
+    if (query.isBlank()) return this
+
+    val searchQuery = query.lowercase()
+    return filter { item ->
+        val patient = patientExtractor(item)
+        val firstName = patient.firstName?.lowercase() ?: ""
+        val lastName = patient.lastName?.lowercase() ?: ""
+        val spouseName = patient.spouseName?.lowercase() ?: ""
+        val phoneNo = patient.phoneNo ?: ""
+        val beneficiaryID = patient.beneficiaryID?.toString() ?: ""
+
+        firstName.contains(searchQuery) ||
+                lastName.contains(searchQuery) ||
+                spouseName.contains(searchQuery) ||
+                phoneNo.contains(searchQuery) ||
+                beneficiaryID.contains(searchQuery)
+    }
+}
+
+/**
+ * Extension function to setup search TextWatcher
+ */
+fun EditText.setupSearchTextWatcher(onTextChanged: (String) -> Unit) {
+    addTextChangedListener(object : TextWatcher {
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+            // No action needed before text changes
+        }
+
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            // No action needed during text changes - handled in afterTextChanged
+        }
+
+        override fun afterTextChanged(s: Editable?) {
+            onTextChanged(s?.toString() ?: "")
+        }
+    })
+}
+
+/**
+ * Extension function to update UI with filtered list
+ * Handles empty state, count display, and RecyclerView visibility
+ */
+fun <T> updateListUI(
+    filteredList: List<T>,
+    emptyStateView: FrameLayout,
+    recyclerView: RecyclerView,
+    countTextView: TextView,
+    resultString: String,
+    logMessage: String = ""
+) {
+    if (filteredList.isEmpty()) {
+        emptyStateView.visibility = View.VISIBLE
+        recyclerView.visibility = View.GONE
+        countTextView.text = "0 $resultString"
+    } else {
+        emptyStateView.visibility = View.GONE
+        recyclerView.visibility = View.VISIBLE
+
+        val countText = if (filteredList.size == 1) {
+            "1 $resultString"
+        } else {
+            "${filteredList.size} ${resultString}s"
+        }
+        countTextView.text = countText
+    }
+
+    if (logMessage.isNotEmpty()) {
+        timber.log.Timber.d("$logMessage: ${filteredList.size}")
+    }
+}
+
+/**
+ * Extension function to setup toolbar with back button
+ */
+fun androidx.appcompat.app.AppCompatActivity.setupToolbarWithBack(
+    toolbar: androidx.appcompat.widget.Toolbar,
+    title: String
+) {
+    setSupportActionBar(toolbar)
+    supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    supportActionBar?.title = title
+}
+
+/**
+ * Helper function to get result string resource
+ */
+fun getResultString(count: Int, resultString: String): String {
+    return if (count == 1) {
+        "1 $resultString"
+    } else {
+        "$count ${resultString}s"
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/BaseAmritSyncWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/BaseAmritSyncWorker.kt
new file mode 100644
index 000000000..a80a7a418
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/BaseAmritSyncWorker.kt
@@ -0,0 +1,67 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import timber.log.Timber
+import java.net.SocketTimeoutException
+
+abstract class BaseAmritSyncWorker(
+    appContext: Context,
+    params: WorkerParameters,
+    private val preferenceDao: PreferenceDao
+) : CoroutineWorker(appContext, params) {
+
+    protected abstract suspend fun runSync(): Boolean
+    protected abstract val successLog: String
+    protected abstract val failureLog: String
+    protected abstract val timeoutLogScope: String
+
+    final override suspend fun doWork(): Result {
+        initTokens()
+        return try {
+            val workerResult = runSync()
+            if (workerResult) {
+                Timber.d(successLog)
+                Result.success()
+            } else {
+                Timber.d(failureLog)
+                Result.failure()
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.e("Caught Exception for $timeoutLogScope $e")
+            Result.retry()
+        }
+    }
+
+    private fun initTokens() {
+        if (TokenInsertTmcInterceptor.getToken() == "") {
+            preferenceDao.getPrimaryApiToken()?.let {
+                TokenInsertTmcInterceptor.setToken(it)
+            }
+        }
+        if (TokenInsertTmcInterceptor.getJwt() == "") {
+            preferenceDao.getJWTAmritToken()?.let {
+                TokenInsertTmcInterceptor.setJwt(it)
+            }
+        }
+    }
+}
+
+abstract class BasePushAmritSyncWorker(
+    appContext: Context,
+    params: WorkerParameters,
+    preferenceDao: PreferenceDao
+) : BaseAmritSyncWorker(appContext, params, preferenceDao) {
+    final override val timeoutLogScope: String = "push amrit worker"
+}
+
+abstract class BasePullAmritSyncWorker(
+    appContext: Context,
+    params: WorkerParameters,
+    preferenceDao: PreferenceDao
+) : BaseAmritSyncWorker(appContext, params, preferenceDao) {
+    final override val timeoutLogScope: String = "pull amrit worker"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullAncVisitsWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullAncVisitsWorker.kt
new file mode 100644
index 000000000..b57d8f2fd
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullAncVisitsWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+
+@HiltWorker
+class PullAncVisitsWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullAncVisitsWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PullAncVisitsWorker started",
+            successLog = "PullAncVisitsWorker completed successfully",
+            failureLog = "PullAncVisitsWorker failed",
+            retryLog = "Caught exception for PullAncVisitsWorker"
+        ) {
+            maternalHealthRepo.pullAncVisitsFromServer()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullBenFlowFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullBenFlowFromAmritWorker.kt
index 9eab20bd8..2cd85539d 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/PullBenFlowFromAmritWorker.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullBenFlowFromAmritWorker.kt
@@ -39,6 +39,30 @@ class PullBenFlowFromAmritWorker @AssistedInject constructor(
 
     companion object {
         const val name = "PullBenFlowFromAmritWorker"
+
+        // Set on the request (via input data) when this worker runs inside an upsync/form-save
+        // chain purely to land the just-pushed patient's benflow so the nurse/doctor push can
+        // proceed. In that mode an incomplete run is RELEASED immediately (no retry): the local
+        // patient we just registered always matches on the first pass, so its benflow row is
+        // inserted regardless of other beneficiaries. Retrying would re-download the full village
+        // payload 3x with backoff and block the push chain for no benefit — the other
+        // beneficiaries' worklists are recovered by the periodic/full down-sync instead.
+        const val KEY_RELEASE_ON_INCOMPLETE = "release_on_incomplete"
+
+        // Set on the request (via input data) when this worklist pull runs in the upsync/form-save
+        // chain to land a JUST-created benflow. It pulls the full worklist (epoch watermark) instead
+        // of the incremental hour-truncated watermark, which would otherwise filter out a benflow
+        // created seconds earlier and leave the nurse/doctor push gate permanently UNSYNCED. Safe
+        // because the worklist pass does not advance the watermark.
+        const val KEY_IGNORE_WATERMARK = "ignore_watermark"
+
+        // Initial run + up to 2 retries (3 executions total). A retry fires when the
+        // benflow->patient join misses because the concurrent patient pull hasn't
+        // landed the row yet; by the retry the patient pull has typically finished. We
+        // cap attempts and then release the chain with success() — the watermark is
+        // still at epoch on an incomplete run, so the next periodic down-sync
+        // re-downloads the full payload and recovers with no data loss.
+        private const val MAX_RUN_ATTEMPTS = 3
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
@@ -48,18 +72,38 @@ class PullBenFlowFromAmritWorker @AssistedInject constructor(
 
                 Log.d("Benflow In Progress", "Benflow In Progress")
 
-                val currentInstant = Instant.now()
-                val currentDateTime = LocalDateTime.ofInstant(currentInstant, ZoneId.of("Asia/Kolkata"))
-                val startOfHour = currentDateTime.withMinute(0).withSecond(0).withNano(0)
-                val currTimeStamp = startOfHour.atZone(ZoneId.of("Asia/Kolkata")).toInstant().toEpochMilli()
-
-                val workerResult = benFlowRepo.downloadAndSyncFlowRecords()
+                // Worklist-only pass: inserts benflow rows and builds the role worklists
+                // (PATIENT_VISIT_INFO_SYNC) so the Nurse/Doctor/Lab/Pharmacist lists appear early.
+                // The slow per-beneficiary nurse/doctor case-record pull (~2 API calls per
+                // beneficiary) AND the benflow watermark advance are deferred to
+                // PullClinicalRecordsWorker at the END of the chain, so the RMNCH/CPHC pulls are
+                // not blocked behind the per-beneficiary loop. Because the watermark is NOT
+                // advanced here, the same fresh payload remains available to the clinical worker.
+                val ignoreWatermark = inputData.getBoolean(KEY_IGNORE_WATERMARK, false)
+                val workerResult = benFlowRepo.downloadAndSyncFlowRecords(pullClinical = false, ignoreWatermark = ignoreWatermark)
+                val releaseOnIncomplete = inputData.getBoolean(KEY_RELEASE_ON_INCOMPLETE, false)
                 if (workerResult) {
-                    preferenceDao.setLastBenflowSyncTime(currTimeStamp)
+                    Timber.d("Benflow worklist sync completed")
+                    Result.success()
+                } else if (releaseOnIncomplete) {
+                    // Upsync/form-save path: the just-pushed patient's benflow is already inserted
+                    // in this single pass, so the nurse/doctor push can proceed now. Skip the
+                    // full-payload retry storm (other beneficiaries are recovered by down-sync).
+                    Timber.d("Benflow worklist incomplete; releasing upsync chain without retry")
+                    Result.success()
+                } else if (runAttemptCount < MAX_RUN_ATTEMPTS - 1) {
+                    // Incomplete run: a benflow row had no matching local patient yet
+                    // (the patient down-sync on the concurrent chain hasn't landed it).
+                    // Retry shortly — the patient pull will have finished and the join
+                    // populates the role worklists.
+                    Timber.d("Benflow worklist incomplete (patient join missed); retry attempt ${runAttemptCount + 1}")
+                    Result.retry()
+                } else {
+                    // Give up after MAX_RUN_ATTEMPTS so the chain is released. The clinical
+                    // worker at the end retries the join and only then advances the watermark.
+                    Timber.d("Benflow worklist still incomplete after $MAX_RUN_ATTEMPTS attempts; releasing chain")
+                    Result.success()
                 }
-
-                Timber.d("Benflow Download Worker completed")
-                Result.success()
 //            }
         } catch (e: SocketTimeoutException) {
             Timber.e("Caught Exception for push amrit worker $e")
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullCbacFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullCbacFromAmritWorker.kt
index 8276efb6f..81c2cf266 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/PullCbacFromAmritWorker.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullCbacFromAmritWorker.kt
@@ -50,12 +50,12 @@ class PullCbacFromAmritWorker @AssistedInject constructor(
                 preferenceDao.setLastCbacSyncTime(currTimeStamp)
             }
 
-            val benflowResult = benFlowRepo.downloadAndSyncFlowRecords()
-            if (benflowResult) {
-                preferenceDao.setLastBenflowSyncTime(currTimeStamp)
-            }
-
-            Timber.d("Cbac + Benflow Download Worker completed")
+            // NOTE: the benflow worklist refresh that used to run here was redundant — the benflow
+            // payload is already downloaded and the role worklists built by PullBenFlowFromAmritWorker
+            // immediately before this worker, and PullClinicalRecordsWorker re-pulls it once more for
+            // the case-data pass. Downloading/iterating the full payload a third time only slowed sync,
+            // so this worker now pulls CBAC only.
+            Timber.d("Cbac download worker completed")
             Result.success()
 //            }
         } catch (e: SocketTimeoutException) {
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullClinicalRecordsWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullClinicalRecordsWorker.kt
new file mode 100644
index 000000000..b71bbba83
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullClinicalRecordsWorker.kt
@@ -0,0 +1,95 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import org.piramalswasthya.cho.repositories.BenFlowRepo
+import timber.log.Timber
+import java.net.SocketTimeoutException
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+
+/**
+ * Pulls the per-beneficiary nurse (beneficiaryGeneralOPDNurseFormDataToApp) and doctor
+ * (getBenCaseRecordFromDoctorGeneralOPD) case records for the current benflow payload.
+ *
+ * This is the slow part of the benflow downsync — ~2 API calls per beneficiary. The per-beneficiary
+ * pulls are now run with bounded concurrency inside BenFlowRepo.syncFlowIds rather than one at a
+ * time. This worker is enqueued in the SAME parallel stage as the RMNCH/CPHC pulls (not last,
+ * behind them) so that:
+ *  - the role worklists (PATIENT_VISIT_INFO_SYNC), which are created early by the worklist-only
+ *    benflow pass in [org.piramalswasthya.sakhi.work.PullBenFlowFromAmritWorker], appear quickly,
+ *  - the case-record data is pulled concurrently with RMNCH/CPHC so it is available early, and
+ *  - the RMNCH and CPHC pulls are still not blocked behind the per-beneficiary loop.
+ *
+ * The benflow watermark ([PreferenceDao.setLastBenflowSyncTime]) is advanced HERE, not in the
+ * worklist pass. The doctor pull condition is not idempotent across re-derivation, so it relies
+ * on the watermark to bound re-pulls; keeping the watermark un-advanced until this worker runs
+ * guarantees the same fresh, watermark-gated payload is still available to it.
+ */
+@HiltWorker
+class PullClinicalRecordsWorker @AssistedInject constructor(
+    @Assisted private val appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val preferenceDao: PreferenceDao,
+    private val benFlowRepo: BenFlowRepo
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullClinicalRecordsWorker"
+
+        // Initial run + up to 2 retries (3 executions total). A retry fires when the
+        // benflow->patient join still misses; the watermark is only advanced on a fully
+        // matched run, so an incomplete run is recovered by the next periodic down-sync.
+        private const val MAX_RUN_ATTEMPTS = 3
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override suspend fun doWork(): Result {
+        init()
+        return try {
+            Log.d("ClinicalRecords In Progress", "ClinicalRecords In Progress")
+
+            val currentInstant = Instant.now()
+            val currentDateTime = LocalDateTime.ofInstant(currentInstant, ZoneId.of("Asia/Kolkata"))
+            val startOfHour = currentDateTime.withMinute(0).withSecond(0).withNano(0)
+            val currTimeStamp = startOfHour.atZone(ZoneId.of("Asia/Kolkata")).toInstant().toEpochMilli()
+
+            val workerResult = benFlowRepo.downloadAndSyncFlowRecords(pullClinical = true)
+            if (workerResult) {
+                preferenceDao.setLastBenflowSyncTime(currTimeStamp)
+                Timber.d("Clinical records download worker completed")
+                Result.success()
+            } else if (runAttemptCount < MAX_RUN_ATTEMPTS - 1) {
+                Timber.d("Clinical records download incomplete (patient join missed); retry attempt ${runAttemptCount + 1}")
+                Result.retry()
+            } else {
+                Timber.d("Clinical records download still incomplete after $MAX_RUN_ATTEMPTS attempts; releasing chain")
+                Result.success()
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.e("Caught Exception for clinical records worker $e")
+            Result.retry()
+        }
+    }
+
+    private fun init() {
+        if (TokenInsertTmcInterceptor.getToken() == "")
+            preferenceDao.getPrimaryApiToken()?.let {
+                TokenInsertTmcInterceptor.setToken(it)
+            }
+        if (TokenInsertTmcInterceptor.getJwt() == "")
+            preferenceDao.getJWTAmritToken()?.let {
+                TokenInsertTmcInterceptor.setJwt(it)
+            }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullDeliveryOutcomeWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullDeliveryOutcomeWorker.kt
new file mode 100644
index 000000000..17b8b986d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullDeliveryOutcomeWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+
+@HiltWorker
+class PullDeliveryOutcomeWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullDeliveryOutcomeWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PullDeliveryOutcomeWorker started",
+            successLog = "PullDeliveryOutcomeWorker completed",
+            failureLog = "PullDeliveryOutcomeWorker failed",
+            retryLog = "Caught exception for PullDeliveryOutcomeWorker"
+        ) {
+            deliveryOutcomeRepo.pullDeliveryOutcomesFromServer()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullEarFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullEarFromAmritWorker.kt
new file mode 100644
index 000000000..e47b2b7f9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullEarFromAmritWorker.kt
@@ -0,0 +1,27 @@
+package org.piramalswasthya.cho.work
+
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.EarDiagnosisRepo
+
+
+@HiltWorker
+class PullEarFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: EarDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullEarFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullEarVisitsFromServer()
+    override val successLog: String = "Pull Ear Worker completed"
+    override val failureLog: String = "Pull Ear Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullElderlyFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullElderlyFromAmritWorker.kt
new file mode 100644
index 000000000..ded517310
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullElderlyFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.ElderlyHealthRepo
+
+@HiltWorker
+class PullElderlyFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: ElderlyHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullElderlyFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullElderlyVisitsFromServer()
+    override val successLog: String = "Pull Elderly Worker completed"
+    override val failureLog: String = "Pull Elderly Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullEligibleCouplesWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullEligibleCouplesWorker.kt
new file mode 100644
index 000000000..c036c4b9e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullEligibleCouplesWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.EcrRepo
+
+@HiltWorker
+class PullEligibleCouplesWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val ecrRepo: EcrRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullEligibleCouplesWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PullEligibleCouplesWorker started!",
+            successLog = "PullEligibleCouplesWorker completed successfully",
+            failureLog = "PullEligibleCouplesWorker failed",
+            retryLog = "Caught Exception for pull EC worker"
+        ) {
+            ecrRepo.pullEligibleCouplesFromServer()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullInfantRegisterWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullInfantRegisterWorker.kt
new file mode 100644
index 000000000..dcd56fd5f
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullInfantRegisterWorker.kt
@@ -0,0 +1,36 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+
+@HiltWorker
+class PullInfantRegisterWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val infantRegRepo: InfantRegRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullInfantRegisterWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            successLog = "PullInfantRegisterWorker completed",
+            failureLog = "PullInfantRegisterWorker failed",
+            retryLog = "PullInfantRegisterWorker retry"
+        ) {
+            val infantResult = infantRegRepo.pullInfantsFromServer()
+            val childResult = infantRegRepo.pullChildrenFromServer()
+            infantResult && childResult
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullLabRecordFormWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullLabRecordFormWorker.kt
new file mode 100644
index 000000000..693055782
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullLabRecordFormWorker.kt
@@ -0,0 +1,65 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import org.piramalswasthya.cho.repositories.ProcedureRepo
+import timber.log.Timber
+import java.net.SocketTimeoutException
+
+
+@HiltWorker
+class PullLabRecordFormWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val patientRepo: ProcedureRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PrescripTemplateWorker"
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override suspend fun doWork(): Result {
+        init()
+        return try {
+            withContext(Dispatchers.IO) {
+            patientRepo.ensureLabProcedureMasterSeed()
+            Timber.d("PullLabRecordFormWorker completed: API fetched and database sync attempted")
+            Result.success()
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.e("Caught Exception for Patient Download worker $e")
+            Result.retry()
+        } catch (e: Exception) {
+            // Do NOT fail the chain: this is step 2 of triggerDownSyncWorker, and a Result.failure()
+            // here cancels benflow + CBAC + all RMNCH pulls. The lab procedure master seed is
+            // non-critical for downsync and is also re-seeded lazily when the Lab Technician form
+            // opens (LabTechnicianFormViewModel:95 / ProcedureRepo:296), so a failure here is safe to
+            // swallow for the background sync.
+            Timber.e(e, "PullLabRecordFormWorker failed while syncing lab procedure data; continuing chain")
+            Result.success()
+        }
+    }
+
+    private fun init() {
+        if (TokenInsertTmcInterceptor.getToken() == "")
+            preferenceDao.getPrimaryApiToken()?.let {
+                TokenInsertTmcInterceptor.setToken(it)
+            }
+        if (TokenInsertTmcInterceptor.getJwt() == "")
+            preferenceDao.getJWTAmritToken()?.let {
+                TokenInsertTmcInterceptor.setJwt(it)
+            }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullMentalFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullMentalFromAmritWorker.kt
new file mode 100644
index 000000000..23b783a58
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullMentalFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.MentalHealthScreeningRepo
+
+@HiltWorker
+class PullMentalFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: MentalHealthScreeningRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullMentalFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullMentalVisitsFromServer()
+    override val successLog: String = "Pull Mental Worker completed"
+    override val failureLog: String = "Pull Mental Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullNoseFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullNoseFromAmritWorker.kt
new file mode 100644
index 000000000..96d53a322
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullNoseFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.NoseDiagnosisRepo
+
+@HiltWorker
+class PullNoseFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: NoseDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullNoseFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullNoseVisitsFromServer()
+    override val successLog: String = "Pull Nose Worker completed"
+    override val failureLog: String = "Pull Nose Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullOphthalmicFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullOphthalmicFromAmritWorker.kt
new file mode 100644
index 000000000..42c2ddc35
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullOphthalmicFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.OphthalmicRepository
+
+@HiltWorker
+class PullOphthalmicFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: OphthalmicRepository,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullOphthalmicFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullOphthalmicVisitsFromServer()
+    override val successLog: String = "Pull Ophthalmic Worker completed"
+    override val failureLog: String = "Pull Ophthalmic Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullOralFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullOralFromAmritWorker.kt
new file mode 100644
index 000000000..29411f30b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullOralFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.OralHealthRepo
+
+@HiltWorker
+class PullOralFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: OralHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullOralFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullOralVisitsFromServer()
+    override val successLog: String = "Pull Oral Worker completed"
+    override val failureLog: String = "Pull Oral Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullPainAssessmentFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullPainAssessmentFromAmritWorker.kt
new file mode 100644
index 000000000..427d4df8b
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullPainAssessmentFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PainAndSymptomAssessmentRepo
+
+@HiltWorker
+class PullPainAssessmentFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: PainAndSymptomAssessmentRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullPainAssessmentFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullPainVisitsFromServer()
+    override val successLog: String = "Pull Pain Worker completed"
+    override val failureLog: String = "Pull Pain Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullPncFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullPncFromAmritWorker.kt
new file mode 100644
index 000000000..af0cd9146
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullPncFromAmritWorker.kt
@@ -0,0 +1,34 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PncRepo
+
+@HiltWorker
+class PullPncFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val pncRepo: PncRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullPncFromAmritWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            successLog = "PullPncFromAmritWorker completed",
+            failureLog = "PullPncFromAmritWorker failed",
+            retryLog = "PullPncFromAmritWorker retry"
+        ) {
+            pncRepo.pullPncVisitsFromServer()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullPregnantWomenWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullPregnantWomenWorker.kt
new file mode 100644
index 000000000..900a2f5f5
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullPregnantWomenWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+
+@HiltWorker
+class PullPregnantWomenWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PullPregnantWomenWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PullPregnantWomenWorker started",
+            successLog = "PullPregnantWomenWorker completed successfully",
+            failureLog = "PullPregnantWomenWorker failed",
+            retryLog = "Caught exception for PullPregnantWomenWorker"
+        ) {
+            maternalHealthRepo.pullPregnantWomenFromServer()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullPsychosocialCaregiverSupportWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullPsychosocialCaregiverSupportWorker.kt
new file mode 100644
index 000000000..72633bf6d
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullPsychosocialCaregiverSupportWorker.kt
@@ -0,0 +1,27 @@
+package org.piramalswasthya.cho.work
+
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PsychosocialCaregiverSupportRepo
+
+
+@HiltWorker
+class PullPsychosocialCaregiverSupportWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: PsychosocialCaregiverSupportRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullPsychosocialCaregiverSupportWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullPsychosocialCaregiverSupportVisitsFromServer()
+    override val successLog: String = "Pull Psychosocial Caregiver Support Worker completed"
+    override val failureLog: String = "Pull Psychosocial Caregiver Support Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PullThroatFromAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PullThroatFromAmritWorker.kt
new file mode 100644
index 000000000..d78e860bd
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PullThroatFromAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.ThroatDiagnosisRepo
+
+@HiltWorker
+class PullThroatFromAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: ThroatDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePullAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PullThroatFromAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.pullThroatVisitsFromServer()
+    override val successLog: String = "Pull Throat Worker completed"
+    override val failureLog: String = "Pull Throat Worker Failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushAncToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushAncToAmritWorker.kt
new file mode 100644
index 000000000..9982f7d66
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushAncToAmritWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.MaternalHealthRepo
+
+@HiltWorker
+class PushAncToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val maternalHealthRepo: MaternalHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PushAncToAmritWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PushAncToAmritWorker started",
+            successLog = "PushAncToAmritWorker completed",
+            failureLog = "PushAncToAmritWorker failed",
+            retryLog = "Caught Exception for PushAncToAmritWorker"
+        ) {
+            maternalHealthRepo.processNewAncVisit()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushBenVisitInfoToAmrit.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushBenVisitInfoToAmrit.kt
index 5c594a29a..d75329ad9 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/PushBenVisitInfoToAmrit.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushBenVisitInfoToAmrit.kt
@@ -23,18 +23,32 @@ class PushBenVisitInfoToAmrit @AssistedInject constructor(
 
     companion object {
         const val name = "PushBenVisitInfoToAmrit"
+
+        // Initial run + up to 2 retries (3 executions total). The nurse push is gated on the
+        // beneficiary registration (beneficiaryRegID) and the server BenFlow (nurseFlag==1) having
+        // landed in the local DB. On a slow/flaky network those prerequisites can arrive after this
+        // worker first runs, so we retry with WorkManager backoff to let the upstream
+        // PushBenToAmritWorker / benflow pull catch up. After the cap we release the chain — the
+        // periodic down-sync + next push recover with no data loss.
+        private const val MAX_RUN_ATTEMPTS = 3
     }
 
     override suspend fun doWork(): Result {
         init()
         try {
-            val workerResult = benVisitRepo.processUnsyncedNurseData()
-            return if (workerResult) {
+            val allResolved = benVisitRepo.processUnsyncedNurseData()
+            return if (allResolved) {
                 Timber.d("Worker completed")
                 Result.success()
+            } else if (runAttemptCount < MAX_RUN_ATTEMPTS - 1) {
+                // Some visits were skipped because beneficiaryRegID or the benflow (nurseFlag==1)
+                // had not landed locally yet. Retry with backoff so the prerequisite registration /
+                // benflow pull can catch up, instead of leaving the visit UNSYNCED.
+                Timber.d("Nurse push has pending preconditions; retry attempt ${runAttemptCount + 1}")
+                Result.retry()
             } else {
-                Timber.d("Worker Failed as usual!")
-                Result.failure()
+                Timber.d("Nurse push still has pending preconditions after $MAX_RUN_ATTEMPTS attempts; releasing chain")
+                Result.success()
             }
         } catch (e: SocketTimeoutException) {
             Timber.e("Caught Exception for push amrit worker $e")
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushDeliveryOutcomeToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushDeliveryOutcomeToAmritWorker.kt
new file mode 100644
index 000000000..5753b2ae7
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushDeliveryOutcomeToAmritWorker.kt
@@ -0,0 +1,35 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.DeliveryOutcomeRepo
+
+@HiltWorker
+class PushDeliveryOutcomeToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val deliveryOutcomeRepo: DeliveryOutcomeRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PushDeliveryOutcomeToAmritWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PushDeliveryOutcomeToAmritWorker started",
+            successLog = "PushDeliveryOutcomeToAmritWorker completed",
+            failureLog = "PushDeliveryOutcomeToAmritWorker failed",
+            retryLog = "Caught exception for PushDeliveryOutcomeToAmritWorker"
+        ) {
+            deliveryOutcomeRepo.processNewDeliveryOutcomes()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushECToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushECToAmritWorker.kt
index 398fe2186..0f917dadc 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/PushECToAmritWorker.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushECToAmritWorker.kt
@@ -7,10 +7,7 @@ import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
-import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
 import org.piramalswasthya.cho.repositories.EcrRepo
-import timber.log.Timber
-import java.net.SocketTimeoutException
 
 @HiltWorker
 class PushECToAmritWorker @AssistedInject constructor(
@@ -24,29 +21,14 @@ class PushECToAmritWorker @AssistedInject constructor(
     }
 
     override suspend fun doWork(): Result {
-        init()
-        return try {
-            Timber.d("EC Worker started!")
-//            val workerResult = ecrRepo.pushAndUpdateEcrRecord()
-
-            val workerResult1 = ecrRepo.pushAndUpdateEctRecord()
-            if (workerResult1) {
-                Timber.d("Worker completed")
-                Result.success()
-            } else {
-                Timber.d("Worker Failed as usual!")
-                Result.failure()
-            }
-        } catch (e: SocketTimeoutException) {
-            Timber.e("Caught Exception for push amrit worker $e")
-            Result.retry()
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "EC Worker started!",
+            successLog = "Worker completed",
+            failureLog = "Worker Failed as usual!",
+            retryLog = "Caught Exception for push amrit worker"
+        ) {
+            ecrRepo.pushAndUpdateEctRecord()
         }
     }
-
-    private fun init() {
-        if (TokenInsertTmcInterceptor.getToken() == "")
-            preferenceDao.getPrimaryApiToken()?.let {
-                TokenInsertTmcInterceptor.setToken(it)
-            }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushEarToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushEarToAmritWorker.kt
new file mode 100644
index 000000000..37e826ffa
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushEarToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.EarDiagnosisRepo
+
+@HiltWorker
+class PushEarToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: EarDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushEarToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processEarVisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed as usual!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushElderlyToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushElderlyToAmritWorker.kt
new file mode 100644
index 000000000..2af9bf1c9
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushElderlyToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.ElderlyHealthRepo
+
+@HiltWorker
+class PushElderlyToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: ElderlyHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushElderlyToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processElderlyVisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed as usual!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushInfantRegisterToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushInfantRegisterToAmritWorker.kt
new file mode 100644
index 000000000..71865e8a5
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushInfantRegisterToAmritWorker.kt
@@ -0,0 +1,56 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import org.piramalswasthya.cho.repositories.InfantRegRepo
+import timber.log.Timber
+import java.net.SocketTimeoutException
+
+@HiltWorker
+class PushInfantRegisterToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val infantRegRepo: InfantRegRepo,
+    private val preferenceDao: PreferenceDao,
+) : CoroutineWorker(appContext, params) {
+
+    companion object {
+        const val name = "PushInfantRegisterToAmritWorker"
+    }
+
+    override suspend fun doWork(): Result {
+        init()
+        return try {
+            val workerResult = infantRegRepo.processNewInfantRegister()
+            if (workerResult) {
+                Timber.d("Infant registration push worker completed")
+                Result.success()
+            } else {
+                Timber.d("Infant registration push worker failed")
+                Result.failure()
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.e(e, "Infant registration push worker retry")
+            Result.retry()
+        }
+    }
+
+    private fun init() {
+        if (TokenInsertTmcInterceptor.getToken().isBlank()) {
+            preferenceDao.getPrimaryApiToken()?.let {
+                TokenInsertTmcInterceptor.setToken(it)
+            }
+        }
+        if (TokenInsertTmcInterceptor.getJwt().isBlank()) {
+            preferenceDao.getJWTAmritToken()?.let {
+                TokenInsertTmcInterceptor.setJwt(it)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushMentalToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushMentalToAmritWorker.kt
new file mode 100644
index 000000000..a55590ecd
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushMentalToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.MentalHealthScreeningRepo
+
+@HiltWorker
+class PushMentalToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: MentalHealthScreeningRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushMentalToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processMentalVisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed as usual!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushNoseToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushNoseToAmritWorker.kt
new file mode 100644
index 000000000..fd1bf02d6
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushNoseToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.NoseDiagnosisRepo
+
+@HiltWorker
+class PushNoseToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: NoseDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushNoseToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processNoseVisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed as usual!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushOphthalmicToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushOphthalmicToAmritWorker.kt
new file mode 100644
index 000000000..2b769133e
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushOphthalmicToAmritWorker.kt
@@ -0,0 +1,27 @@
+package org.piramalswasthya.cho.work
+
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.OphthalmicRepository
+
+
+@HiltWorker
+class PushOphthalmicToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: OphthalmicRepository,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushOphthalmicToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processOphthalmicVisits()
+    override val successLog: String = "Push Ophthalmic Worker completed"
+    override val failureLog: String = "Push Ophthalmic Worker failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushOralToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushOralToAmritWorker.kt
new file mode 100644
index 000000000..4fde0a2f6
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushOralToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.OralHealthRepo
+
+@HiltWorker
+class PushOralToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: OralHealthRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushOralToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processOralVisits()
+    override val successLog: String = "PushOralToAmritWorker: completed processing oral visits"
+    override val failureLog: String = "PushOralToAmritWorker: failed processing oral visits"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushPWRToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushPWRToAmritWorker.kt
index 2a51fc3e3..29ed1173b 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/PushPWRToAmritWorker.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushPWRToAmritWorker.kt
@@ -7,10 +7,7 @@ import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
-import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
 import org.piramalswasthya.cho.repositories.MaternalHealthRepo
-import timber.log.Timber
-import java.net.SocketTimeoutException
 
 @HiltWorker
 class PushPWRToAmritWorker @AssistedInject constructor(
@@ -24,26 +21,14 @@ class PushPWRToAmritWorker @AssistedInject constructor(
     }
 
     override suspend fun doWork(): Result {
-        init()
-        try {
-            val workerResult1 = maternalHealthRepo.processNewAncVisit()
-            return if (workerResult1) {
-                Timber.d("Worker completed")
-                Result.success()
-            } else {
-                Timber.d("Worker Failed as usual!")
-                Result.failure()
-            }
-        } catch (e: SocketTimeoutException) {
-            Timber.e("Caught Exception for push amrit worker $e")
-            return Result.retry()
+        WorkerExecutionUtils.initAuthTokens(preferenceDao)
+        return WorkerExecutionUtils.runBooleanWorker(
+            startLog = "PushPWRToAmritWorker started",
+            successLog = "Worker completed",
+            failureLog = "Worker Failed as usual!",
+            retryLog = "Caught Exception for push amrit worker"
+        ) {
+            maternalHealthRepo.processNewPWRRecords()
         }
     }
-
-    private fun init() {
-        if (TokenInsertTmcInterceptor.getToken() == "")
-            preferenceDao.getPrimaryApiToken()?.let {
-                TokenInsertTmcInterceptor.setToken(it)
-            }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushPainAssessmentToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushPainAssessmentToAmritWorker.kt
new file mode 100644
index 000000000..92cdf9302
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushPainAssessmentToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PainAndSymptomAssessmentRepo
+
+@HiltWorker
+class PushPainAssessmentToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: PainAndSymptomAssessmentRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushPainAssessmentToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processPainvisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushPsychosocialCaregiverSupportWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushPsychosocialCaregiverSupportWorker.kt
new file mode 100644
index 000000000..9fe302c90
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushPsychosocialCaregiverSupportWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.PsychosocialCaregiverSupportRepo
+
+@HiltWorker
+class PushPsychosocialCaregiverSupportWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: PsychosocialCaregiverSupportRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushPsychosocialCaregiverSupportWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processPsychosocialCaregiverVisits()
+    override val successLog: String = "Psychosocial Caregiver Support worker completed"
+    override val failureLog: String = "Psychosocial Caregiver Support worker failed"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/PushThroatToAmritWorker.kt b/app/src/main/java/org/piramalswasthya/cho/work/PushThroatToAmritWorker.kt
new file mode 100644
index 000000000..fec629fb3
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/PushThroatToAmritWorker.kt
@@ -0,0 +1,25 @@
+package org.piramalswasthya.cho.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.repositories.ThroatDiagnosisRepo
+
+@HiltWorker
+class PushThroatToAmritWorker @AssistedInject constructor(
+    @Assisted appContext: Context,
+    @Assisted params: WorkerParameters,
+    private val repo: ThroatDiagnosisRepo,
+    private val preferenceDao: PreferenceDao,
+) : BasePushAmritSyncWorker(appContext, params, preferenceDao) {
+    companion object {
+        const val name = "PushThroatToAmritWorker"
+    }
+
+    override suspend fun runSync(): Boolean = repo.processThroatVisits()
+    override val successLog: String = "Worker completed"
+    override val failureLog: String = "Worker Failed as usual!"
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/WorkerExecutionUtils.kt b/app/src/main/java/org/piramalswasthya/cho/work/WorkerExecutionUtils.kt
new file mode 100644
index 000000000..d5ab2d56a
--- /dev/null
+++ b/app/src/main/java/org/piramalswasthya/cho/work/WorkerExecutionUtils.kt
@@ -0,0 +1,43 @@
+package org.piramalswasthya.cho.work
+
+import androidx.work.ListenableWorker.Result
+import org.piramalswasthya.cho.database.shared_preferences.PreferenceDao
+import org.piramalswasthya.cho.network.interceptors.TokenInsertTmcInterceptor
+import timber.log.Timber
+import java.net.SocketTimeoutException
+
+object WorkerExecutionUtils {
+
+    fun initAuthTokens(preferenceDao: PreferenceDao) {
+        if (TokenInsertTmcInterceptor.getToken().isBlank()) {
+            preferenceDao.getPrimaryApiToken()?.let(TokenInsertTmcInterceptor::setToken)
+        }
+        if (TokenInsertTmcInterceptor.getJwt().isBlank()) {
+            preferenceDao.getJWTAmritToken()?.let(TokenInsertTmcInterceptor::setJwt)
+        }
+    }
+
+    suspend fun runBooleanWorker(
+        startLog: String? = null,
+        successLog: String,
+        failureLog: String,
+        retryLog: String,
+        work: suspend () -> Boolean
+    ): Result {
+        return try {
+            if (!startLog.isNullOrBlank()) {
+                Timber.d(startLog)
+            }
+            if (work()) {
+                Timber.d(successLog)
+                Result.success()
+            } else {
+                Timber.d(failureLog)
+                Result.failure()
+            }
+        } catch (e: SocketTimeoutException) {
+            Timber.e(e, retryLog)
+            Result.retry()
+        }
+    }
+}
diff --git a/app/src/main/java/org/piramalswasthya/cho/work/WorkerUtils.kt b/app/src/main/java/org/piramalswasthya/cho/work/WorkerUtils.kt
index 0f0272595..b8fe2e09e 100644
--- a/app/src/main/java/org/piramalswasthya/cho/work/WorkerUtils.kt
+++ b/app/src/main/java/org/piramalswasthya/cho/work/WorkerUtils.kt
@@ -1,182 +1,485 @@
 package org.piramalswasthya.cho.work
 
-
 import android.content.Context
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.work.*
+import androidx.work.BackoffPolicy
+import androidx.work.Constraints
+import androidx.work.Data
+import androidx.work.ExistingWorkPolicy
+import androidx.work.ListenableWorker
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequest
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.Operation
+import androidx.work.WorkContinuation
+import androidx.work.WorkManager
+import androidx.work.workDataOf
 import org.piramalswasthya.sakhi.work.PullBenFlowFromAmritWorker
 import org.piramalswasthya.sakhi.work.PushBenToAmritWorker
-import java.util.Calendar
+import timber.log.Timber
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 
 object WorkerUtils {
 
-    const val syncOneTimeAmritSyncWorker = "SYNC-WITH-AMRIT"
-    const val syncPeriodicDownSyncWorker = "PERIODIC-DOWN-SYNC"
-    const val syncOneTimeDownSyncWorker = "ONE-TIME-DOWN-SYNC"
+    const val syncOneTimeAmritSyncWorker = "upsync-full"
+    const val syncPeriodicDownSyncWorker = "downsync-periodic-15m"
+    const val syncOneTimeDownSyncWorker = "downsync-manual"
+
+    private const val UPSYNC_CLINICAL = "upsync-clinical"
+    private const val UPSYNC_RMNCHA = "upsync-rmncha"
+    private const val UPSYNC_CPHC = "upsync-cphc"
+    private const val UPSYNC_LAB = "upsync-lab"
+    private const val UPSYNC_PHARMACIST = "upsync-pharmacist"
+    private const val UPSYNC_AUDIT = "upsync-audit"
+    private const val UPSYNC_BENEFICIARY = "upsync-beneficiary"
 
-    var totalRecordsToDownload = 0;
+    var totalRecordsToDownload = 0
     var totalPercentageCompleted = MutableLiveData<Int>(0)
 
     var amritSyncInProgress = false
     var downloadSyncInProgress = false
 
+    enum class DownsyncScope {
+        FULL
+    }
+
+    enum class UpsyncScope {
+        FULL,
+        BENEFICIARY,
+        CLINICAL,
+        LAB,
+        PHARMACIST,
+        EC_TRACKING,
+        PREGNANCY_REGISTRATION,
+        ANC_VISIT,
+        DELIVERY_OUTCOME,
+        INFANT_REGISTRATION,
+        IMMUNIZATION,
+        PNC,
+        CBAC,
+        EAR,
+        OPHTHALMIC,
+        ORAL,
+        PAIN_ASSESSMENT,
+        PSYCHOSOCIAL,
+        NOSE,
+        THROAT,
+        ELDERLY,
+        MENTAL
+    }
+
+    enum class SyncReason {
+        APP_INIT,
+        MANUAL,
+        PERIODIC,
+        FORM_SAVE
+    }
+
     private val networkOnlyConstraint = Constraints.Builder()
         .setRequiredNetworkType(NetworkType.CONNECTED)
         .build()
 
-    fun triggerDownSyncWorker(context : Context, syncName: String){
-
-        val pullBenFlowFromAmritWorker = OneTimeWorkRequestBuilder<PullBenFlowFromAmritWorker>()
+    private data class RmnchPullWorkers(
+        val eligibleCouples: OneTimeWorkRequest,
+        val pregnantWomen: OneTimeWorkRequest,
+        val ancVisits: OneTimeWorkRequest,
+        val deliveryOutcome: OneTimeWorkRequest,
+        val pnc: OneTimeWorkRequest,
+        val infantRegister: OneTimeWorkRequest
+    )
+
+    private data class DownsyncWorkers(
+        val patients: OneTimeWorkRequest,
+        val benflow: OneTimeWorkRequest,
+        val parallelPulls: List<OneTimeWorkRequest>
+    )
+
+    private inline fun <reified T : ListenableWorker> networkWorker(): OneTimeWorkRequest {
+        return OneTimeWorkRequestBuilder<T>()
             .setConstraints(networkOnlyConstraint)
             .build()
+    }
 
-        val pullPatientFromAmritWorker = OneTimeWorkRequestBuilder<PullPatientsFromServer>()
+    // Benflow workers retry quickly when the patient table has not caught up yet.
+    private inline fun <reified T : ListenableWorker> benflowWorker(): OneTimeWorkRequest {
+        return OneTimeWorkRequestBuilder<T>()
             .setConstraints(networkOnlyConstraint)
+            .setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.SECONDS)
             .build()
+    }
 
-        val pullCbacFromAmritWorker = OneTimeWorkRequestBuilder<PullCbacFromAmritWorker>()
+    // Single-pass benflow pull for the upsync/form-save chains: lands the just-pushed patient's
+    // benflow so the nurse/doctor push gate passes, then releases the chain without retrying the
+    // full village payload (which would block the push for ~30s per submit).
+    private fun benflowUpsyncPullWorker(): OneTimeWorkRequest {
+        return OneTimeWorkRequestBuilder<PullBenFlowFromAmritWorker>()
             .setConstraints(networkOnlyConstraint)
+            .setInputData(
+                workDataOf(
+                    PullBenFlowFromAmritWorker.KEY_RELEASE_ON_INCOMPLETE to true,
+                    // Pull the full worklist (epoch watermark): the benflow we just created on the
+                    // server would be filtered out by the incremental hour-truncated watermark,
+                    // leaving the nurse/doctor push gate permanently UNSYNCED on some devices.
+                    PullBenFlowFromAmritWorker.KEY_IGNORE_WATERMARK to true
+                )
+            )
             .build()
+    }
 
+    private fun createRmnchPullWorkers(): RmnchPullWorkers {
+        return RmnchPullWorkers(
+            eligibleCouples = networkWorker<PullEligibleCouplesWorker>(),
+            pregnantWomen = networkWorker<PullPregnantWomenWorker>(),
+            ancVisits = networkWorker<PullAncVisitsWorker>(),
+            deliveryOutcome = networkWorker<PullDeliveryOutcomeWorker>(),
+            pnc = networkWorker<PullPncFromAmritWorker>(),
+            infantRegister = networkWorker<PullInfantRegisterWorker>()
+        )
+    }
 
+    private fun createFullDownsyncWorkers(): DownsyncWorkers {
+        val rmnchPull = createRmnchPullWorkers()
+        return DownsyncWorkers(
+            patients = networkWorker<PullPatientsFromServer>(),
+            benflow = benflowWorker<PullBenFlowFromAmritWorker>(),
+            parallelPulls = listOf(
+                benflowWorker<PullClinicalRecordsWorker>(),
+                networkWorker<PullLabRecordFormWorker>(),
+                networkWorker<PullCbacFromAmritWorker>(),
+                rmnchPull.eligibleCouples,
+                rmnchPull.pregnantWomen,
+                rmnchPull.ancVisits,
+                rmnchPull.deliveryOutcome,
+                rmnchPull.pnc,
+                rmnchPull.infantRegister,
+                networkWorker<PullEarFromAmritWorker>(),
+                networkWorker<PullOphthalmicFromAmritWorker>(),
+                networkWorker<PullOralFromAmritWorker>(),
+                networkWorker<PullPainAssessmentFromAmritWorker>(),
+                networkWorker<PullPsychosocialCaregiverSupportWorker>(),
+                networkWorker<PullNoseFromAmritWorker>(),
+                networkWorker<PullThroatFromAmritWorker>(),
+                networkWorker<PullElderlyFromAmritWorker>(),
+                networkWorker<PullMentalFromAmritWorker>()
+            )
+        )
+    }
 
+    private fun enqueueChain(
+        context: Context,
+        workName: String,
+        policy: ExistingWorkPolicy,
+        first: OneTimeWorkRequest,
+        next: List<OneTimeWorkRequest> = emptyList()
+    ) {
         val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork(syncName, ExistingWorkPolicy.APPEND_OR_REPLACE, pullPatientFromAmritWorker)
-            .then(pullBenFlowFromAmritWorker)
-            .then(pullCbacFromAmritWorker)
+        var chain = workManager.beginUniqueWork(workName, policy, first)
+        next.forEach { request ->
+            chain = chain.then(request)
+        }
+        chain.enqueue()
+    }
+
+    private fun rmnchaWorkName(scope: UpsyncScope): String {
+        return "$UPSYNC_RMNCHA-${scope.name.lowercase(Locale.US)}"
+    }
+
+    fun enqueueDownsync(
+        context: Context,
+        scope: DownsyncScope = DownsyncScope.FULL,
+        reason: SyncReason = SyncReason.MANUAL
+    ) {
+        if (scope != DownsyncScope.FULL) return
+
+        val policy = when (reason) {
+            SyncReason.PERIODIC -> ExistingWorkPolicy.KEEP
+            else -> ExistingWorkPolicy.REPLACE
+        }
+        val workName = when (reason) {
+            SyncReason.PERIODIC -> syncPeriodicDownSyncWorker
+            else -> syncOneTimeDownSyncWorker
+        }
+        val workers = createFullDownsyncWorkers()
+        WorkManager.getInstance(context)
+            .beginUniqueWork(workName, policy, workers.patients)
+            .then(workers.benflow)
+            .then(workers.parallelPulls)
             .enqueue()
     }
 
-    fun triggerAmritSyncWorker(context : Context){
+    fun enqueuePeriodicDownsync(context: Context) {
+        enqueueDownsync(context, DownsyncScope.FULL, SyncReason.PERIODIC)
+    }
 
-        val pullBenFlowFromAmritWorker = OneTimeWorkRequestBuilder<PullBenFlowFromAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pushBenToAmritWorker = OneTimeWorkRequestBuilder<PushBenToAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pushBenVisitInfoRequest = OneTimeWorkRequestBuilder<PushBenVisitInfoToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pushBenDoctorInfoPendingTestToAmrit = OneTimeWorkRequestBuilder<PushBenDoctorInfoPendingTestToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pushBenDoctorInfoWithoutTestToAmrit = OneTimeWorkRequestBuilder<PushBenDoctorInfoWithoutTestToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pushBenDoctorInfoAfterTestToAmrit = OneTimeWorkRequestBuilder<PushBenDoctorInfoAfterTestToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val pullPatientFromAmritWorker = OneTimeWorkRequestBuilder<PullPatientsFromServer>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
-        val createRevisitBenflowWorker = OneTimeWorkRequestBuilder<CreateRevisitBenflowWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    fun enqueueFullSync(context: Context, reason: SyncReason = SyncReason.APP_INIT) {
+        val workManager = WorkManager.getInstance(context)
+        var chain = workManager
+            .beginUniqueWork(
+                syncOneTimeAmritSyncWorker,
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>()
+            )
+            .then(networkWorker<CreateRevisitBenflowWorker>())
+            // Pull the server BenFlow (nurseFlag==1) into the local DB before pushing nurse
+            // data; processUnsyncedNurseData() skips the saveNurseData call without it.
+            // Single-pass (no retry) so it doesn't block the push behind a full-payload retry storm.
+            .then(benflowUpsyncPullWorker())
+            .then(
+                listOf(
+                    networkWorker<PushBenVisitInfoToAmrit>(),
+                    networkWorker<PushBenDoctorInfoPendingTestToAmrit>(),
+                    networkWorker<PushBenDoctorInfoWithoutTestToAmrit>(),
+                    networkWorker<PushBenDoctorInfoAfterTestToAmrit>(),
+                    networkWorker<PushCbacToAmirtWorker>(),
+                    networkWorker<PushPWRToAmritWorker>(),
+                    networkWorker<PushAncToAmritWorker>(),
+                    networkWorker<PushDeliveryOutcomeToAmritWorker>(),
+                    networkWorker<PushInfantRegisterToAmritWorker>(),
+                    networkWorker<PushPNCToAmritWorker>(),
+                    networkWorker<PushECToAmritWorker>(),
+                    networkWorker<PushChildImmunizationToAmritWorker>(),
+                    networkWorker<PushLabDataToAmrit>(),
+                    networkWorker<PushPharmacistDataToAmrit>(),
+                    networkWorker<PushEarToAmritWorker>(),
+                    networkWorker<PushOphthalmicToAmritWorker>(),
+                    networkWorker<PushOralToAmritWorker>(),
+                    networkWorker<PushPainAssessmentToAmritWorker>(),
+                    networkWorker<PushPsychosocialCaregiverSupportWorker>(),
+                    networkWorker<PushNoseToAmritWorker>(),
+                    networkWorker<PushThroatToAmritWorker>(),
+                    networkWorker<PushElderlyToAmritWorker>(),
+                    networkWorker<PushMentalToAmritWorker>()
+                )
+            )
 
-        val pushLabDataToAmrit = OneTimeWorkRequestBuilder<PushLabDataToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+        if (reason == SyncReason.APP_INIT || reason == SyncReason.MANUAL) {
+            chain = appendFullDownsync(chain)
+        }
 
-        val pushPWRToAmritWorker = OneTimeWorkRequestBuilder<PushPWRToAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+        chain.enqueue()
+    }
 
-        val pushPNCWorkRequest = OneTimeWorkRequestBuilder<PushPNCToAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    private fun appendFullDownsync(chain: WorkContinuation): WorkContinuation {
+        val downsync = createFullDownsyncWorkers()
+        return chain
+            .then(downsync.patients)
+            .then(downsync.benflow)
+            .then(downsync.parallelPulls)
+    }
 
-        val pushImmunizationWorkRequest = OneTimeWorkRequestBuilder<PushChildImmunizationToAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    fun enqueueUpsync(
+        context: Context,
+        scope: UpsyncScope,
+        reason: SyncReason = SyncReason.FORM_SAVE
+    ) {
+        when (scope) {
+            UpsyncScope.FULL -> enqueueFullSync(context, reason)
+            UpsyncScope.BENEFICIARY -> enqueueChain(
+                context,
+                UPSYNC_BENEFICIARY,
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>()
+            )
+            UpsyncScope.CLINICAL -> enqueueChain(
+                context,
+                UPSYNC_CLINICAL,
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(
+                    networkWorker<CreateRevisitBenflowWorker>(),
+                    // Pull the server BenFlow (nurseFlag==1) into the local DB before pushing nurse
+                    // data; processUnsyncedNurseData() skips the saveNurseData call without it.
+                    // Single-pass (no retry) so it doesn't block the push behind a full-payload retry storm.
+                    benflowUpsyncPullWorker(),
+                    networkWorker<PushBenVisitInfoToAmrit>(),
+                    networkWorker<PushBenDoctorInfoPendingTestToAmrit>(),
+                    networkWorker<PushBenDoctorInfoWithoutTestToAmrit>(),
+                    networkWorker<PushBenDoctorInfoAfterTestToAmrit>()
+                )
+            )
+            UpsyncScope.LAB -> enqueueChain(
+                context,
+                UPSYNC_LAB,
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushLabDataToAmrit>())
+            )
+            UpsyncScope.PHARMACIST -> enqueueChain(
+                context,
+                UPSYNC_PHARMACIST,
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushPharmacistDataToAmrit>())
+            )
+            UpsyncScope.EC_TRACKING -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushECToAmritWorker>(), networkWorker<PullEligibleCouplesWorker>())
+            )
+            UpsyncScope.PREGNANCY_REGISTRATION,
+            UpsyncScope.ANC_VISIT -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(
+                    networkWorker<PushPWRToAmritWorker>(),
+                    networkWorker<PushAncToAmritWorker>(),
+                    networkWorker<PullPregnantWomenWorker>(),
+                    networkWorker<PullAncVisitsWorker>()
+                )
+            )
+            UpsyncScope.DELIVERY_OUTCOME -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(
+                    networkWorker<PushDeliveryOutcomeToAmritWorker>(),
+                    networkWorker<PullDeliveryOutcomeWorker>()
+                )
+            )
+            UpsyncScope.INFANT_REGISTRATION -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(
+                    networkWorker<PushInfantRegisterToAmritWorker>(),
+                    networkWorker<PullInfantRegisterWorker>()
+                )
+            )
+            UpsyncScope.IMMUNIZATION -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushChildImmunizationToAmritWorker>())
+            )
+            UpsyncScope.PNC -> enqueueChain(
+                context,
+                rmnchaWorkName(scope),
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushPNCToAmritWorker>(), networkWorker<PullPncFromAmritWorker>())
+            )
+            UpsyncScope.CBAC -> enqueueChain(
+                context,
+                "upsync-cbac",
+                ExistingWorkPolicy.REPLACE,
+                networkWorker<PushBenToAmritWorker>(),
+                listOf(networkWorker<PushCbacToAmirtWorker>())
+            )
+            UpsyncScope.EAR -> enqueueCphcPush(context, "ear-push-sync", networkWorker<PushEarToAmritWorker>())
+            UpsyncScope.OPHTHALMIC -> enqueueCphcPush(context, "ophthalmic-push-sync", networkWorker<PushOphthalmicToAmritWorker>())
+            UpsyncScope.ORAL -> enqueueCphcPush(context, "oral-push-sync", networkWorker<PushOralToAmritWorker>())
+            UpsyncScope.PAIN_ASSESSMENT -> enqueueCphcPush(context, "pain-assessment-push-sync", networkWorker<PushPainAssessmentToAmritWorker>())
+            UpsyncScope.PSYCHOSOCIAL -> enqueueCphcPush(context, "psychosocial-push-sync", networkWorker<PushPsychosocialCaregiverSupportWorker>())
+            UpsyncScope.NOSE -> enqueueCphcPush(context, "nose-push-sync", networkWorker<PushNoseToAmritWorker>())
+            UpsyncScope.THROAT -> enqueueCphcPush(context, "throat-push-sync", networkWorker<PushThroatToAmritWorker>())
+            UpsyncScope.ELDERLY -> enqueueCphcPush(context, "elderly-push-sync", networkWorker<PushElderlyToAmritWorker>())
+            UpsyncScope.MENTAL -> enqueueCphcPush(context, "mental-push-sync", networkWorker<PushMentalToAmritWorker>())
+        }
+    }
 
-        val pushCbacWorkRequest = OneTimeWorkRequestBuilder<PushCbacToAmirtWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    private fun enqueueCphcPush(context: Context, workName: String, modulePush: OneTimeWorkRequest) {
+        enqueueChain(
+            context,
+            "$UPSYNC_CPHC-$workName",
+            ExistingWorkPolicy.REPLACE,
+            networkWorker<PushBenToAmritWorker>(),
+            listOf(modulePush)
+        )
+    }
 
+    fun triggerDownSyncWorker(context: Context, syncName: String) {
+        val reason = if (syncName == syncPeriodicDownSyncWorker) SyncReason.PERIODIC else SyncReason.MANUAL
+        enqueueDownsync(context, DownsyncScope.FULL, reason)
+    }
 
+    fun triggerAmritSyncWorker(context: Context) {
+        enqueueFullSync(context, SyncReason.APP_INIT)
+    }
 
-        val pushECToAmritWorker = OneTimeWorkRequestBuilder<PushECToAmritWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    fun triggerEligibleCoupleTrackingSync(context: Context) {
+        Timber.d("Enqueuing targeted EC sync worker")
+        enqueueUpsync(context, UpsyncScope.EC_TRACKING)
+    }
 
-        val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork(syncOneTimeAmritSyncWorker, ExistingWorkPolicy.APPEND_OR_REPLACE, pullPatientFromAmritWorker)
-            .then(pushBenToAmritWorker)
-            .then(pushCbacWorkRequest)
-            .then(createRevisitBenflowWorker)
-            .then(pullBenFlowFromAmritWorker)
-            .then(pushBenVisitInfoRequest)
-            .then(pushBenDoctorInfoPendingTestToAmrit)
-            .then(pushBenDoctorInfoWithoutTestToAmrit)
-            .then(pushBenDoctorInfoAfterTestToAmrit)
-            .then(pushPWRToAmritWorker)
-            .then(pushPNCWorkRequest)
-            .then(pushECToAmritWorker)
-            .then(pushImmunizationWorkRequest)
-
-//           .then(pushLabDataToAmrit)
-            .enqueue()
+    fun triggerPregnantWomanRegistrationSync(context: Context) {
+        Timber.d("Enqueuing targeted PWR registration sync worker")
+        enqueueUpsync(context, UpsyncScope.PREGNANCY_REGISTRATION)
     }
 
-    fun labPushWorker(context : Context){
+    fun triggerAncVisitSync(context: Context) {
+        Timber.d("Enqueuing targeted ANC sync worker")
+        enqueueUpsync(context, UpsyncScope.ANC_VISIT)
+    }
 
-        val pushLabDataToAmrit = OneTimeWorkRequestBuilder<PushLabDataToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    fun triggerDeliveryOutcomeSync(context: Context) {
+        Timber.d("Enqueuing targeted Delivery Outcome sync worker")
+        enqueueUpsync(context, UpsyncScope.DELIVERY_OUTCOME)
+    }
 
-        val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork("lab-sync", ExistingWorkPolicy.APPEND_OR_REPLACE, pushLabDataToAmrit)
-            .enqueue()
+    fun triggerInfantRegistrationSync(context: Context) {
+        Timber.d("Enqueuing targeted Infant registration sync worker")
+        enqueueUpsync(context, UpsyncScope.INFANT_REGISTRATION)
     }
 
-    fun pushAuditDetailsWorker(context : Context){
-        val pushLoginAuditDataToAmrit = OneTimeWorkRequestBuilder<PushLoginAuditDataWorker>()
-            .setConstraints(networkOnlyConstraint)
-            .build()
+    fun triggerPncSync(context: Context) {
+        Timber.d("Enqueuing targeted PNC sync worker")
+        enqueueUpsync(context, UpsyncScope.PNC)
+    }
 
-        val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork("audit-data-sync", ExistingWorkPolicy.APPEND, pushLoginAuditDataToAmrit)
-            .enqueue()
+    fun triggerBeneficiarySync(context: Context) {
+        Timber.d("Enqueuing targeted beneficiary sync worker")
+        enqueueUpsync(context, UpsyncScope.BENEFICIARY)
     }
 
-    fun pharmacistPushWorker(context : Context){
-        Log.d("WU", "pharmacistPushWorker: ")
-        val pushPharmacistDataToAmrit = OneTimeWorkRequestBuilder<PushPharmacistDataToAmrit>()
-            .setConstraints(networkOnlyConstraint)
-            .setBackoffCriteria(
-                BackoffPolicy.LINEAR, // or BackoffPolicy.LINEAR
-                10, // Minimum delay between retries
-                TimeUnit.MINUTES // Time unit for the delay
-            )
-            .build()
+    fun labPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.LAB)
+    }
 
-        val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork("pharmacist-sync", ExistingWorkPolicy.APPEND_OR_REPLACE, pushPharmacistDataToAmrit)
-            .enqueue()
+    fun doctorPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.CLINICAL)
+    }
+
+    fun clinicalPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.CLINICAL)
+    }
+
+    fun pushAuditDetailsWorker(context: Context) {
+        enqueueChain(
+            context,
+            UPSYNC_AUDIT,
+            ExistingWorkPolicy.KEEP,
+            networkWorker<PushLoginAuditDataWorker>()
+        )
     }
 
-    fun labPullWorker(context : Context, patientId: String){
+    fun pharmacistPushWorker(context: Context) {
+        Log.d("WU", "pharmacistPushWorker")
+        enqueueUpsync(context, UpsyncScope.PHARMACIST)
+    }
 
-        val data = Data.Builder()
-        data.putString("patientId", patientId)
+    fun labPullWorker(context: Context, patientId: String) {
+        val data = Data.Builder().putString("patientId", patientId).build()
         val pullLabDataToAmrit = OneTimeWorkRequestBuilder<PullLabDataToAmrit>()
             .setConstraints(networkOnlyConstraint)
-            .setInputData(data.build())
+            .setInputData(data)
             .build()
 
-        val workManager = WorkManager.getInstance(context)
-        workManager
-            .beginUniqueWork("lab-sync-pull", ExistingWorkPolicy.APPEND_OR_REPLACE, pullLabDataToAmrit)
-            .enqueue()
+        enqueueChain(
+            context,
+            "lab-sync-pull",
+            ExistingWorkPolicy.REPLACE,
+            pullLabDataToAmrit
+        )
     }
 
     fun triggerDownloadCardWorker(
@@ -184,7 +487,6 @@ object WorkerUtils {
         fileName: String,
         otpTxnID: MutableLiveData<String?>
     ): LiveData<Operation.State> {
-
         val workRequest = OneTimeWorkRequestBuilder<DownloadCardWorker>()
             .setConstraints(networkOnlyConstraint)
             .setInputData(Data.Builder().apply { putString(DownloadCardWorker.file_name, fileName) }.build())
@@ -194,10 +496,7 @@ object WorkerUtils {
             .enqueueUniqueWork(DownloadCardWorker.name, ExistingWorkPolicy.REPLACE, workRequest).state
     }
 
-    fun presTemplate(
-        context: Context,
-    ) {
-
+    fun presTemplate(context: Context) {
         val workRequest = OneTimeWorkRequestBuilder<PrescripTemplateWorker>()
             .setConstraints(networkOnlyConstraint)
             .build()
@@ -206,10 +505,43 @@ object WorkerUtils {
             .enqueueUniqueWork(PrescripTemplateWorker.name, ExistingWorkPolicy.KEEP, workRequest).state
     }
 
-    fun cancelAllWork(context: Context) {
-        val workManager = WorkManager.getInstance(context)
-        workManager.cancelAllWork()
+    fun earPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.EAR)
     }
 
+    fun ophthalmicPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.OPHTHALMIC)
+    }
 
-}
\ No newline at end of file
+    fun oralPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.ORAL)
+    }
+
+    fun painAssessmentPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.PAIN_ASSESSMENT)
+    }
+
+    fun psychosocialCaregiverSupport(context: Context) {
+        enqueueUpsync(context, UpsyncScope.PSYCHOSOCIAL)
+    }
+
+    fun nosePushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.NOSE)
+    }
+
+    fun throatPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.THROAT)
+    }
+
+    fun elderlyPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.ELDERLY)
+    }
+
+    fun mentalPushWorker(context: Context) {
+        enqueueUpsync(context, UpsyncScope.MENTAL)
+    }
+
+    fun cancelAllWork(context: Context) {
+        WorkManager.getInstance(context).cancelAllWork()
+    }
+}
diff --git a/app/src/main/res/drawable/bg_circular_1.xml b/app/src/main/res/drawable/bg_circular_1.xml
new file mode 100644
index 000000000..104c6f9d7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circular_1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="oval">
+            <solid android:color="?attr/colorPrimaryVariant" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/Quaternary" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/bg_circular_2.xml b/app/src/main/res/drawable/bg_circular_2.xml
new file mode 100644
index 000000000..7926b11d7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circular_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="oval">
+            <solid android:color="?attr/colorPrimaryVariant" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/Tertiary" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/bg_skeleton_action_primary.xml b/app/src/main/res/drawable/bg_skeleton_action_primary.xml
new file mode 100644
index 000000000..a600b4f32
--- /dev/null
+++ b/app/src/main/res/drawable/bg_skeleton_action_primary.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#A3296292" />
+    <corners android:radius="10dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_skeleton_action_success.xml b/app/src/main/res/drawable/bg_skeleton_action_success.xml
new file mode 100644
index 000000000..0b494bc51
--- /dev/null
+++ b/app/src/main/res/drawable/bg_skeleton_action_success.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#A3009302" />
+    <corners android:radius="10dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_skeleton_block.xml b/app/src/main/res/drawable/bg_skeleton_block.xml
new file mode 100644
index 000000000..a88217500
--- /dev/null
+++ b/app/src/main/res/drawable/bg_skeleton_block.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/gray_light" />
+    <corners android:radius="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_skeleton_header_block.xml b/app/src/main/res/drawable/bg_skeleton_header_block.xml
new file mode 100644
index 000000000..dd864ee24
--- /dev/null
+++ b/app/src/main/res/drawable/bg_skeleton_header_block.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#80FFFFFF" />
+    <corners android:radius="6dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_skeleton_header_circle.xml b/app/src/main/res/drawable/bg_skeleton_header_circle.xml
new file mode 100644
index 000000000..9add5d878
--- /dev/null
+++ b/app/src/main/res/drawable/bg_skeleton_header_circle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#80FFFFFF" />
+</shape>
diff --git a/app/src/main/res/drawable/ic__adolescent.xml b/app/src/main/res/drawable/ic__adolescent.xml
new file mode 100644
index 000000000..5914b5f93
--- /dev/null
+++ b/app/src/main/res/drawable/ic__adolescent.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="87"
+    android:viewportHeight="87">
+    <group>
+        <clip-path android:pathData="M0,0h87v87h-87z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M84.4,51.046C86.054,49.94 86.498,47.703 85.392,46.05L72.785,27.202C71.115,24.707 68.562,23.406 65.882,23.406H60.48C57.371,23.406 54.893,25.287 53.313,27.727C53.155,27.972 54.099,26.534 40.996,46.045C39.887,47.696 40.327,49.933 41.978,51.042C43.628,52.151 45.866,51.712 46.975,50.06L52.377,42.017L52.388,78.552C52.388,81.038 54.403,83.054 56.889,83.054C59.376,83.054 61.391,81.038 61.391,78.552V58.294H64.993V78.552C64.993,81.038 67.008,83.054 69.495,83.054C71.981,83.054 73.996,81.038 73.996,78.552C73.996,39.724 73.985,42.244 73.985,41.952L79.405,50.054C80.512,51.71 82.751,52.15 84.4,51.046Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M63.192,22.091C67.957,22.091 71.823,18.23 71.823,13.461C71.823,10.354 70.176,7.629 67.709,6.11C68.219,5.749 68.813,5.416 69.515,5.132C69.81,5.012 70.008,4.732 70.023,4.415C70.038,4.096 69.867,3.799 69.585,3.653C68.22,2.944 66.557,2.929 64.987,3.23C65.253,2.731 65.589,2.222 66.019,1.705C66.223,1.461 66.266,1.12 66.13,0.833C65.993,0.546 65.702,0.364 65.384,0.368C62.229,0.404 59.336,3.601 58.184,5.514C57.916,5.958 57.715,6.428 57.588,6.903C55.736,8.486 54.561,10.836 54.561,13.461C54.561,18.23 58.426,22.091 63.192,22.091Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M34.552,27.522C32.997,25.164 30.524,23.406 27.498,23.406H22.096C19.018,23.406 16.341,25.122 14.969,27.649C14.803,27.889 2.775,45.802 2.612,46.045C1.503,47.696 1.943,49.933 3.594,51.042C5.244,52.151 7.482,51.712 8.591,50.061L13.993,42.018V42.117L9.09,62.105C8.861,63.038 9.074,64.023 9.666,64.779C10.259,65.534 11.166,65.975 12.126,65.975H14.004V78.552C14.004,81.038 16.019,83.054 18.505,83.054C20.992,83.054 23.007,81.038 23.007,78.552V65.975H26.608V78.552C26.608,81.038 28.624,83.054 31.11,83.054C33.596,83.054 35.612,81.038 35.612,78.552V65.975H37.469C38.429,65.975 39.335,65.534 39.928,64.779C40.521,64.023 40.733,63.038 40.504,62.105L35.601,42.116L35.601,41.985L41.024,50.061C42.134,51.713 44.372,52.151 46.022,51.042C47.673,49.933 48.113,47.696 47.004,46.045C33.701,26.236 34.708,27.758 34.552,27.522Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M7.588,24.733C7.906,24.759 8.208,24.598 8.365,24.322C10.736,20.137 14.455,20.492 15.288,18.947C15.403,18.733 15.494,18.513 15.561,18.29C15.814,18.564 16.172,18.725 16.548,18.725C16.696,18.725 16.848,18.7 16.996,18.648C17.245,18.56 17.45,18.404 17.603,18.211C19.147,20.549 21.797,22.091 24.809,22.091C27.82,22.091 30.47,20.549 32.014,18.211C32.167,18.404 32.372,18.56 32.622,18.648C32.77,18.7 32.921,18.725 33.07,18.725C33.446,18.725 33.803,18.564 34.057,18.29C34.124,18.513 34.214,18.733 34.329,18.947C35.162,20.492 38.881,20.137 41.252,24.322C41.408,24.598 41.711,24.759 42.029,24.733C42.346,24.706 42.618,24.498 42.728,24.199C43.807,21.235 41.837,17.399 40.454,15.646C39.264,14.137 37.433,13.322 35.741,14.233C35.681,14.266 35.625,14.303 35.568,14.338L35.582,14.299C35.829,13.595 35.459,12.824 34.756,12.577C34.276,12.408 33.77,12.53 33.415,12.845C33.099,8.37 29.367,4.833 24.809,4.833C20.25,4.833 16.519,8.37 16.203,12.845C15.847,12.531 15.341,12.408 14.862,12.577C14.158,12.824 13.788,13.595 14.036,14.299L14.05,14.338C13.992,14.303 13.936,14.266 13.877,14.233C12.185,13.322 10.354,14.137 9.164,15.646C7.781,17.399 5.811,21.235 6.89,24.199C6.999,24.498 7.271,24.706 7.588,24.733Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__anc_visit.xml b/app/src/main/res/drawable/ic__anc_visit.xml
new file mode 100644
index 000000000..466ba17b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic__anc_visit.xml
@@ -0,0 +1,33 @@
+<vector android:alpha="0.96" android:height="24dp"
+    android:viewportHeight="40" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M8.538,13.871L8.538,13.87C8.043,13.623 7.428,13.095 6.879,12.525C6.322,11.947 5.78,11.269 5.449,10.677C4.422,8.842 3.977,6.903 4.275,5.165C4.421,4.31 4.697,3.58 5.143,2.972C5.59,2.361 6.187,1.9 6.934,1.555M8.538,13.871L7.145,2.008M8.538,13.871L8.543,13.873C9.005,14.098 9.512,14.229 9.984,14.256C10.442,14.283 10.926,14.216 11.299,13.977C11.993,13.547 12.483,12.788 12.822,11.795C13.163,10.797 13.373,9.508 13.469,7.938C13.659,4.946 13.342,3.144 12.116,2.042C11.72,1.684 11.361,1.431 10.861,1.293C10.388,1.162 9.824,1.145 9.048,1.163M8.538,13.871L9.059,1.663M6.934,1.555C6.935,1.555 6.935,1.555 6.936,1.554L7.145,2.008M6.934,1.555C6.934,1.555 6.933,1.555 6.933,1.556L7.145,2.008M6.934,1.555C7.235,1.414 7.492,1.315 7.825,1.254C8.144,1.196 8.518,1.175 9.048,1.163M7.145,2.008C7.704,1.746 8.001,1.687 9.059,1.663M9.048,1.163L9.059,1.663M9.048,1.163C9.048,1.163 9.048,1.163 9.048,1.163L9.059,1.663M7.762,14.053L7.762,14.052C5.741,12.743 3.987,9.888 3.671,7.369C3.653,7.219 3.635,7.086 3.613,6.975C3.592,6.869 3.56,6.745 3.501,6.633C3.432,6.503 3.324,6.385 3.165,6.315C3.04,6.26 2.917,6.252 2.838,6.251C2.832,6.25 2.816,6.246 2.791,6.239C2.74,6.225 2.672,6.203 2.59,6.173C2.427,6.113 2.23,6.028 2.045,5.935C1.026,5.419 0.491,4.529 0.501,3.277C0.532,1.101 3.008,-0.229 4.915,0.976C4.916,0.977 4.916,0.977 4.916,0.977L5.473,1.333L5.715,1.488L5.971,1.357L6.408,1.132C6.409,1.132 6.409,1.131 6.41,1.131C6.944,0.861 7.68,0.659 8.451,0.562C9.222,0.466 9.983,0.481 10.564,0.613C11.502,0.832 12.193,1.216 12.758,1.812C13.068,2.152 13.238,2.37 13.376,2.621C13.517,2.879 13.636,3.193 13.813,3.743C14.032,4.459 14.143,5.695 14.123,7.077C14.102,8.449 13.953,9.903 13.684,11.032C13.227,12.946 12.384,14.111 11.401,14.601C10.44,15.08 9.199,14.985 7.762,14.053Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M5.279,15.312L5.28,15.313C5.731,15.798 5.979,16.166 6.133,16.608C6.293,17.064 6.366,17.637 6.395,18.561C6.418,19.503 6.372,20.475 6.257,21.314C5.997,23.116 5.991,23.9 6.359,24.682L6.359,24.682L6.361,24.686C6.441,24.853 6.528,25.023 6.664,25.191C6.8,25.361 6.968,25.508 7.192,25.663C7.621,25.962 8.338,26.348 9.619,27.031C10.775,27.652 11.459,28.063 11.881,28.41C12.278,28.735 12.417,28.98 12.499,29.283L12.499,29.283L12.499,29.285C12.699,30.011 12.375,30.872 11.655,31.36L11.655,31.36L11.651,31.362C11.492,31.472 11.215,31.56 10.798,31.579C10.39,31.598 9.891,31.548 9.333,31.428C8.218,31.187 6.92,30.676 5.728,29.952L5.728,29.952C4.916,29.461 4.074,28.758 3.356,28C2.635,27.237 2.066,26.448 1.777,25.793C1.602,25.395 1.523,24.639 1.57,23.619C1.616,22.624 1.778,21.455 2.02,20.291C2.263,19.126 2.584,17.979 2.944,17.026C3.312,16.053 3.697,15.347 4.039,15.004C4.181,14.862 4.253,14.813 4.301,14.791C4.338,14.774 4.392,14.758 4.529,14.758C4.691,14.758 4.715,14.773 4.754,14.798L4.754,14.798C4.845,14.857 4.975,14.982 5.279,15.312Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M14.06,15.798L14.06,15.798L14.068,15.802C15.31,16.414 16.54,17.873 17.099,19.452C17.374,20.238 17.449,21.393 17.33,22.532C17.21,23.679 16.905,24.699 16.511,25.25C16.51,25.25 16.51,25.25 16.51,25.25L16.167,25.725L15.883,26.117L16.265,26.413L16.847,26.866L16.847,26.866L16.852,26.869C17.901,27.666 19.084,29.268 19.625,30.646L19.626,30.647C20.281,32.301 20.417,34.481 19.982,35.853L19.981,35.857C19.678,36.847 19.442,37.314 18.715,38.378C18.612,38.529 18.525,38.668 18.455,38.782C18.433,38.817 18.413,38.85 18.394,38.88C18.31,39.014 18.254,39.092 18.199,39.148C18.118,39.231 17.987,39.325 17.521,39.392C17.041,39.46 16.293,39.488 15.048,39.496C14.282,39.502 13.342,39.5 12.178,39.498C11.461,39.497 10.659,39.495 9.76,39.495H1.767L1.578,39.333L1.455,39.224L1.995,34.741L1.995,34.74C2.149,33.43 2.295,32.237 2.404,31.369C2.431,31.156 2.456,30.963 2.478,30.793C3.838,32.005 5.66,32.99 7.416,33.582C9.15,34.167 10.931,34.404 12.167,33.987L12.167,33.987C12.68,33.813 13.219,33.442 13.668,33.025C14.119,32.607 14.53,32.096 14.756,31.6L14.756,31.6L14.757,31.597C15.008,31.038 15.117,30.36 15.107,29.709C15.097,29.059 14.969,28.389 14.703,27.848C14.124,26.661 13.28,26.037 10.791,24.719C9.971,24.284 9.421,23.976 9.069,23.753C8.892,23.641 8.778,23.559 8.708,23.5C8.697,23.491 8.689,23.484 8.682,23.477C8.681,23.466 8.679,23.452 8.679,23.436C8.674,23.361 8.674,23.257 8.681,23.118C8.695,22.841 8.735,22.459 8.805,21.966L8.805,21.966L8.806,21.959C8.909,21.152 8.979,20.128 9.004,19.205C9.027,18.365 9.016,17.562 8.95,17.081H9.392C10.026,17.081 10.544,17.028 11.066,16.861C11.583,16.694 12.076,16.425 12.673,16.034L12.673,16.034L12.677,16.032C12.886,15.892 13.095,15.758 13.261,15.656C13.335,15.611 13.398,15.573 13.449,15.544C13.474,15.551 13.504,15.561 13.538,15.573C13.683,15.622 13.872,15.701 14.06,15.798Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M34.065,13.161H25.935"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M24.194,13.161H21V27.097H39V13.161H35.806"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M25.935,12H24.193V14.323H25.935V12Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M35.806,12H34.064V14.323H35.806V12Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M30.581,18.968L32.904,21.29L30.581,23.613"
+        android:strokeColor="#ffffff" android:strokeLineJoin="bevel" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M32.903,21.29H27.097"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#00000000" android:pathData="M21,15.484H39"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic__child.xml b/app/src/main/res/drawable/ic__child.xml
new file mode 100644
index 000000000..a417977b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic__child.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="96"
+    android:viewportHeight="85">
+    <group>
+        <clip-path android:pathData="M0,0h96v85h-96z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M94.368,9.049C92.678,7.914 90.388,8.364 89.253,10.054L79.106,25.164C77.992,24.608 76.737,24.293 75.407,24.293H69.877C68.555,24.293 67.305,24.605 66.195,25.156L56.054,10.055C54.918,8.364 52.628,7.915 50.938,9.049C49.248,10.185 48.798,12.475 49.933,14.165L61.643,31.602C61.557,32.331 61.594,80.743 61.594,80.743C61.594,83.288 63.657,85.351 66.202,85.351C68.747,85.351 70.81,83.288 70.81,80.743V60.006H74.496V80.743C74.496,83.288 76.559,85.351 79.104,85.351C81.649,85.351 83.713,83.288 83.713,80.743C83.713,62.934 83.735,32.421 83.645,31.63L95.374,14.165C96.508,12.474 96.059,10.184 94.368,9.049Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M72.653,21.718C77.531,21.718 81.488,17.765 81.488,12.883C81.488,9.783 79.886,7.057 77.467,5.481C77.946,5.161 78.492,4.865 79.126,4.607C79.428,4.485 79.631,4.199 79.646,3.874C79.662,3.548 79.487,3.244 79.197,3.093C77.8,2.368 76.098,2.353 74.491,2.661C74.764,2.15 75.107,1.629 75.548,1.1C75.756,0.85 75.8,0.501 75.661,0.208C75.521,-0.087 75.223,-0.272 74.897,-0.269C71.668,-0.232 68.707,3.041 67.527,4.998C67.317,5.347 67.148,5.711 67.021,6.081C65.065,7.701 63.819,10.147 63.819,12.883C63.819,17.765 67.775,21.718 72.653,21.718Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M45.062,9.049C43.372,7.914 41.082,8.364 39.946,10.054L37.543,13.633C36.597,13.189 35.544,13.132 34.537,13.674C34.475,13.707 34.419,13.745 34.36,13.781L34.374,13.741C34.627,13.021 34.249,12.231 33.528,11.978C33.037,11.805 32.519,11.931 32.156,12.253C31.832,7.672 28.013,4.052 23.347,4.052C18.681,4.052 14.861,7.672 14.537,12.253C14.173,11.931 13.655,11.805 13.165,11.978C12.444,12.231 12.066,13.021 12.319,13.741L12.333,13.781C12.274,13.745 12.217,13.707 12.156,13.674C11.15,13.132 10.096,13.189 9.15,13.633L6.747,10.054C5.612,8.363 3.321,7.914 1.631,9.049C-0.059,10.184 -0.509,12.474 0.626,14.165L4.846,20.447C4.618,21.612 4.613,22.8 5.005,23.875C5.117,24.181 5.396,24.395 5.72,24.422C6.045,24.449 6.355,24.284 6.515,24.001C6.627,23.805 6.741,23.621 6.858,23.444L12.336,31.602C12.253,32.305 12.276,31.649 12.276,43.447L7.258,63.907C7.024,64.861 7.241,65.87 7.847,66.643C8.454,67.416 9.382,67.868 10.365,67.868H12.287V80.742C12.287,83.287 14.35,85.35 16.895,85.35C19.44,85.35 21.503,83.287 21.503,80.742V67.868H25.19V80.742C25.19,83.287 27.253,85.35 29.798,85.35C32.343,85.35 34.406,83.287 34.406,80.742V67.868H36.306C37.289,67.868 38.218,67.416 38.824,66.643C39.431,65.87 39.648,64.861 39.414,63.907L34.395,43.445C34.395,31.644 34.416,32.313 34.338,31.629L39.835,23.444C39.952,23.621 40.067,23.804 40.178,24C40.338,24.284 40.649,24.448 40.973,24.421C41.298,24.394 41.577,24.181 41.689,23.875C42.081,22.799 42.075,21.612 41.848,20.447L46.067,14.164C47.202,12.474 46.752,10.184 45.062,9.049ZM29.799,25.164C28.686,24.608 27.43,24.293 26.1,24.293H20.571C19.248,24.293 17.998,24.605 16.889,25.155L12.887,19.197C13.202,19.001 13.45,18.781 13.602,18.499C13.719,18.281 13.812,18.055 13.88,17.827C14.14,18.107 14.506,18.271 14.891,18.271C15.043,18.271 15.198,18.246 15.349,18.193C15.604,18.103 15.814,17.944 15.971,17.746C17.552,20.139 20.265,21.718 23.347,21.718C26.429,21.718 29.142,20.139 30.723,17.746C30.879,17.944 31.089,18.103 31.345,18.193C31.496,18.246 31.651,18.271 31.803,18.271C32.188,18.271 32.554,18.107 32.813,17.827C32.882,18.055 32.974,18.281 33.092,18.499C33.244,18.781 33.491,19.001 33.807,19.197L29.799,25.164Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__child_care.xml b/app/src/main/res/drawable/ic__child_care.xml
new file mode 100644
index 000000000..4c2f2f3ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic__child_care.xml
@@ -0,0 +1,3482 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <group>
+    <clip-path
+        android:pathData="M0,0h60v60h-60z"/>
+    <group>
+      <clip-path
+          android:pathData="M0,0h60v60h-60z"/>
+      <path
+          android:pathData="M20,2.317H19V3.317H20V2.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M21,2.333H20V3.333H21V2.333Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M18,3.283H17V4.283H18V3.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M19,3.3H18V4.3H19V3.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.937255"/>
+      <path
+          android:pathData="M20,3.317H19V4.317H20V3.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,3.333H20V4.333H21V3.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,3.35H21V4.35H22V3.35Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.937255"/>
+      <path
+          android:pathData="M23,3.367H22V4.367H23V3.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M17,4.267H16V5.267H17V4.267Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M18,4.283H17V5.283H18V4.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,4.3H18V5.3H19V4.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,4.317H19V5.317H20V4.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,4.333H20V5.333H21V4.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,4.35H21V5.35H22V4.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,4.367H22V5.367H23V4.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,4.383H23V5.383H24V4.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.623529"/>
+      <path
+          android:pathData="M16,5.25H15V6.25H16V5.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M17,5.267H16V6.267H17V5.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,5.283H17V6.283H18V5.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,5.3H18V6.3H19V5.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,5.317H19V6.317H20V5.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,5.333H20V6.333H21V5.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,5.35H21V6.35H22V5.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,5.367H22V6.367H23V5.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,5.383H23V6.383H24V5.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,5.4H24V6.4H25V5.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M16,6.25H15V7.25H16V6.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.811765"/>
+      <path
+          android:pathData="M17,6.267H16V7.267H17V6.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,6.283H17V7.283H18V6.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,6.3H18V7.3H19V6.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,6.317H19V7.317H20V6.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,6.333H20V7.333H21V6.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,6.35H21V7.35H22V6.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,6.367H22V7.367H23V6.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,6.383H23V7.383H24V6.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,6.4H24V7.4H25V6.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M16,7.25H15V8.25H16V7.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,7.267H16V8.267H17V7.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,7.283H17V8.283H18V7.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,7.3H18V8.3H19V7.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,7.317H19V8.317H20V7.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,7.333H20V8.333H21V7.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,7.35H21V8.35H22V7.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,7.367H22V8.367H23V7.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,7.383H23V8.383H24V7.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,7.4H24V8.4H25V7.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,8.25H15V9.25H16V8.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M17,8.267H16V9.267H17V8.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,8.283H17V9.283H18V8.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,8.3H18V9.3H19V8.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,8.317H19V9.317H20V8.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,8.333H20V9.333H21V8.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,8.35H21V9.35H22V8.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,8.367H22V9.367H23V8.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,8.383H23V9.383H24V8.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,8.4H24V9.4H25V8.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M16,9.25H15V10.25H16V9.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.690196"/>
+      <path
+          android:pathData="M17,9.267H16V10.267H17V9.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,9.283H17V10.283H18V9.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,9.3H18V10.3H19V9.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,9.317H19V10.317H20V9.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,9.333H20V10.333H21V9.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,9.35H21V10.35H22V9.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,9.367H22V10.367H23V9.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,9.383H23V10.383H24V9.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,9.4H24V10.4H25V9.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M16,10.25H15V11.25H16V10.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M17,10.267H16V11.267H17V10.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,10.283H17V11.283H18V10.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,10.3H18V11.3H19V10.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,10.317H19V11.317H20V10.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,10.333H20V11.333H21V10.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,10.35H21V11.35H22V10.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,10.367H22V11.367H23V10.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,10.383H23V11.383H24V10.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M25,10.4H24V11.4H25V10.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M17,11.267H16V12.267H17V11.267Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M18,11.283H17V12.283H18V11.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M19,11.3H18V12.3H19V11.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,11.317H19V12.317H20V11.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,11.333H20V12.333H21V11.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,11.35H21V12.35H22V11.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,11.367H22V12.367H23V11.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M24,11.383H23V12.383H24V11.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M18,12.283H17V13.283H18V12.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M19,12.3H18V13.3H19V12.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M20,12.317H19V13.317H20V12.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M21,12.333H20V13.333H21V12.333Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M22,12.35H21V13.35H22V12.35Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.439216"/>
+      <path
+          android:pathData="M23,12.367H22V13.367H23V12.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M15,15.233H14V16.233H15V15.233Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.372549"/>
+      <path
+          android:pathData="M16,15.25H15V16.25H16V15.25Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.686275"/>
+      <path
+          android:pathData="M17,15.267H16V16.267H17V15.267Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M18,15.283H17V16.283H18V15.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.560784"/>
+      <path
+          android:pathData="M19,15.3H18V16.3H19V15.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M13,16.2H12V17.2H13V16.2Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M14,16.217H13V17.217H14V16.217Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M15,16.233H14V17.233H15V16.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,16.25H15V17.25H16V16.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,16.267H16V17.267H17V16.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,16.283H17V17.283H18V16.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,16.3H18V17.3H19V16.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,16.317H19V17.317H20V16.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M21,16.333H20V17.333H21V16.333Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.372549"/>
+      <path
+          android:pathData="M12,17.183H11V18.183H12V17.183Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M13,17.2H12V18.2H13V17.2Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M14,17.217H13V18.217H14V17.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,17.233H14V18.233H15V17.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,17.25H15V18.25H16V17.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,17.267H16V18.267H17V17.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,17.283H17V18.283H18V17.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,17.3H18V18.3H19V17.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,17.317H19V18.317H20V17.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,17.333H20V18.333H21V17.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,17.35H21V18.35H22V17.35Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M23,17.367H22V18.367H23V17.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.435294"/>
+      <path
+          android:pathData="M24,17.383H23V18.383H24V17.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M12,18.183H11V19.183H12V18.183Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.439216"/>
+      <path
+          android:pathData="M13,18.2H12V19.2H13V18.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,18.217H13V19.217H14V18.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,18.233H14V19.233H15V18.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,18.25H15V19.25H16V18.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,18.267H16V19.267H17V18.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,18.283H17V19.283H18V18.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,18.3H18V19.3H19V18.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,18.317H19V19.317H20V18.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,18.333H20V19.333H21V18.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,18.35H21V19.35H22V18.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,18.367H22V19.367H23V18.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,18.383H23V19.383H24V18.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.937255"/>
+      <path
+          android:pathData="M25,18.4H24V19.4H25V18.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.560784"/>
+      <path
+          android:pathData="M26,18.417H25V19.417H26V18.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M12,19.183H11V20.183H12V19.183Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.811765"/>
+      <path
+          android:pathData="M13,19.2H12V20.2H13V19.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,19.217H13V20.217H14V19.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,19.233H14V20.233H15V19.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,19.25H15V20.25H16V19.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,19.267H16V20.267H17V19.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,19.283H17V20.283H18V19.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,19.3H18V20.3H19V19.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,19.317H19V20.317H20V19.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,19.333H20V20.333H21V19.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,19.35H21V20.35H22V19.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,19.367H22V20.367H23V19.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,19.383H23V20.383H24V19.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,19.4H24V20.4H25V19.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,19.417H25V20.417H26V19.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,19.433H26V20.433H27V19.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.623529"/>
+      <path
+          android:pathData="M28,19.45H27V20.45H28V19.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M11,20.167H10V21.167H11V20.167Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M12,20.183H11V21.183H12V20.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,20.2H12V21.2H13V20.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,20.217H13V21.217H14V20.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,20.233H14V21.233H15V20.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,20.25H15V21.25H16V20.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,20.267H16V21.267H17V20.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,20.283H17V21.283H18V20.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,20.3H18V21.3H19V20.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,20.317H19V21.317H20V20.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,20.333H20V21.333H21V20.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,20.35H21V21.35H22V20.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,20.367H22V21.367H23V20.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,20.383H23V21.383H24V20.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,20.4H24V21.4H25V20.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,20.417H25V21.417H26V20.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,20.433H26V21.433H27V20.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,20.45H27V21.45H28V20.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,20.467H28V21.467H29V20.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.811765"/>
+      <path
+          android:pathData="M30,20.483H29V21.483H30V20.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M31,20.5H30V21.5H31V20.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M32,20.517H31V21.517H32V20.517Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M33,20.533H32V21.533H33V20.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M34,20.55H33V21.55H34V20.55Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M35,20.567H34V21.567H35V20.567Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M11,21.167H10V22.167H11V21.167Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.564706"/>
+      <path
+          android:pathData="M12,21.183H11V22.183H12V21.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,21.2H12V22.2H13V21.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,21.217H13V22.217H14V21.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,21.233H14V22.233H15V21.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,21.25H15V22.25H16V21.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,21.267H16V22.267H17V21.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,21.283H17V22.283H18V21.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,21.3H18V22.3H19V21.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,21.317H19V22.317H20V21.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,21.333H20V22.333H21V21.333Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M22,21.35H21V22.35H22V21.35Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M23,21.367H22V22.367H23V21.367Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M24,21.383H23V22.383H24V21.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,21.4H24V22.4H25V21.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,21.417H25V22.417H26V21.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,21.433H26V22.433H27V21.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,21.45H27V22.45H28V21.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,21.467H28V22.467H29V21.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,21.483H29V22.483H30V21.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,21.5H30V22.5H31V21.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,21.517H31V22.517H32V21.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,21.533H32V22.533H33V21.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,21.55H33V22.55H34V21.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,21.567H34V22.567H35V21.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,22.167H10V23.167H11V22.167Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M12,22.183H11V23.183H12V22.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,22.2H12V23.2H13V22.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,22.217H13V23.217H14V22.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,22.233H14V23.233H15V22.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,22.25H15V23.25H16V22.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,22.267H16V23.267H17V22.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,22.283H17V23.283H18V22.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,22.3H18V23.3H19V22.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,22.317H19V23.317H20V22.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,22.333H20V23.333H21V22.333Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.690196"/>
+      <path
+          android:pathData="M22,22.35H21V23.35H22V22.35Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M23,22.367H22V23.367H23V22.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M24,22.383H23V23.383H24V22.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,22.4H24V23.4H25V22.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,22.417H25V23.417H26V22.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,22.433H26V23.433H27V22.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,22.45H27V23.45H28V22.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,22.467H28V23.467H29V22.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,22.483H29V23.483H30V22.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,22.5H30V23.5H31V22.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,22.517H31V23.517H32V22.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,22.533H32V23.533H33V22.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,22.55H33V23.55H34V22.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,22.567H34V23.567H35V22.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,23.15H9V24.15H10V23.15Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M11,23.167H10V24.167H11V23.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,23.183H11V24.183H12V23.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,23.2H12V24.2H13V23.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,23.217H13V24.217H14V23.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,23.233H14V24.233H15V23.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,23.25H15V24.25H16V23.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,23.267H16V24.267H17V23.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,23.283H17V24.283H18V23.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,23.3H18V24.3H19V23.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,23.317H19V24.317H20V23.317Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M21,23.333H20V24.333H21V23.333Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.313726"/>
+      <path
+          android:pathData="M23,23.367H22V24.367H23V23.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M24,23.383H23V24.383H24V23.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.439216"/>
+      <path
+          android:pathData="M25,23.4H24V24.4H25V23.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M26,23.417H25V24.417H26V23.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,23.433H26V24.433H27V23.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,23.45H27V24.45H28V23.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,23.467H28V24.467H29V23.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,23.483H29V24.483H30V23.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,23.5H30V24.5H31V23.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,23.517H31V24.517H32V23.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,23.533H32V24.533H33V23.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,23.55H33V24.55H34V23.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,23.567H34V24.567H35V23.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,24.15H9V25.15H10V24.15Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.564706"/>
+      <path
+          android:pathData="M11,24.167H10V25.167H11V24.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,24.183H11V25.183H12V24.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,24.2H12V25.2H13V24.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,24.217H13V25.217H14V24.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,24.233H14V25.233H15V24.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,24.25H15V25.25H16V24.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,24.267H16V25.267H17V24.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,24.283H17V25.283H18V24.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,24.3H18V25.3H19V24.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,24.317H19V25.317H20V24.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M26,24.417H25V25.417H26V24.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M27,24.433H26V25.433H27V24.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M28,24.45H27V25.45H28V24.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,24.467H28V25.467H29V24.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,24.483H29V25.483H30V24.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,24.5H30V25.5H31V24.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,24.517H31V25.517H32V24.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,24.533H32V25.533H33V24.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,24.55H33V25.55H34V24.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,24.567H34V25.567H35V24.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,25.15H9V26.15H10V25.15Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M11,25.167H10V26.167H11V25.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,25.183H11V26.183H12V25.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,25.2H12V26.2H13V25.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,25.217H13V26.217H14V25.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,25.233H14V26.233H15V25.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,25.25H15V26.25H16V25.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,25.267H16V26.267H17V25.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,25.283H17V26.283H18V25.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,25.3H18V26.3H19V25.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,25.317H19V26.317H20V25.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M28,25.45H27V26.45H28V25.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M29,25.467H28V26.467H29V25.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M30,25.483H29V26.483H30V25.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M31,25.5H30V26.5H31V25.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M32,25.517H31V26.517H32V25.517Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M33,25.533H32V26.533H33V25.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M34,25.55H33V26.55H34V25.55Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M35,25.567H34V26.567H35V25.567Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M9,26.133H8V27.133H9V26.133Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M10,26.15H9V27.15H10V26.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,26.167H10V27.167H11V26.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,26.183H11V27.183H12V26.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,26.2H12V27.2H13V26.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,26.217H13V27.217H14V26.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,26.233H14V27.233H15V26.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,26.25H15V27.25H16V26.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,26.267H16V27.267H17V26.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,26.283H17V27.283H18V26.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,26.3H18V27.3H19V26.3Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M20,26.317H19V27.317H20V26.317Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.313726"/>
+      <path
+          android:pathData="M9,27.133H8V28.133H9V27.133Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.564706"/>
+      <path
+          android:pathData="M10,27.15H9V28.15H10V27.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,27.167H10V28.167H11V27.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,27.183H11V28.183H12V27.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,27.2H12V28.2H13V27.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,27.217H13V28.217H14V27.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,27.233H14V28.233H15V27.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,27.25H15V28.25H16V27.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,27.267H16V28.267H17V27.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,27.283H17V28.283H18V27.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,27.3H18V28.3H19V27.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M23,27.367H22V28.367H23V27.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M24,27.383H23V28.383H24V27.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M25,27.4H24V28.4H25V27.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M26,27.417H25V28.417H26V27.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M27,27.433H26V28.433H27V27.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M28,27.45H27V28.45H28V27.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M29,27.467H28V28.467H29V27.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M30,27.483H29V28.483H30V27.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M31,27.5H30V28.5H31V27.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M38,27.617H37V28.617H38V27.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M39,27.633H38V28.633H39V27.633Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M40,27.65H39V28.65H40V27.65Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M41,27.667H40V28.667H41V27.667Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M42,27.683H41V28.683H42V27.683Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M43,27.7H42V28.7H43V27.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M9,28.133H8V29.133H9V28.133Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.87451"/>
+      <path
+          android:pathData="M10,28.15H9V29.15H10V28.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,28.167H10V29.167H11V28.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,28.183H11V29.183H12V28.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,28.2H12V29.2H13V28.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,28.217H13V29.217H14V28.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,28.233H14V29.233H15V28.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,28.25H15V29.25H16V28.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,28.267H16V29.267H17V28.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,28.283H17V29.283H18V28.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,28.3H18V29.3H19V28.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M23,28.367H22V29.367H23V28.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,28.383H23V29.383H24V28.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,28.4H24V29.4H25V28.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,28.417H25V29.417H26V28.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,28.433H26V29.433H27V28.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,28.45H27V29.45H28V28.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,28.467H28V29.467H29V28.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,28.483H29V29.483H30V28.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,28.5H30V29.5H31V28.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,28.517H31V29.517H32V28.517Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.686275"/>
+      <path
+          android:pathData="M38,28.617H37V29.617H38V28.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M39,28.633H38V29.633H39V28.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,28.65H39V29.65H40V28.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,28.667H40V29.667H41V28.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,28.683H41V29.683H42V28.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,28.7H42V29.7H43V28.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,29.117H7V30.117H8V29.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M9,29.133H8V30.133H9V29.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,29.15H9V30.15H10V29.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,29.167H10V30.167H11V29.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,29.183H11V30.183H12V29.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,29.2H12V30.2H13V29.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,29.217H13V30.217H14V29.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,29.233H14V30.233H15V29.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,29.25H15V30.25H16V29.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,29.267H16V30.267H17V29.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,29.283H17V30.283H18V29.283Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M19,29.3H18V30.3H19V29.3Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.313726"/>
+      <path
+          android:pathData="M23,29.367H22V30.367H23V29.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,29.383H23V30.383H24V29.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,29.4H24V30.4H25V29.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,29.417H25V30.417H26V29.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,29.433H26V30.433H27V29.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,29.45H27V30.45H28V29.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,29.467H28V30.467H29V29.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,29.483H29V30.483H30V29.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,29.5H30V30.5H31V29.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,29.517H31V30.517H32V29.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,29.533H32V30.533H33V29.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M38,29.617H37V30.617H38V29.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M39,29.633H38V30.633H39V29.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,29.65H39V30.65H40V29.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,29.667H40V30.667H41V29.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,29.683H41V30.683H42V29.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,29.7H42V30.7H43V29.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,30.117H7V31.117H8V30.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,30.133H8V31.133H9V30.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,30.15H9V31.15H10V30.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,30.167H10V31.167H11V30.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,30.183H11V31.183H12V30.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,30.2H12V31.2H13V30.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,30.217H13V31.217H14V30.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,30.233H14V31.233H15V30.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,30.25H15V31.25H16V30.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,30.267H16V31.267H17V30.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,30.283H17V31.283H18V30.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M23,30.367H22V31.367H23V30.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,30.383H23V31.383H24V30.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,30.4H24V31.4H25V30.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,30.417H25V31.417H26V30.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,30.433H26V31.433H27V30.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,30.45H27V31.45H28V30.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,30.467H28V31.467H29V30.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,30.483H29V31.483H30V30.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,30.5H30V31.5H31V30.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,30.517H31V31.517H32V30.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,30.533H32V31.533H33V30.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M38,30.617H37V31.617H38V30.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M39,30.633H38V31.633H39V30.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,30.65H39V31.65H40V30.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,30.667H40V31.667H41V30.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,30.683H41V31.683H42V30.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,30.7H42V31.7H43V30.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,31.117H7V32.117H8V31.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,31.133H8V32.133H9V31.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,31.15H9V32.15H10V31.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,31.167H10V32.167H11V31.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,31.183H11V32.183H12V31.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,31.2H12V32.2H13V31.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,31.217H13V32.217H14V31.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,31.233H14V32.233H15V31.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,31.25H15V32.25H16V31.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,31.267H16V32.267H17V31.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,31.283H17V32.283H18V31.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M23,31.367H22V32.367H23V31.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,31.383H23V32.383H24V31.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,31.4H24V32.4H25V31.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,31.417H25V32.417H26V31.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,31.433H26V32.433H27V31.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,31.45H27V32.45H28V31.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,31.467H28V32.467H29V31.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,31.483H29V32.483H30V31.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,31.5H30V32.5H31V31.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,31.517H31V32.517H32V31.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,31.533H32V32.533H33V31.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M38,31.617H37V32.617H38V31.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M39,31.633H38V32.633H39V31.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,31.65H39V32.65H40V31.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,31.667H40V32.667H41V31.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,31.683H41V32.683H42V31.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,31.7H42V32.7H43V31.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,32.117H7V33.117H8V32.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,32.133H8V33.133H9V32.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,32.15H9V33.15H10V32.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,32.167H10V33.167H11V32.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,32.183H11V33.183H12V32.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,32.2H12V33.2H13V32.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,32.217H13V33.217H14V32.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,32.233H14V33.233H15V32.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,32.25H15V33.25H16V32.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,32.267H16V33.267H17V32.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,32.283H17V33.283H18V32.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,32.367H22V33.367H23V32.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M24,32.383H23V33.383H24V32.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M25,32.4H24V33.4H25V32.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M26,32.417H25V33.417H26V32.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M27,32.433H26V33.433H27V32.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M28,32.45H27V33.45H28V32.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M29,32.467H28V33.467H29V32.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,32.483H29V33.483H30V32.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,32.5H30V33.5H31V32.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,32.517H31V33.517H32V32.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,32.533H32V33.533H33V32.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.623529"/>
+      <path
+          android:pathData="M34,32.55H33V33.55H34V32.55Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M35,32.567H34V33.567H35V32.567Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M36,32.583H35V33.583H36V32.583Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M37,32.6H36V33.6H37V32.6Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M38,32.617H37V33.617H38V32.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.623529"/>
+      <path
+          android:pathData="M39,32.633H38V33.633H39V32.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,32.65H39V33.65H40V32.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,32.667H40V33.667H41V32.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,32.683H41V33.683H42V32.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,32.7H42V33.7H43V32.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M48,32.783H47V33.783H48V32.783Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M49,32.8H48V33.8H49V32.8Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.247059"/>
+      <path
+          android:pathData="M50,32.817H49V33.817H50V32.817Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M8,33.117H7V34.117H8V33.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,33.133H8V34.133H9V33.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,33.15H9V34.15H10V33.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,33.167H10V34.167H11V33.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,33.183H11V34.183H12V33.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,33.2H12V34.2H13V33.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,33.217H13V34.217H14V33.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,33.233H14V34.233H15V33.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,33.25H15V34.25H16V33.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,33.267H16V34.267H17V33.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,33.283H17V34.283H18V33.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,33.45H27V34.45H28V33.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M29,33.467H28V34.467H29V33.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,33.483H29V34.483H30V33.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,33.5H30V34.5H31V33.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,33.517H31V34.517H32V33.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,33.533H32V34.533H33V33.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,33.55H33V34.55H34V33.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,33.567H34V34.567H35V33.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,33.583H35V34.583H36V33.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,33.6H36V34.6H37V33.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,33.617H37V34.617H38V33.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,33.633H38V34.633H39V33.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,33.65H39V34.65H40V33.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,33.667H40V34.667H41V33.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,33.683H41V34.683H42V33.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,33.7H42V34.7H43V33.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M46,33.75H45V34.75H46V33.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M47,33.767H46V34.767H47V33.767Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.686275"/>
+      <path
+          android:pathData="M48,33.783H47V34.783H48V33.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,33.8H48V34.8H49V33.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,33.817H49V34.817H50V33.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,33.833H50V34.833H51V33.833Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M52,33.85H51V34.85H52V33.85Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M8,34.117H7V35.117H8V34.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,34.133H8V35.133H9V34.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,34.15H9V35.15H10V34.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,34.167H10V35.167H11V34.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,34.183H11V35.183H12V34.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,34.2H12V35.2H13V34.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,34.217H13V35.217H14V34.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,34.233H14V35.233H15V34.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,34.25H15V35.25H16V34.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,34.267H16V35.267H17V34.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,34.283H17V35.283H18V34.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,34.45H27V35.45H28V34.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M29,34.467H28V35.467H29V34.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,34.483H29V35.483H30V34.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,34.5H30V35.5H31V34.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,34.517H31V35.517H32V34.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,34.533H32V35.533H33V34.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,34.55H33V35.55H34V34.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,34.567H34V35.567H35V34.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,34.583H35V35.583H36V34.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,34.6H36V35.6H37V34.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,34.617H37V35.617H38V34.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,34.633H38V35.633H39V34.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,34.65H39V35.65H40V34.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,34.667H40V35.667H41V34.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,34.683H41V35.683H42V34.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,34.7H42V35.7H43V34.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M46,34.75H45V35.75H46V34.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.564706"/>
+      <path
+          android:pathData="M47,34.767H46V35.767H47V34.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,34.783H47V35.783H48V34.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,34.8H48V35.8H49V34.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,34.817H49V35.817H50V34.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,34.833H50V35.833H51V34.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,34.85H51V35.85H52V34.85Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.74902"/>
+      <path
+          android:pathData="M8,35.117H7V36.117H8V35.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,35.133H8V36.133H9V35.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,35.15H9V36.15H10V35.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,35.167H10V36.167H11V35.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,35.183H11V36.183H12V35.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,35.2H12V36.2H13V35.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,35.217H13V36.217H14V35.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,35.233H14V36.233H15V35.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,35.25H15V36.25H16V35.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,35.267H16V36.267H17V35.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,35.283H17V36.283H18V35.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,35.45H27V36.45H28V35.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M29,35.467H28V36.467H29V35.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,35.483H29V36.483H30V35.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,35.5H30V36.5H31V35.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,35.517H31V36.517H32V35.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,35.533H32V36.533H33V35.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,35.55H33V36.55H34V35.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,35.567H34V36.567H35V35.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,35.583H35V36.583H36V35.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,35.6H36V36.6H37V35.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,35.617H37V36.617H38V35.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,35.633H38V36.633H39V35.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,35.65H39V36.65H40V35.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,35.667H40V36.667H41V35.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,35.683H41V36.683H42V35.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,35.7H42V36.7H43V35.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M46,35.75H45V36.75H46V35.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,35.767H46V36.767H47V35.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,35.783H47V36.783H48V35.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,35.8H48V36.8H49V35.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,35.817H49V36.817H50V35.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,35.833H50V36.833H51V35.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,35.85H51V36.85H52V35.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,35.867H52V36.867H53V35.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M8,36.117H7V37.117H8V36.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,36.133H8V37.133H9V36.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,36.15H9V37.15H10V36.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,36.167H10V37.167H11V36.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,36.183H11V37.183H12V36.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,36.2H12V37.2H13V36.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,36.217H13V37.217H14V36.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,36.233H14V37.233H15V36.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,36.25H15V37.25H16V36.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,36.267H16V37.267H17V36.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,36.283H17V37.283H18V36.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,36.45H27V37.45H28V36.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.376471"/>
+      <path
+          android:pathData="M29,36.467H28V37.467H29V36.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,36.483H29V37.483H30V36.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,36.5H30V37.5H31V36.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,36.517H31V37.517H32V36.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,36.533H32V37.533H33V36.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,36.55H33V37.55H34V36.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,36.567H34V37.567H35V36.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,36.583H35V37.583H36V36.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,36.6H36V37.6H37V36.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,36.617H37V37.617H38V36.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,36.633H38V37.633H39V36.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,36.65H39V37.65H40V36.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,36.667H40V37.667H41V36.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,36.683H41V37.683H42V36.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,36.7H42V37.7H43V36.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M45,36.733H44V37.733H45V36.733Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M46,36.75H45V37.75H46V36.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,36.767H46V37.767H47V36.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,36.783H47V37.783H48V36.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,36.8H48V37.8H49V36.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,36.817H49V37.817H50V36.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,36.833H50V37.833H51V36.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,36.85H51V37.85H52V36.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,36.867H52V37.867H53V36.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,37.117H7V38.117H8V37.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,37.133H8V38.133H9V37.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,37.15H9V38.15H10V37.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,37.167H10V38.167H11V37.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,37.183H11V38.183H12V37.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,37.2H12V38.2H13V37.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,37.217H13V38.217H14V37.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,37.233H14V38.233H15V37.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,37.25H15V38.25H16V37.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,37.267H16V38.267H17V37.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,37.283H17V38.283H18V37.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,37.45H27V38.45H28V37.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M29,37.467H28V38.467H29V37.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M30,37.483H29V38.483H30V37.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,37.5H30V38.5H31V37.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,37.517H31V38.517H32V37.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,37.533H32V38.533H33V37.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,37.55H33V38.55H34V37.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,37.567H34V38.567H35V37.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,37.583H35V38.583H36V37.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,37.6H36V38.6H37V37.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,37.617H37V38.617H38V37.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,37.633H38V38.633H39V37.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,37.65H39V38.65H40V37.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,37.667H40V38.667H41V37.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,37.683H41V38.683H42V37.683Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.752941"/>
+      <path
+          android:pathData="M46,37.75H45V38.75H46V37.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M47,37.767H46V38.767H47V37.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,37.783H47V38.783H48V37.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,37.8H48V38.8H49V37.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,37.817H49V38.817H50V37.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,37.833H50V38.833H51V37.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,37.85H51V38.85H52V37.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,37.867H52V38.867H53V37.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M8,38.117H7V39.117H8V38.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,38.133H8V39.133H9V38.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,38.15H9V39.15H10V38.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,38.167H10V39.167H11V38.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,38.183H11V39.183H12V38.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,38.2H12V39.2H13V38.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,38.217H13V39.217H14V38.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,38.233H14V39.233H15V38.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,38.25H15V39.25H16V38.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,38.267H16V39.267H17V38.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,38.283H17V39.283H18V38.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M29,38.467H28V39.467H29V38.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M30,38.483H29V39.483H30V38.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M31,38.5H30V39.5H31V38.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,38.517H31V39.517H32V38.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,38.533H32V39.533H33V38.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,38.55H33V39.55H34V38.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,38.567H34V39.567H35V38.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,38.583H35V39.583H36V38.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,38.6H36V39.6H37V38.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,38.617H37V39.617H38V38.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,38.633H38V39.633H39V38.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,38.65H39V39.65H40V38.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,38.667H40V39.667H41V38.667Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M42,38.683H41V39.683H42V38.683Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M46,38.75H45V39.75H46V38.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.439216"/>
+      <path
+          android:pathData="M47,38.767H46V39.767H47V38.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,38.783H47V39.783H48V38.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,38.8H48V39.8H49V38.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,38.817H49V39.817H50V38.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,38.833H50V39.833H51V38.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,38.85H51V39.85H52V38.85Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.564706"/>
+      <path
+          android:pathData="M8,39.117H7V40.117H8V39.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,39.133H8V40.133H9V39.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,39.15H9V40.15H10V39.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,39.167H10V40.167H11V39.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,39.183H11V40.183H12V39.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,39.2H12V40.2H13V39.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,39.217H13V40.217H14V39.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,39.233H14V40.233H15V39.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,39.25H15V40.25H16V39.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,39.267H16V40.267H17V39.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,39.283H17V40.283H18V39.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M30,39.483H29V40.483H30V39.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.188235"/>
+      <path
+          android:pathData="M31,39.5H30V40.5H31V39.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.690196"/>
+      <path
+          android:pathData="M32,39.517H31V40.517H32V39.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,39.533H32V40.533H33V39.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,39.55H33V40.55H34V39.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,39.567H34V40.567H35V39.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,39.583H35V40.583H36V39.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,39.6H36V40.6H37V39.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,39.617H37V40.617H38V39.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,39.633H38V40.633H39V39.633Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M40,39.65H39V40.65H40V39.65Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.627451"/>
+      <path
+          android:pathData="M41,39.667H40V40.667H41V39.667Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.0627451"/>
+      <path
+          android:pathData="M47,39.767H46V40.767H47V39.767Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.439216"/>
+      <path
+          android:pathData="M48,39.783H47V40.783H48V39.783Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.878431"/>
+      <path
+          android:pathData="M49,39.8H48V40.8H49V39.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,39.817H49V40.817H50V39.817Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.941176"/>
+      <path
+          android:pathData="M51,39.833H50V40.833H51V39.833Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,40.117H7V41.117H8V40.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,40.133H8V41.133H9V40.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,40.15H9V41.15H10V40.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,40.167H10V41.167H11V40.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,40.183H11V41.183H12V40.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,40.2H12V41.2H13V40.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,40.217H13V41.217H14V40.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,40.233H14V41.233H15V40.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,40.25H15V41.25H16V40.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,40.267H16V41.267H17V40.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,40.283H17V41.283H18V40.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,41.117H7V42.117H8V41.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,41.133H8V42.133H9V41.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,41.15H9V42.15H10V41.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,41.167H10V42.167H11V41.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,41.183H11V42.183H12V41.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,41.2H12V42.2H13V41.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,41.217H13V42.217H14V41.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,41.233H14V42.233H15V41.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,41.25H15V42.25H16V41.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,41.267H16V42.267H17V41.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,41.283H17V42.283H18V41.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,42.117H7V43.117H8V42.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,42.133H8V43.133H9V42.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,42.15H9V43.15H10V42.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,42.167H10V43.167H11V42.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,42.183H11V43.183H12V42.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,42.2H12V43.2H13V42.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,42.217H13V43.217H14V42.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,42.233H14V43.233H15V42.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,42.25H15V43.25H16V42.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,42.267H16V43.267H17V42.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,42.283H17V43.283H18V42.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,42.367H22V43.367H23V42.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M24,42.383H23V43.383H24V42.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M25,42.4H24V43.4H25V42.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M26,42.417H25V43.417H26V42.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M27,42.433H26V43.433H27V42.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M28,42.45H27V43.45H28V42.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M29,42.467H28V43.467H29V42.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M30,42.483H29V43.483H30V42.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M31,42.5H30V43.5H31V42.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M32,42.517H31V43.517H32V42.517Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M33,42.533H32V43.533H33V42.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M34,42.55H33V43.55H34V42.55Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M35,42.567H34V43.567H35V42.567Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M36,42.583H35V43.583H36V42.583Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M37,42.6H36V43.6H37V42.6Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M38,42.617H37V43.617H38V42.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M39,42.633H38V43.633H39V42.633Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M40,42.65H39V43.65H40V42.65Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M41,42.667H40V43.667H41V42.667Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M42,42.683H41V43.683H42V42.683Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M43,42.7H42V43.7H43V42.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M44,42.717H43V43.717H44V42.717Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M45,42.733H44V43.733H45V42.733Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M46,42.75H45V43.75H46V42.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M47,42.767H46V43.767H47V42.767Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M48,42.783H47V43.783H48V42.783Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M49,42.8H48V43.8H49V42.8Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M50,42.817H49V43.817H50V42.817Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M51,42.833H50V43.833H51V42.833Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M52,42.85H51V43.85H52V42.85Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.498039"/>
+      <path
+          android:pathData="M53,42.867H52V43.867H53V42.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M8,43.117H7V44.117H8V43.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,43.133H8V44.133H9V43.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,43.15H9V44.15H10V43.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,43.167H10V44.167H11V43.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,43.183H11V44.183H12V43.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,43.2H12V44.2H13V43.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,43.217H13V44.217H14V43.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,43.233H14V44.233H15V43.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,43.25H15V44.25H16V43.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,43.267H16V44.267H17V43.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,43.283H17V44.283H18V43.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,43.367H22V44.367H23V43.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,43.383H23V44.383H24V43.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,43.4H24V44.4H25V43.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,43.417H25V44.417H26V43.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,43.433H26V44.433H27V43.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,43.45H27V44.45H28V43.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,43.467H28V44.467H29V43.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,43.483H29V44.483H30V43.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,43.5H30V44.5H31V43.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,43.517H31V44.517H32V43.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,43.533H32V44.533H33V43.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,43.55H33V44.55H34V43.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,43.567H34V44.567H35V43.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,43.583H35V44.583H36V43.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,43.6H36V44.6H37V43.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,43.617H37V44.617H38V43.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,43.633H38V44.633H39V43.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,43.65H39V44.65H40V43.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,43.667H40V44.667H41V43.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,43.683H41V44.683H42V43.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,43.7H42V44.7H43V43.7Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M44,43.717H43V44.717H44V43.717Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M45,43.733H44V44.733H45V43.733Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M46,43.75H45V44.75H46V43.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,43.767H46V44.767H47V43.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,43.783H47V44.783H48V43.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,43.8H48V44.8H49V43.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,43.817H49V44.817H50V43.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,43.833H50V44.833H51V43.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,43.85H51V44.85H52V43.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,43.867H52V44.867H53V43.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,44.117H7V45.117H8V44.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,44.133H8V45.133H9V44.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,44.15H9V45.15H10V44.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,44.167H10V45.167H11V44.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,44.183H11V45.183H12V44.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,44.2H12V45.2H13V44.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,44.217H13V45.217H14V44.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,44.233H14V45.233H15V44.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,44.25H15V45.25H16V44.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,44.267H16V45.267H17V44.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,44.283H17V45.283H18V44.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,44.367H22V45.367H23V44.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,44.383H23V45.383H24V44.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,44.4H24V45.4H25V44.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,44.417H25V45.417H26V44.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,44.433H26V45.433H27V44.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,44.45H27V45.45H28V44.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,44.467H28V45.467H29V44.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,44.483H29V45.483H30V44.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,44.5H30V45.5H31V44.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,44.517H31V45.517H32V44.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,44.533H32V45.533H33V44.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,44.55H33V45.55H34V44.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,44.567H34V45.567H35V44.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,44.583H35V45.583H36V44.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,44.6H36V45.6H37V44.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,44.617H37V45.617H38V44.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,44.633H38V45.633H39V44.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,44.65H39V45.65H40V44.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,44.667H40V45.667H41V44.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,44.683H41V45.683H42V44.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,44.7H42V45.7H43V44.7Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M44,44.717H43V45.717H44V44.717Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M45,44.733H44V45.733H45V44.733Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M46,44.75H45V45.75H46V44.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,44.767H46V45.767H47V44.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,44.783H47V45.783H48V44.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,44.8H48V45.8H49V44.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,44.817H49V45.817H50V44.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,44.833H50V45.833H51V44.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,44.85H51V45.85H52V44.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,44.867H52V45.867H53V44.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,45.117H7V46.117H8V45.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,45.133H8V46.133H9V45.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,45.15H9V46.15H10V45.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,45.167H10V46.167H11V45.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,45.183H11V46.183H12V45.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,45.2H12V46.2H13V45.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,45.217H13V46.217H14V45.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,45.233H14V46.233H15V45.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,45.25H15V46.25H16V45.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,45.267H16V46.267H17V45.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,45.283H17V46.283H18V45.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,45.367H22V46.367H23V45.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,45.383H23V46.383H24V45.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,45.4H24V46.4H25V45.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,45.417H25V46.417H26V45.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,45.433H26V46.433H27V45.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,45.45H27V46.45H28V45.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,45.467H28V46.467H29V45.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,45.483H29V46.483H30V45.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,45.5H30V46.5H31V45.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,45.517H31V46.517H32V45.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,45.533H32V46.533H33V45.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,45.55H33V46.55H34V45.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,45.567H34V46.567H35V45.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,45.583H35V46.583H36V45.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,45.6H36V46.6H37V45.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,45.617H37V46.617H38V45.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,45.633H38V46.633H39V45.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,45.65H39V46.65H40V45.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,45.667H40V46.667H41V45.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,45.683H41V46.683H42V45.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,45.7H42V46.7H43V45.7Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M44,45.717H43V46.717H44V45.717Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M45,45.733H44V46.733H45V45.733Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M46,45.75H45V46.75H46V45.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,45.767H46V46.767H47V45.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,45.783H47V46.783H48V45.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,45.8H48V46.8H49V45.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,45.817H49V46.817H50V45.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,45.833H50V46.833H51V45.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,45.85H51V46.85H52V45.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,45.867H52V46.867H53V45.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,46.117H7V47.117H8V46.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,46.133H8V47.133H9V46.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,46.15H9V47.15H10V46.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,46.167H10V47.167H11V46.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,46.183H11V47.183H12V46.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,46.2H12V47.2H13V46.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,46.217H13V47.217H14V46.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,46.233H14V47.233H15V46.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,46.25H15V47.25H16V46.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,46.267H16V47.267H17V46.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,46.283H17V47.283H18V46.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,46.367H22V47.367H23V46.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M24,46.383H23V47.383H24V46.383Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M25,46.4H24V47.4H25V46.4Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M26,46.417H25V47.417H26V46.417Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M27,46.433H26V47.433H27V46.433Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M28,46.45H27V47.45H28V46.45Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M29,46.467H28V47.467H29V46.467Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M30,46.483H29V47.483H30V46.483Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M31,46.5H30V47.5H31V46.5Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M32,46.517H31V47.517H32V46.517Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M33,46.533H32V47.533H33V46.533Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M34,46.55H33V47.55H34V46.55Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M35,46.567H34V47.567H35V46.567Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M36,46.583H35V47.583H36V46.583Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M37,46.6H36V47.6H37V46.6Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M38,46.617H37V47.617H38V46.617Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M39,46.633H38V47.633H39V46.633Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M40,46.65H39V47.65H40V46.65Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M41,46.667H40V47.667H41V46.667Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M42,46.683H41V47.683H42V46.683Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M43,46.7H42V47.7H43V46.7Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M44,46.717H43V47.717H44V46.717Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M45,46.733H44V47.733H45V46.733Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M46,46.75H45V47.75H46V46.75Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M47,46.767H46V47.767H47V46.767Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M48,46.783H47V47.783H48V46.783Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M49,46.8H48V47.8H49V46.8Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M50,46.817H49V47.817H50V46.817Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M51,46.833H50V47.833H51V46.833Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M52,46.85H51V47.85H52V46.85Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M53,46.867H52V47.867H53V46.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M8,47.117H7V48.117H8V47.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,47.133H8V48.133H9V47.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,47.15H9V48.15H10V47.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,47.167H10V48.167H11V47.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,47.183H11V48.183H12V47.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,47.2H12V48.2H13V47.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,47.217H13V48.217H14V47.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,47.233H14V48.233H15V47.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,47.25H15V48.25H16V47.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,47.267H16V48.267H17V47.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,47.283H17V48.283H18V47.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M23,47.367H22V48.367H23V47.367Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.25098"/>
+      <path
+          android:pathData="M24,47.383H23V48.383H24V47.383Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M25,47.4H24V48.4H25V47.4Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M26,47.417H25V48.417H26V47.417Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M27,47.433H26V48.433H27V47.433Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M28,47.45H27V48.45H28V47.45Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M29,47.467H28V48.467H29V47.467Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M30,47.483H29V48.483H30V47.483Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M31,47.5H30V48.5H31V47.5Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M32,47.517H31V48.517H32V47.517Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M33,47.533H32V48.533H33V47.533Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M34,47.55H33V48.55H34V47.55Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M35,47.567H34V48.567H35V47.567Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M36,47.583H35V48.583H36V47.583Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M37,47.6H36V48.6H37V47.6Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M38,47.617H37V48.617H38V47.617Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M39,47.633H38V48.633H39V47.633Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M40,47.65H39V48.65H40V47.65Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M41,47.667H40V48.667H41V47.667Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M42,47.683H41V48.683H42V47.683Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M43,47.7H42V48.7H43V47.7Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M44,47.717H43V48.717H44V47.717Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M45,47.733H44V48.733H45V47.733Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M46,47.75H45V48.75H46V47.75Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M47,47.767H46V48.767H47V47.767Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M48,47.783H47V48.783H48V47.783Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M49,47.8H48V48.8H49V47.8Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M50,47.817H49V48.817H50V47.817Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M51,47.833H50V48.833H51V47.833Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M52,47.85H51V48.85H52V47.85Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M53,47.867H52V48.867H53V47.867Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.12549"/>
+      <path
+          android:pathData="M8,48.117H7V49.117H8V48.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,48.133H8V49.133H9V48.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,48.15H9V49.15H10V48.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,48.167H10V49.167H11V48.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,48.183H11V49.183H12V48.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,48.2H12V49.2H13V48.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,48.217H13V49.217H14V48.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,48.233H14V49.233H15V48.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,48.25H15V49.25H16V48.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,48.267H16V49.267H17V48.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,48.283H17V49.283H18V48.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,49.117H7V50.117H8V49.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,49.133H8V50.133H9V49.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,49.15H9V50.15H10V49.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,49.167H10V50.167H11V49.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,49.183H11V50.183H12V49.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,49.2H12V50.2H13V49.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,49.217H13V50.217H14V49.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,49.233H14V50.233H15V49.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,49.25H15V50.25H16V49.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,49.267H16V50.267H17V49.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,49.283H17V50.283H18V49.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,50.117H7V51.117H8V50.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,50.133H8V51.133H9V50.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,50.15H9V51.15H10V50.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,50.167H10V51.167H11V50.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,50.183H11V51.183H12V50.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,50.2H12V51.2H13V50.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,50.217H13V51.217H14V50.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,50.233H14V51.233H15V50.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,50.25H15V51.25H16V50.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,50.267H16V51.267H17V50.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,50.283H17V51.283H18V50.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,51.117H7V52.117H8V51.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,51.133H8V52.133H9V51.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,51.15H9V52.15H10V51.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,51.167H10V52.167H11V51.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,51.183H11V52.183H12V51.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,51.2H12V52.2H13V51.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,51.217H13V52.217H14V51.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,51.233H14V52.233H15V51.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,51.25H15V52.25H16V51.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,51.267H16V52.267H17V51.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,51.283H17V52.283H18V51.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,52.117H7V53.117H8V52.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,52.133H8V53.133H9V52.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,52.15H9V53.15H10V52.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,52.167H10V53.167H11V52.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,52.183H11V53.183H12V52.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,52.2H12V53.2H13V52.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,52.217H13V53.217H14V52.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,52.233H14V53.233H15V52.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,52.25H15V53.25H16V52.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,52.267H16V53.267H17V52.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,52.283H17V53.283H18V52.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,53.117H7V54.117H8V53.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,53.133H8V54.133H9V53.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,53.15H9V54.15H10V53.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,53.167H10V54.167H11V53.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,53.183H11V54.183H12V53.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,53.2H12V54.2H13V53.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,53.217H13V54.217H14V53.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,53.233H14V54.233H15V53.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,53.25H15V54.25H16V53.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,53.267H16V54.267H17V53.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,53.283H17V54.283H18V53.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M8,54.117H7V55.117H8V54.117Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+      <path
+          android:pathData="M9,54.133H8V55.133H9V54.133Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M10,54.15H9V55.15H10V54.15Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M11,54.167H10V55.167H11V54.167Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M12,54.183H11V55.183H12V54.183Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M13,54.2H12V55.2H13V54.2Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M14,54.217H13V55.217H14V54.217Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M15,54.233H14V55.233H15V54.233Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M16,54.25H15V55.25H16V54.25Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M17,54.267H16V55.267H17V54.267Z"
+          android:fillColor="#ffffff"/>
+      <path
+          android:pathData="M18,54.283H17V55.283H18V54.283Z"
+          android:fillColor="#ffffff"
+          android:fillAlpha="0.501961"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__child_registration.xml b/app/src/main/res/drawable/ic__child_registration.xml
new file mode 100644
index 000000000..40bae720d
--- /dev/null
+++ b/app/src/main/res/drawable/ic__child_registration.xml
@@ -0,0 +1,14 @@
+<vector android:alpha="0.96" android:height="24dp"
+    android:viewportHeight="40" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M11.66,0.05C10.917,0.236 10.263,0.785 9.932,1.471C9.762,1.81 9.73,2.036 9.698,2.859L9.666,3.844L8.148,3.868C6.485,3.893 6.412,3.917 6.017,4.45C5.847,4.668 5.847,4.692 5.823,17.035L5.807,29.403L3.191,32.027C0.349,34.884 0.236,35.03 0.051,36.095C-0.458,39.058 2.965,41.125 5.403,39.333C5.629,39.163 5.823,39.042 5.831,39.058C5.847,39.074 5.904,39.195 5.968,39.325C6.033,39.454 6.21,39.647 6.364,39.769L6.638,39.978H19.377H32.116L32.334,39.809C32.851,39.429 32.891,39.308 32.931,37.936L32.972,36.677L35.757,36.168C37.283,35.894 38.647,35.619 38.784,35.563C39.398,35.304 39.931,34.586 40.003,33.9C40.044,33.528 36.427,2.423 36.241,1.543C36.08,0.76 35.394,0.115 34.619,0.01C34.377,-0.023 31.454,0.349 25.424,1.18C20.564,1.85 16.487,2.415 16.374,2.431C16.18,2.472 16.148,2.44 16.1,2.173C15.954,1.35 15.422,0.639 14.663,0.244C14.267,0.034 14.17,0.018 13.072,0.002C12.427,-0.007 11.797,0.018 11.66,0.05ZM14.251,1.479C14.735,1.834 14.808,2.02 14.832,2.972L14.865,3.852H14.211H13.557V3.206V2.561H12.911H12.265V3.206V3.852H11.619H10.973V3.093C10.973,2.27 11.046,1.987 11.321,1.681C11.651,1.326 11.902,1.269 13.008,1.285C13.896,1.309 14.057,1.334 14.251,1.479ZM34.732,1.43C34.837,1.519 34.95,1.673 34.974,1.77C34.998,1.874 35.862,9.108 36.887,17.851C38.647,32.753 38.752,33.762 38.639,34.005C38.575,34.142 38.413,34.303 38.284,34.352C38.074,34.44 33.279,35.336 33.036,35.336C32.956,35.336 32.931,32.414 32.915,20.006L32.891,4.668L32.722,4.45C32.633,4.329 32.455,4.151 32.334,4.062C32.116,3.893 32.035,3.893 24.108,3.852C19.7,3.828 16.14,3.796 16.18,3.788C16.35,3.739 34.037,1.285 34.272,1.277C34.409,1.269 34.619,1.342 34.732,1.43ZM9.682,6.242C9.682,6.872 9.722,7.485 9.779,7.679C9.908,8.123 10.578,8.793 11.022,8.922C11.781,9.148 12.386,8.987 12.951,8.413C13.484,7.889 13.557,7.614 13.557,6.242V5.144H14.203H14.848V6.436V7.727H15.494H16.14V6.436V5.144H23.89H31.64V21.935V38.727H19.369H7.098V38.227V37.718L10.933,33.883L14.768,30.049L15.68,27.304L16.6,24.559L23.47,24.535L30.348,24.519V23.873V23.227H23.18H16.019L12.992,24.236L9.964,25.245L8.535,26.674L7.098,28.111V16.624V5.144H8.39H9.682V6.242ZM12.265,6.234C12.265,7.291 12.257,7.34 12.063,7.525C11.942,7.655 11.773,7.727 11.619,7.727C11.466,7.727 11.296,7.655 11.175,7.525C10.981,7.34 10.973,7.291 10.973,6.234V5.144H11.619H12.265V6.234ZM15.066,25.019C15.05,25.076 14.961,25.334 14.881,25.593L14.735,26.053L14.348,25.673L13.952,25.286L14.461,25.108C15.066,24.898 15.123,24.89 15.066,25.019ZM14.097,27.958L13.928,28.483L12.733,27.288L11.538,26.093L12.039,25.924L12.548,25.746L13.403,26.594L14.259,27.441L14.097,27.958ZM11.821,28.232L13.274,29.685L9.859,33.1L6.453,36.507L4.983,35.03L3.506,33.561L6.897,30.17C8.761,28.305 10.303,26.779 10.328,26.779C10.352,26.779 11.022,27.433 11.821,28.232ZM4.071,35.982L5.524,37.435L5.08,37.888C4.442,38.533 4.128,38.687 3.385,38.687C2.925,38.687 2.707,38.646 2.456,38.509C2.077,38.307 1.69,37.912 1.48,37.516C1.27,37.129 1.27,36.136 1.48,35.74C1.617,35.482 2.473,34.529 2.578,34.529C2.602,34.529 3.272,35.183 4.071,35.982Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,10.957V11.602H12.265H16.14V10.957V10.311H12.265H8.39V10.957Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,13.54V14.186H12.265H16.14V13.54V12.894H12.265H8.39V13.54Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,16.123V16.769H12.265H16.14V16.123V15.477H12.265H8.39V16.123Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,18.706V19.352H12.265H16.14V18.706V18.061H12.265H8.39V18.706Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,21.29V21.935H19.369H30.348V21.29V20.644H19.369H8.39V21.29Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M21.307,34.852V37.436H25.827H30.348V34.852V32.269H25.827H21.307V34.852ZM29.057,34.852V36.144H25.827H22.598V34.852V33.561H25.827H29.057V34.852Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,34.206V34.852H17.432H20.015V34.206V33.56H17.432H14.849V34.206Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,36.79V37.436H17.432H20.015V36.79V36.144H17.432H14.849V36.79Z"/>
+    <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M25.895,10.128C25.895,10.034 26.002,9.972 26.095,10.013L27.158,10.474L26.095,10.935C26.002,10.975 25.895,10.913 25.895,10.819V10.128ZM27.158,10.474L28.22,10.013C28.313,9.972 28.421,10.034 28.421,10.128V10.819C28.421,10.913 28.313,10.975 28.22,10.935L27.158,10.474ZM27.158,11.658C26.722,11.658 26.368,12.011 26.368,12.447C26.368,12.883 26.722,13.237 27.158,13.237C27.594,13.237 27.947,12.883 27.947,12.447C27.947,12.011 27.594,11.658 27.158,11.658ZM25.737,12.447C25.737,11.663 26.373,11.026 27.158,11.026C27.943,11.026 28.579,11.663 28.579,12.447C28.579,12.997 28.267,13.474 27.809,13.71H27.947C28.211,13.71 28.458,13.842 28.604,14.062L29.867,15.957C30.109,16.319 30.011,16.81 29.648,17.052C29.463,17.175 29.243,17.21 29.041,17.166L29.335,17.753L29.563,18.21H29.053H28.737V18.921C28.737,19.357 28.383,19.71 27.947,19.71C27.511,19.71 27.158,19.357 27.158,18.921C27.158,19.357 26.804,19.71 26.368,19.71C25.932,19.71 25.579,19.357 25.579,18.921V18.21H25.263H24.752L24.981,17.753L25.274,17.166C25.072,17.21 24.853,17.175 24.667,17.052C24.305,16.81 24.206,16.319 24.448,15.957L25.712,14.062C25.858,13.842 26.104,13.71 26.368,13.71H26.506C26.049,13.474 25.737,12.997 25.737,12.447ZM25.774,17.579H25.895H26.211V17.895V18.921C26.211,19.008 26.281,19.079 26.368,19.079C26.456,19.079 26.526,19.008 26.526,18.921V17.895V17.579H26.842H27.474H27.789V17.895V18.921C27.789,19.008 27.86,19.079 27.947,19.079C28.035,19.079 28.105,19.008 28.105,18.921V17.895V17.579H28.421H28.542L28.139,16.773L28.105,16.706V16.632V16.064V15.021L28.684,15.889L29.079,16.482C29.127,16.555 29.226,16.574 29.298,16.526C29.371,16.478 29.39,16.38 29.342,16.307L28.079,14.412C28.049,14.368 28,14.342 27.947,14.342H26.368C26.316,14.342 26.266,14.368 26.237,14.412L24.974,16.307C24.926,16.38 24.945,16.478 25.018,16.526C25.09,16.574 25.188,16.555 25.237,16.482L25.632,15.889L26.211,15.021V16.064V16.632V16.706L26.177,16.773L25.774,17.579ZM20.211,12.456C20.211,12.02 20.564,11.667 21,11.667C21.436,11.667 21.789,12.02 21.789,12.456C21.789,12.892 21.436,13.246 21,13.246C20.564,13.246 20.211,12.892 20.211,12.456ZM21,11.035C20.215,11.035 19.579,11.671 19.579,12.456C19.579,13.006 19.891,13.483 20.348,13.719H20.053C19.789,13.719 19.542,13.851 19.396,14.071L18.133,15.966C17.891,16.328 17.989,16.819 18.352,17.06C18.638,17.251 19.003,17.23 19.263,17.035V18.93C19.263,19.366 19.617,19.719 20.053,19.719C20.489,19.719 20.842,19.366 20.842,18.93V17.667H21.158V18.93C21.158,19.366 21.511,19.719 21.947,19.719C22.383,19.719 22.737,19.366 22.737,18.93V17.035C22.997,17.23 23.362,17.251 23.648,17.06C24.011,16.819 24.109,16.328 23.867,15.966L22.604,14.071C22.458,13.851 22.211,13.719 21.947,13.719H21.652C22.109,13.483 22.421,13.006 22.421,12.456C22.421,11.671 21.785,11.035 21,11.035ZM19.921,14.421C19.951,14.377 20,14.351 20.053,14.351H21.947C22,14.351 22.049,14.377 22.079,14.421L23.342,16.316C23.39,16.389 23.371,16.487 23.298,16.535C23.226,16.583 23.128,16.564 23.079,16.491L22.684,15.898L22.105,15.03V16.073V18.93C22.105,19.017 22.035,19.088 21.947,19.088C21.86,19.088 21.789,19.017 21.789,18.93V17.351V17.035H21.474H20.526H20.211V17.351V18.93C20.211,19.017 20.14,19.088 20.053,19.088C19.965,19.088 19.895,19.017 19.895,18.93V16.073V15.03L19.316,15.898L18.921,16.491C18.872,16.564 18.774,16.583 18.702,16.535C18.629,16.487 18.61,16.389 18.658,16.316L19.921,14.421Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic__delivery_outcome.xml b/app/src/main/res/drawable/ic__delivery_outcome.xml
new file mode 100644
index 000000000..1a52288d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic__delivery_outcome.xml
@@ -0,0 +1,7 @@
+<vector android:alpha="0.96" android:height="17.4dp"
+    android:viewportHeight="29" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M24.976,22.726C25.044,23.054 25.037,23.399 24.941,23.73C24.858,24.039 24.69,24.331 24.464,24.572C23.692,25.355 22.43,25.372 21.638,24.611L17.725,20.794L17.102,21.497L21.021,25.316C22.088,26.353 24.025,26.46 25.078,25.395C25.44,25.022 25.753,24.237 25.861,23.748H33.841C34.953,23.748 36.053,24.785 36.053,25.892C36.053,27.007 35.371,28.067 33.841,28.067H20.105C19.388,28.047 18.58,27.767 17.959,27.238L9.181,20.615L0,20.587V13.378L14.226,13.405C14.226,13.405 15.275,13.428 15.999,13.847C16.667,14.237 17.258,14.806 17.258,14.806L24.419,21.758C24.691,22.021 24.882,22.354 24.976,22.726Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M16.714,9.693C19.11,9.693 21.052,7.75 21.052,5.354C21.052,2.958 19.11,1.015 16.714,1.015C14.318,1.015 12.375,2.958 12.375,5.354C12.375,7.75 14.318,9.693 16.714,9.693Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M38.718,11.551C36.547,10.972 34.385,10.391 32.22,9.814C31.771,9.689 31.248,9.64 30.905,9.748C30.23,9.961 29.736,10.495 29.549,11.426C29.424,12.028 29.301,12.631 29.183,13.236C27.898,11.951 26.614,10.661 25.33,9.378C25.33,9.378 25.329,9.377 25.324,9.374C26.038,8.662 27.918,6.838 28.629,6.125C29.489,5.27 29.193,4.169 28.487,3.55C28.087,3.154 26.082,1.164 25.438,0.525C23.803,-1.104 21.286,1.428 22.919,3.056C23.539,3.674 24.162,4.292 24.784,4.911C23.232,6.445 21.33,8.314 20.1,9.541C19.897,9.743 19.756,9.964 19.67,10.185C18.942,11.541 19.137,13.295 20.268,14.432C22.316,16.482 24.362,18.533 26.415,20.586C27.791,21.963 30.087,21.968 31.468,20.588C32.406,19.653 32.55,18.145 32.571,18.041C32.854,16.638 33.137,15.235 33.428,13.833C34.884,14.225 36.347,14.618 37.808,15.007C40.029,15.601 40.946,12.149 38.718,11.551Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic__eligible_couple.xml b/app/src/main/res/drawable/ic__eligible_couple.xml
new file mode 100644
index 000000000..e71dcf928
--- /dev/null
+++ b/app/src/main/res/drawable/ic__eligible_couple.xml
@@ -0,0 +1,5673 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <group>
+        <clip-path android:pathData="M0,0h64v64h-64z" />
+        <group>
+            <clip-path android:pathData="M0,0h64v64h-64z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M27,5.406H26V6.406H27V5.406Z" />
+            <path
+                android:fillAlpha="0.247059"
+                android:fillColor="#ffffff"
+                android:pathData="M28,5.422H27V6.422H28V5.422Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M29,5.438H28V6.438H29V5.438Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M30,5.453H29V6.453H30V5.453Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M31,5.469H30V6.469H31V5.469Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M32,5.484H31V6.484H32V5.484Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M33,5.5H32V6.5H33V5.5Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M34,5.516H33V6.516H34V5.516Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M35,5.531H34V6.531H35V5.531Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M36,5.547H35V6.547H36V5.547Z" />
+            <path
+                android:fillAlpha="0.247059"
+                android:fillColor="#ffffff"
+                android:pathData="M37,5.563H36V6.563H37V5.563Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M38,5.578H37V6.578H38V5.578Z" />
+            <path
+                android:fillAlpha="0.309804"
+                android:fillColor="#ffffff"
+                android:pathData="M24,6.359H23V7.359H24V6.359Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M25,6.375H24V7.375H25V6.375Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M26,6.391H25V7.391H26V6.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,6.406H26V7.406H27V6.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,6.422H27V7.422H28V6.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,6.438H28V7.438H29V6.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,6.453H29V7.453H30V6.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,6.469H30V7.469H31V6.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,6.484H31V7.484H32V6.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,6.5H32V7.5H33V6.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,6.516H33V7.516H34V6.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,6.531H34V7.531H35V6.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,6.547H35V7.547H36V6.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,6.563H36V7.563H37V6.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,6.578H37V7.578H38V6.578Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M39,6.594H38V7.594H39V6.594Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M40,6.609H39V7.609H40V6.609Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M41,6.625H40V7.625H41V6.625Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M21,7.313H20V8.313H21V7.313Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M22,7.328H21V8.328H22V7.328Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M23,7.344H22V8.344H23V7.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,7.359H23V8.359H24V7.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,7.375H24V8.375H25V7.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,7.391H25V8.391H26V7.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,7.406H26V8.406H27V7.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,7.422H27V8.422H28V7.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,7.438H28V8.438H29V7.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,7.453H29V8.453H30V7.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,7.469H30V8.469H31V7.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,7.484H31V8.484H32V7.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,7.5H32V8.5H33V7.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,7.516H33V8.516H34V7.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,7.531H34V8.531H35V7.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,7.547H35V8.547H36V7.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,7.563H36V8.563H37V7.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,7.578H37V8.578H38V7.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,7.594H38V8.594H39V7.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,7.609H39V8.609H40V7.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,7.625H40V8.625H41V7.625Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M42,7.641H41V8.641H42V7.641Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M43,7.656H42V8.656H43V7.656Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M44,7.672H43V8.672H44V7.672Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M19,8.281H18V9.281H19V8.281Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M20,8.297H19V9.297H20V8.297Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M21,8.313H20V9.313H21V8.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,8.328H21V9.328H22V8.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,8.344H22V9.344H23V8.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,8.359H23V9.359H24V8.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,8.375H24V9.375H25V8.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,8.391H25V9.391H26V8.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,8.406H26V9.406H27V8.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,8.422H27V9.422H28V8.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,8.438H28V9.438H29V8.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,8.453H29V9.453H30V8.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,8.469H30V9.469H31V8.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,8.484H31V9.484H32V8.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,8.5H32V9.5H33V8.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,8.516H33V9.516H34V8.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,8.531H34V9.531H35V8.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,8.547H35V9.547H36V8.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,8.563H36V9.563H37V8.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,8.578H37V9.578H38V8.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,8.594H38V9.594H39V8.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,8.609H39V9.609H40V8.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,8.625H40V9.625H41V8.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,8.641H41V9.641H42V8.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,8.656H42V9.656H43V8.656Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M44,8.672H43V9.672H44V8.672Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M45,8.688H44V9.688H45V8.688Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M46,8.703H45V9.703H46V8.703Z" />
+            <path
+                android:fillAlpha="0.372549"
+                android:fillColor="#ffffff"
+                android:pathData="M18,9.266H17V10.266H18V9.266Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M19,9.281H18V10.281H19V9.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,9.297H19V10.297H20V9.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,9.313H20V10.313H21V9.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,9.328H21V10.328H22V9.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,9.344H22V10.344H23V9.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,9.359H23V10.359H24V9.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,9.375H24V10.375H25V9.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,9.391H25V10.391H26V9.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,9.406H26V10.406H27V9.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,9.422H27V10.422H28V9.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,9.438H28V10.438H29V9.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,9.453H29V10.453H30V9.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,9.469H30V10.469H31V9.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,9.484H31V10.484H32V9.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,9.5H32V10.5H33V9.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,9.516H33V10.516H34V9.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,9.531H34V10.531H35V9.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,9.547H35V10.547H36V9.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,9.563H36V10.563H37V9.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,9.578H37V10.578H38V9.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,9.594H38V10.594H39V9.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,9.609H39V10.609H40V9.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,9.625H40V10.625H41V9.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,9.641H41V10.641H42V9.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,9.656H42V10.656H43V9.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,9.672H43V10.672H44V9.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,9.688H44V10.688H45V9.688Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M46,9.703H45V10.703H46V9.703Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M47,9.719H46V10.719H47V9.719Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M16,10.234H15V11.234H16V10.234Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M17,10.25H16V11.25H17V10.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,10.266H17V11.266H18V10.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,10.281H18V11.281H19V10.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,10.297H19V11.297H20V10.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,10.313H20V11.313H21V10.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,10.328H21V11.328H22V10.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,10.344H22V11.344H23V10.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,10.359H23V11.359H24V10.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,10.375H24V11.375H25V10.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,10.391H25V11.391H26V10.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,10.406H26V11.406H27V10.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,10.422H27V11.422H28V10.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,10.438H28V11.438H29V10.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,10.453H29V11.453H30V10.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,10.469H30V11.469H31V10.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,10.484H31V11.484H32V10.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,10.5H32V11.5H33V10.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,10.516H33V11.516H34V10.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,10.531H34V11.531H35V10.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,10.547H35V11.547H36V10.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,10.563H36V11.563H37V10.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,10.578H37V11.578H38V10.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,10.594H38V11.594H39V10.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,10.609H39V11.609H40V10.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,10.625H40V11.625H41V10.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,10.641H41V11.641H42V10.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,10.656H42V11.656H43V10.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,10.672H43V11.672H44V10.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,10.688H44V11.688H45V10.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,10.703H45V11.703H46V10.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,10.719H46V11.719H47V10.719Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M48,10.734H47V11.734H48V10.734Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M49,10.75H48V11.75H49V10.75Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M15,11.219H14V12.219H15V11.219Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M16,11.234H15V12.234H16V11.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,11.25H16V12.25H17V11.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,11.266H17V12.266H18V11.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,11.281H18V12.281H19V11.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,11.297H19V12.297H20V11.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,11.313H20V12.313H21V11.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,11.328H21V12.328H22V11.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,11.344H22V12.344H23V11.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,11.359H23V12.359H24V11.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,11.375H24V12.375H25V11.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,11.391H25V12.391H26V11.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,11.406H26V12.406H27V11.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,11.422H27V12.422H28V11.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,11.438H28V12.438H29V11.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,11.453H29V12.453H30V11.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,11.469H30V12.469H31V11.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,11.484H31V12.484H32V11.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,11.5H32V12.5H33V11.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,11.516H33V12.516H34V11.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,11.531H34V12.531H35V11.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,11.547H35V12.547H36V11.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,11.563H36V12.563H37V11.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,11.578H37V12.578H38V11.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,11.594H38V12.594H39V11.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,11.609H39V12.609H40V11.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,11.625H40V12.625H41V11.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,11.641H41V12.641H42V11.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,11.656H42V12.656H43V11.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,11.672H43V12.672H44V11.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,11.688H44V12.688H45V11.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,11.703H45V12.703H46V11.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,11.719H46V12.719H47V11.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,11.734H47V12.734H48V11.734Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M49,11.75H48V12.75H49V11.75Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M50,11.766H49V12.766H50V11.766Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M14,12.203H13V13.203H14V12.203Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M15,12.219H14V13.219H15V12.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,12.234H15V13.234H16V12.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,12.25H16V13.25H17V12.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,12.266H17V13.266H18V12.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,12.281H18V13.281H19V12.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,12.297H19V13.297H20V12.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,12.313H20V13.313H21V12.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,12.328H21V13.328H22V12.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,12.344H22V13.344H23V12.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,12.359H23V13.359H24V12.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,12.375H24V13.375H25V12.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,12.391H25V13.391H26V12.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,12.406H26V13.406H27V12.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,12.422H27V13.422H28V12.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,12.438H28V13.438H29V12.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,12.453H29V13.453H30V12.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,12.469H30V13.469H31V12.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,12.484H31V13.484H32V12.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,12.5H32V13.5H33V12.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,12.516H33V13.516H34V12.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,12.531H34V13.531H35V12.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,12.547H35V13.547H36V12.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,12.563H36V13.563H37V12.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,12.578H37V13.578H38V12.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,12.594H38V13.594H39V12.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,12.609H39V13.609H40V12.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,12.625H40V13.625H41V12.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,12.641H41V13.641H42V12.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,12.656H42V13.656H43V12.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,12.672H43V13.672H44V12.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,12.688H44V13.688H45V12.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,12.703H45V13.703H46V12.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,12.719H46V13.719H47V12.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,12.734H47V13.734H48V12.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,12.75H48V13.75H49V12.75Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M50,12.766H49V13.766H50V12.766Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M51,12.781H50V13.781H51V12.781Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M13,13.188H12V14.188H13V13.188Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M14,13.203H13V14.203H14V13.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,13.219H14V14.219H15V13.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,13.234H15V14.234H16V13.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,13.25H16V14.25H17V13.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,13.266H17V14.266H18V13.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,13.281H18V14.281H19V13.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,13.297H19V14.297H20V13.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,13.313H20V14.313H21V13.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,13.328H21V14.328H22V13.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,13.344H22V14.344H23V13.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,13.359H23V14.359H24V13.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,13.375H24V14.375H25V13.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,13.391H25V14.391H26V13.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,13.406H26V14.406H27V13.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,13.422H27V14.422H28V13.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,13.438H28V14.438H29V13.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,13.453H29V14.453H30V13.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,13.469H30V14.469H31V13.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,13.484H31V14.484H32V13.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,13.5H32V14.5H33V13.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,13.516H33V14.516H34V13.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,13.531H34V14.531H35V13.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,13.547H35V14.547H36V13.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,13.563H36V14.563H37V13.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,13.578H37V14.578H38V13.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,13.594H38V14.594H39V13.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,13.609H39V14.609H40V13.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,13.625H40V14.625H41V13.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,13.641H41V14.641H42V13.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,13.656H42V14.656H43V13.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,13.672H43V14.672H44V13.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,13.688H44V14.688H45V13.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,13.703H45V14.703H46V13.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,13.719H46V14.719H47V13.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,13.734H47V14.734H48V13.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,13.75H48V14.75H49V13.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,13.766H49V14.766H50V13.766Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M51,13.781H50V14.781H51V13.781Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M52,13.797H51V14.797H52V13.797Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M12,14.172H11V15.172H12V14.172Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M13,14.188H12V15.188H13V14.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,14.203H13V15.203H14V14.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,14.219H14V15.219H15V14.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,14.234H15V15.234H16V14.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,14.25H16V15.25H17V14.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,14.266H17V15.266H18V14.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,14.281H18V15.281H19V14.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,14.297H19V15.297H20V14.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,14.313H20V15.313H21V14.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,14.328H21V15.328H22V14.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,14.344H22V15.344H23V14.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,14.359H23V15.359H24V14.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,14.375H24V15.375H25V14.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,14.391H25V15.391H26V14.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,14.406H26V15.406H27V14.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,14.422H27V15.422H28V14.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,14.438H28V15.438H29V14.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,14.453H29V15.453H30V14.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,14.469H30V15.469H31V14.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,14.484H31V15.484H32V14.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,14.5H32V15.5H33V14.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,14.516H33V15.516H34V14.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,14.531H34V15.531H35V14.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,14.547H35V15.547H36V14.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,14.563H36V15.563H37V14.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,14.578H37V15.578H38V14.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,14.594H38V15.594H39V14.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,14.609H39V15.609H40V14.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,14.625H40V15.625H41V14.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,14.641H41V15.641H42V14.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,14.656H42V15.656H43V14.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,14.672H43V15.672H44V14.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,14.688H44V15.688H45V14.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,14.703H45V15.703H46V14.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,14.719H46V15.719H47V14.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,14.734H47V15.734H48V14.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,14.75H48V15.75H49V14.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,14.766H49V15.766H50V14.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,14.781H50V15.781H51V14.781Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M52,14.797H51V15.797H52V14.797Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M53,14.813H52V15.813H53V14.813Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M11,15.156H10V16.156H11V15.156Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M12,15.172H11V16.172H12V15.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,15.188H12V16.188H13V15.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,15.203H13V16.203H14V15.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,15.219H14V16.219H15V15.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,15.234H15V16.234H16V15.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,15.25H16V16.25H17V15.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,15.266H17V16.266H18V15.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,15.281H18V16.281H19V15.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,15.297H19V16.297H20V15.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,15.313H20V16.313H21V15.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,15.328H21V16.328H22V15.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,15.344H22V16.344H23V15.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,15.359H23V16.359H24V15.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,15.375H24V16.375H25V15.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,15.391H25V16.391H26V15.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,15.406H26V16.406H27V15.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,15.422H27V16.422H28V15.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,15.438H28V16.438H29V15.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,15.453H29V16.453H30V15.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,15.469H30V16.469H31V15.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,15.484H31V16.484H32V15.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,15.5H32V16.5H33V15.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,15.516H33V16.516H34V15.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,15.531H34V16.531H35V15.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,15.547H35V16.547H36V15.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,15.563H36V16.563H37V15.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,15.578H37V16.578H38V15.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,15.594H38V16.594H39V15.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,15.609H39V16.609H40V15.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,15.625H40V16.625H41V15.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,15.641H41V16.641H42V15.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,15.656H42V16.656H43V15.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,15.672H43V16.672H44V15.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,15.688H44V16.688H45V15.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,15.703H45V16.703H46V15.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,15.719H46V16.719H47V15.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,15.734H47V16.734H48V15.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,15.75H48V16.75H49V15.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,15.766H49V16.766H50V15.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,15.781H50V16.781H51V15.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,15.797H51V16.797H52V15.797Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M53,15.813H52V16.813H53V15.813Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M54,15.828H53V16.828H54V15.828Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M11,16.156H10V17.156H11V16.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,16.172H11V17.172H12V16.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,16.188H12V17.188H13V16.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,16.203H13V17.203H14V16.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,16.219H14V17.219H15V16.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,16.234H15V17.234H16V16.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,16.25H16V17.25H17V16.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,16.266H17V17.266H18V16.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,16.281H18V17.281H19V16.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,16.297H19V17.297H20V16.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,16.313H20V17.313H21V16.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,16.328H21V17.328H22V16.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,16.344H22V17.344H23V16.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,16.359H23V17.359H24V16.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,16.375H24V17.375H25V16.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,16.391H25V17.391H26V16.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,16.406H26V17.406H27V16.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,16.422H27V17.422H28V16.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,16.438H28V17.438H29V16.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,16.453H29V17.453H30V16.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,16.469H30V17.469H31V16.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,16.484H31V17.484H32V16.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,16.5H32V17.5H33V16.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,16.516H33V17.516H34V16.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,16.531H34V17.531H35V16.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,16.547H35V17.547H36V16.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,16.563H36V17.563H37V16.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,16.578H37V17.578H38V16.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,16.594H38V17.594H39V16.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,16.609H39V17.609H40V16.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,16.625H40V17.625H41V16.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,16.641H41V17.641H42V16.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,16.656H42V17.656H43V16.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,16.672H43V17.672H44V16.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,16.688H44V17.688H45V16.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,16.703H45V17.703H46V16.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,16.719H46V17.719H47V16.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,16.734H47V17.734H48V16.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,16.75H48V17.75H49V16.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,16.766H49V17.766H50V16.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,16.781H50V17.781H51V16.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,16.797H51V17.797H52V16.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,16.813H52V17.813H53V16.813Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M54,16.828H53V17.828H54V16.828Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M10,17.141H9V18.141H10V17.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,17.156H10V18.156H11V17.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,17.172H11V18.172H12V17.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,17.188H12V18.188H13V17.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,17.203H13V18.203H14V17.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,17.219H14V18.219H15V17.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,17.234H15V18.234H16V17.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,17.25H16V18.25H17V17.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,17.266H17V18.266H18V17.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,17.281H18V18.281H19V17.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,17.297H19V18.297H20V17.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,17.313H20V18.313H21V17.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,17.328H21V18.328H22V17.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,17.344H22V18.344H23V17.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,17.359H23V18.359H24V17.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,17.375H24V18.375H25V17.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,17.391H25V18.391H26V17.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,17.406H26V18.406H27V17.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,17.422H27V18.422H28V17.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,17.438H28V18.438H29V17.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,17.453H29V18.453H30V17.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,17.469H30V18.469H31V17.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,17.484H31V18.484H32V17.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,17.5H32V18.5H33V17.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,17.516H33V18.516H34V17.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,17.531H34V18.531H35V17.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,17.547H35V18.547H36V17.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,17.563H36V18.563H37V17.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,17.578H37V18.578H38V17.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,17.594H38V18.594H39V17.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,17.609H39V18.609H40V17.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,17.625H40V18.625H41V17.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,17.641H41V18.641H42V17.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,17.656H42V18.656H43V17.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,17.672H43V18.672H44V17.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,17.688H44V18.688H45V17.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,17.703H45V18.703H46V17.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,17.719H46V18.719H47V17.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,17.734H47V18.734H48V17.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,17.75H48V18.75H49V17.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,17.766H49V18.766H50V17.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,17.781H50V18.781H51V17.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,17.797H51V18.797H52V17.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,17.813H52V18.813H53V17.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,17.828H53V18.828H54V17.828Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M55,17.844H54V18.844H55V17.844Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M9,18.125H8V19.125H9V18.125Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M10,18.141H9V19.141H10V18.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,18.156H10V19.156H11V18.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,18.172H11V19.172H12V18.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,18.188H12V19.188H13V18.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,18.203H13V19.203H14V18.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,18.219H14V19.219H15V18.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,18.234H15V19.234H16V18.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,18.25H16V19.25H17V18.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,18.266H17V19.266H18V18.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,18.281H18V19.281H19V18.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,18.297H19V19.297H20V18.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,18.313H20V19.313H21V18.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,18.328H21V19.328H22V18.328Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M23,18.344H22V19.344H23V18.344Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M24,18.359H23V19.359H24V18.359Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M25,18.375H24V19.375H25V18.375Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M27,18.406H26V19.406H27V18.406Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M28,18.422H27V19.422H28V18.422Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,18.438H28V19.438H29V18.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,18.453H29V19.453H30V18.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,18.469H30V19.469H31V18.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,18.484H31V19.484H32V18.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,18.5H32V19.5H33V18.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,18.516H33V19.516H34V18.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,18.531H34V19.531H35V18.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,18.547H35V19.547H36V18.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,18.563H36V19.563H37V18.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,18.578H37V19.578H38V18.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,18.594H38V19.594H39V18.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,18.609H39V19.609H40V18.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,18.625H40V19.625H41V18.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,18.641H41V19.641H42V18.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,18.656H42V19.656H43V18.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,18.672H43V19.672H44V18.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,18.688H44V19.688H45V18.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,18.703H45V19.703H46V18.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,18.719H46V19.719H47V18.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,18.734H47V19.734H48V18.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,18.75H48V19.75H49V18.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,18.766H49V19.766H50V18.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,18.781H50V19.781H51V18.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,18.797H51V19.797H52V18.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,18.813H52V19.813H53V18.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,18.828H53V19.828H54V18.828Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M55,18.844H54V19.844H55V18.844Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M56,18.859H55V19.859H56V18.859Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M9,19.125H8V20.125H9V19.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,19.141H9V20.141H10V19.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,19.156H10V20.156H11V19.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,19.172H11V20.172H12V19.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,19.188H12V20.188H13V19.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,19.203H13V20.203H14V19.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,19.219H14V20.219H15V19.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,19.234H15V20.234H16V19.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,19.25H16V20.25H17V19.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,19.266H17V20.266H18V19.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,19.281H18V20.281H19V19.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,19.297H19V20.297H20V19.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,19.313H20V20.313H21V19.313Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,19.328H21V20.328H22V19.328Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M30,19.453H29V20.453H30V19.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,19.469H30V20.469H31V19.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,19.484H31V20.484H32V19.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,19.5H32V20.5H33V19.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,19.516H33V20.516H34V19.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,19.531H34V20.531H35V19.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,19.547H35V20.547H36V19.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,19.563H36V20.563H37V19.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,19.578H37V20.578H38V19.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,19.594H38V20.594H39V19.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,19.609H39V20.609H40V19.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,19.625H40V20.625H41V19.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,19.641H41V20.641H42V19.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,19.656H42V20.656H43V19.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,19.672H43V20.672H44V19.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,19.688H44V20.688H45V19.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,19.703H45V20.703H46V19.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,19.719H46V20.719H47V19.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,19.734H47V20.734H48V19.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,19.75H48V20.75H49V19.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,19.766H49V20.766H50V19.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,19.781H50V20.781H51V19.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,19.797H51V20.797H52V19.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,19.813H52V20.813H53V19.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,19.828H53V20.828H54V19.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,19.844H54V20.844H55V19.844Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M56,19.859H55V20.859H56V19.859Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M8,20.109H7V21.109H8V20.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,20.125H8V21.125H9V20.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,20.141H9V21.141H10V20.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,20.156H10V21.156H11V20.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,20.172H11V21.172H12V20.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,20.188H12V21.188H13V20.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,20.203H13V21.203H14V20.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,20.219H14V21.219H15V20.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,20.234H15V21.234H16V20.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,20.25H16V21.25H17V20.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,20.266H17V21.266H18V20.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,20.281H18V21.281H19V20.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,20.297H19V21.297H20V20.297Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M21,20.313H20V21.313H21V20.313Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M31,20.469H30V21.469H31V20.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,20.484H31V21.484H32V20.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,20.5H32V21.5H33V20.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,20.516H33V21.516H34V20.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,20.531H34V21.531H35V20.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,20.547H35V21.547H36V20.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,20.563H36V21.563H37V20.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,20.578H37V21.578H38V20.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,20.594H38V21.594H39V20.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,20.609H39V21.609H40V20.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,20.625H40V21.625H41V20.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,20.641H41V21.641H42V20.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,20.656H42V21.656H43V20.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,20.672H43V21.672H44V20.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,20.688H44V21.688H45V20.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,20.703H45V21.703H46V20.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,20.719H46V21.719H47V20.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,20.734H47V21.734H48V20.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,20.75H48V21.75H49V20.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,20.766H49V21.766H50V20.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,20.781H50V21.781H51V20.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,20.797H51V21.797H52V20.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,20.813H52V21.813H53V20.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,20.828H53V21.828H54V20.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,20.844H54V21.844H55V20.844Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M56,20.859H55V21.859H56V20.859Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,20.875H56V21.875H57V20.875Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M8,21.109H7V22.109H8V21.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,21.125H8V22.125H9V21.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,21.141H9V22.141H10V21.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,21.156H10V22.156H11V21.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,21.172H11V22.172H12V21.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,21.188H12V22.188H13V21.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,21.203H13V22.203H14V21.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,21.219H14V22.219H15V21.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,21.234H15V22.234H16V21.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,21.25H16V22.25H17V21.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,21.266H17V22.266H18V21.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,21.281H18V22.281H19V21.281Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M20,21.297H19V22.297H20V21.297Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M21,21.313H20V22.313H21V21.313Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M32,21.484H31V22.484H32V21.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,21.5H32V22.5H33V21.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,21.516H33V22.516H34V21.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,21.531H34V22.531H35V21.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,21.547H35V22.547H36V21.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,21.563H36V22.563H37V21.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,21.578H37V22.578H38V21.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,21.594H38V22.594H39V21.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,21.609H39V22.609H40V21.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,21.625H40V22.625H41V21.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,21.641H41V22.641H42V21.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,21.656H42V22.656H43V21.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,21.672H43V22.672H44V21.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,21.688H44V22.688H45V21.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,21.703H45V22.703H46V21.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,21.719H46V22.719H47V21.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,21.734H47V22.734H48V21.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,21.75H48V22.75H49V21.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,21.766H49V22.766H50V21.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,21.781H50V22.781H51V21.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,21.797H51V22.797H52V21.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,21.813H52V22.813H53V21.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,21.828H53V22.828H54V21.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,21.844H54V22.844H55V21.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,21.859H55V22.859H56V21.859Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M57,21.875H56V22.875H57V21.875Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M8,22.109H7V23.109H8V22.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,22.125H8V23.125H9V22.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,22.141H9V23.141H10V22.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,22.156H10V23.156H11V22.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,22.172H11V23.172H12V22.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,22.188H12V23.188H13V22.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,22.203H13V23.203H14V22.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,22.219H14V23.219H15V22.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,22.234H15V23.234H16V22.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,22.25H16V23.25H17V22.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,22.266H17V23.266H18V22.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,22.281H18V23.281H19V22.281Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M20,22.297H19V23.297H20V22.297Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M32,22.484H31V23.484H32V22.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,22.5H32V23.5H33V22.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,22.516H33V23.516H34V22.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,22.531H34V23.531H35V22.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,22.547H35V23.547H36V22.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,22.563H36V23.563H37V22.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,22.578H37V23.578H38V22.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,22.594H38V23.594H39V22.594Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M40,22.609H39V23.609H40V22.609Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M41,22.625H40V23.625H41V22.625Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M42,22.641H41V23.641H42V22.641Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M43,22.656H42V23.656H43V22.656Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M44,22.672H43V23.672H44V22.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,22.688H44V23.688H45V22.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,22.703H45V23.703H46V22.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,22.719H46V23.719H47V22.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,22.734H47V23.734H48V22.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,22.75H48V23.75H49V22.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,22.766H49V23.766H50V22.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,22.781H50V23.781H51V22.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,22.797H51V23.797H52V22.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,22.813H52V23.813H53V22.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,22.828H53V23.828H54V22.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,22.844H54V23.844H55V22.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,22.859H55V23.859H56V22.859Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,22.875H56V23.875H57V22.875Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M7,23.094H6V24.094H7V23.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,23.109H7V24.109H8V23.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,23.125H8V24.125H9V23.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,23.141H9V24.141H10V23.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,23.156H10V24.156H11V23.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,23.172H11V24.172H12V23.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,23.188H12V24.188H13V23.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,23.203H13V24.203H14V23.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,23.219H14V24.219H15V23.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,23.234H15V24.234H16V23.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,23.25H16V24.25H17V23.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,23.266H17V24.266H18V23.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,23.281H18V24.281H19V23.281Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M20,23.297H19V24.297H20V23.297Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M32,23.484H31V24.484H32V23.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,23.5H32V24.5H33V23.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,23.516H33V24.516H34V23.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,23.531H34V24.531H35V23.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,23.547H35V24.547H36V23.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,23.563H36V24.563H37V23.563Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M38,23.578H37V24.578H38V23.578Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M39,23.594H38V24.594H39V23.594Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M45,23.688H44V24.688H45V23.688Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M46,23.703H45V24.703H46V23.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,23.719H46V24.719H47V23.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,23.734H47V24.734H48V23.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,23.75H48V24.75H49V23.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,23.766H49V24.766H50V23.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,23.781H50V24.781H51V23.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,23.797H51V24.797H52V23.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,23.813H52V24.813H53V23.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,23.828H53V24.828H54V23.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,23.844H54V24.844H55V23.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,23.859H55V24.859H56V23.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,23.875H56V24.875H57V23.875Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M58,23.891H57V24.891H58V23.891Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M7,24.094H6V25.094H7V24.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,24.109H7V25.109H8V24.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,24.125H8V25.125H9V24.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,24.141H9V25.141H10V24.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,24.156H10V25.156H11V24.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,24.172H11V25.172H12V24.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,24.188H12V25.188H13V24.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,24.203H13V25.203H14V24.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,24.219H14V25.219H15V24.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,24.234H15V25.234H16V24.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,24.25H16V25.25H17V24.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,24.266H17V25.266H18V24.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,24.281H18V25.281H19V24.281Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M20,24.297H19V25.297H20V24.297Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M32,24.484H31V25.484H32V24.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,24.5H32V25.5H33V24.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,24.516H33V25.516H34V24.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,24.531H34V25.531H35V24.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,24.547H35V25.547H36V24.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,24.563H36V25.563H37V24.563Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M38,24.578H37V25.578H38V24.578Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M46,24.703H45V25.703H46V24.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,24.719H46V25.719H47V24.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,24.734H47V25.734H48V24.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,24.75H48V25.75H49V24.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,24.766H49V25.766H50V24.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,24.781H50V25.781H51V24.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,24.797H51V25.797H52V24.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,24.813H52V25.813H53V24.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,24.828H53V25.828H54V24.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,24.844H54V25.844H55V24.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,24.859H55V25.859H56V24.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,24.875H56V25.875H57V24.875Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M58,24.891H57V25.891H58V24.891Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M7,25.094H6V26.094H7V25.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,25.109H7V26.109H8V25.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,25.125H8V26.125H9V25.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,25.141H9V26.141H10V25.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,25.156H10V26.156H11V25.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,25.172H11V26.172H12V25.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,25.188H12V26.188H13V25.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,25.203H13V26.203H14V25.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,25.219H14V26.219H15V25.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,25.234H15V26.234H16V25.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,25.25H16V26.25H17V25.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,25.266H17V26.266H18V25.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,25.281H18V26.281H19V25.281Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M20,25.297H19V26.297H20V25.297Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M32,25.484H31V26.484H32V25.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,25.5H32V26.5H33V25.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,25.516H33V26.516H34V25.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,25.531H34V26.531H35V25.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,25.547H35V26.547H36V25.547Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M37,25.563H36V26.563H37V25.563Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M47,25.719H46V26.719H47V25.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,25.734H47V26.734H48V25.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,25.75H48V26.75H49V25.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,25.766H49V26.766H50V25.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,25.781H50V26.781H51V25.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,25.797H51V26.797H52V25.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,25.813H52V26.813H53V25.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,25.828H53V26.828H54V25.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,25.844H54V26.844H55V25.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,25.859H55V26.859H56V25.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,25.875H56V26.875H57V25.875Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M58,25.891H57V26.891H58V25.891Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M6,26.078H5V27.078H6V26.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,26.094H6V27.094H7V26.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,26.109H7V27.109H8V26.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,26.125H8V27.125H9V26.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,26.141H9V27.141H10V26.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,26.156H10V27.156H11V26.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,26.172H11V27.172H12V26.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,26.188H12V27.188H13V26.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,26.203H13V27.203H14V26.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,26.219H14V27.219H15V26.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,26.234H15V27.234H16V26.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,26.25H16V27.25H17V26.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,26.266H17V27.266H18V26.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,26.281H18V27.281H19V26.281Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M20,26.297H19V27.297H20V26.297Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M32,26.484H31V27.484H32V26.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,26.5H32V27.5H33V26.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,26.516H33V27.516H34V26.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,26.531H34V27.531H35V26.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,26.547H35V27.547H36V26.547Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M37,26.563H36V27.563H37V26.563Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M47,26.719H46V27.719H47V26.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,26.734H47V27.734H48V26.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,26.75H48V27.75H49V26.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,26.766H49V27.766H50V26.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,26.781H50V27.781H51V26.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,26.797H51V27.797H52V26.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,26.813H52V27.813H53V26.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,26.828H53V27.828H54V26.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,26.844H54V27.844H55V26.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,26.859H55V27.859H56V26.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,26.875H56V27.875H57V26.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,26.891H57V27.891H58V26.891Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M59,26.906H58V27.906H59V26.906Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M6,27.078H5V28.078H6V27.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,27.094H6V28.094H7V27.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,27.109H7V28.109H8V27.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,27.125H8V28.125H9V27.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,27.141H9V28.141H10V27.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,27.156H10V28.156H11V27.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,27.172H11V28.172H12V27.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,27.188H12V28.188H13V27.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,27.203H13V28.203H14V27.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,27.219H14V28.219H15V27.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,27.234H15V28.234H16V27.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,27.25H16V28.25H17V27.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,27.266H17V28.266H18V27.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,27.281H18V28.281H19V27.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,27.297H19V28.297H20V27.297Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M21,27.313H20V28.313H21V27.313Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,27.469H30V28.469H31V27.469Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M32,27.484H31V28.484H32V27.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,27.5H32V28.5H33V27.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,27.516H33V28.516H34V27.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,27.531H34V28.531H35V27.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,27.547H35V28.547H36V27.547Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M37,27.563H36V28.563H37V27.563Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M47,27.719H46V28.719H47V27.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,27.734H47V28.734H48V27.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,27.75H48V28.75H49V27.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,27.766H49V28.766H50V27.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,27.781H50V28.781H51V27.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,27.797H51V28.797H52V27.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,27.813H52V28.813H53V27.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,27.828H53V28.828H54V27.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,27.844H54V28.844H55V27.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,27.859H55V28.859H56V27.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,27.875H56V28.875H57V27.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,27.891H57V28.891H58V27.891Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M59,27.906H58V28.906H59V27.906Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M6,28.078H5V29.078H6V28.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,28.094H6V29.094H7V28.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,28.109H7V29.109H8V28.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,28.125H8V29.125H9V28.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,28.141H9V29.141H10V28.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,28.156H10V29.156H11V28.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,28.172H11V29.172H12V28.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,28.188H12V29.188H13V28.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,28.203H13V29.203H14V28.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,28.219H14V29.219H15V28.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,28.234H15V29.234H16V28.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,28.25H16V29.25H17V28.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,28.266H17V29.266H18V28.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,28.281H18V29.281H19V28.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,28.297H19V29.297H20V28.297Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M21,28.313H20V29.313H21V28.313Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,28.328H21V29.328H22V28.328Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M31,28.469H30V29.469H31V28.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,28.484H31V29.484H32V28.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,28.5H32V29.5H33V28.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,28.516H33V29.516H34V28.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,28.531H34V29.531H35V28.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,28.547H35V29.547H36V28.547Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M37,28.563H36V29.563H37V28.563Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M47,28.719H46V29.719H47V28.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,28.734H47V29.734H48V28.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,28.75H48V29.75H49V28.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,28.766H49V29.766H50V28.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,28.781H50V29.781H51V28.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,28.797H51V29.797H52V28.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,28.813H52V29.813H53V28.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,28.828H53V29.828H54V28.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,28.844H54V29.844H55V28.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,28.859H55V29.859H56V28.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,28.875H56V29.875H57V28.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,28.891H57V29.891H58V28.891Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M59,28.906H58V29.906H59V28.906Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M6,29.078H5V30.078H6V29.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,29.094H6V30.094H7V29.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,29.109H7V30.109H8V29.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,29.125H8V30.125H9V29.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,29.141H9V30.141H10V29.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,29.156H10V30.156H11V29.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,29.172H11V30.172H12V29.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,29.188H12V30.188H13V29.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,29.203H13V30.203H14V29.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,29.219H14V30.219H15V29.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,29.234H15V30.234H16V29.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,29.25H16V30.25H17V29.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,29.266H17V30.266H18V29.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,29.281H18V30.281H19V29.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,29.297H19V30.297H20V29.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,29.313H20V30.313H21V29.313Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,29.328H21V30.328H22V29.328Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M23,29.344H22V30.344H23V29.344Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M29,29.438H28V30.438H29V29.438Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M30,29.453H29V30.453H30V29.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,29.469H30V30.469H31V29.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,29.484H31V30.484H32V29.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,29.5H32V30.5H33V29.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,29.516H33V30.516H34V29.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,29.531H34V30.531H35V29.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,29.547H35V30.547H36V29.547Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M37,29.563H36V30.563H37V29.563Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M47,29.719H46V30.719H47V29.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,29.734H47V30.734H48V29.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,29.75H48V30.75H49V29.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,29.766H49V30.766H50V29.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,29.781H50V30.781H51V29.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,29.797H51V30.797H52V29.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,29.813H52V30.813H53V29.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,29.828H53V30.828H54V29.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,29.844H54V30.844H55V29.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,29.859H55V30.859H56V29.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,29.875H56V30.875H57V29.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,29.891H57V30.891H58V29.891Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M59,29.906H58V30.906H59V29.906Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M6,30.078H5V31.078H6V30.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,30.094H6V31.094H7V30.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,30.109H7V31.109H8V30.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,30.125H8V31.125H9V30.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,30.141H9V31.141H10V30.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,30.156H10V31.156H11V30.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,30.172H11V31.172H12V30.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,30.188H12V31.188H13V30.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,30.203H13V31.203H14V30.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,30.219H14V31.219H15V30.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,30.234H15V31.234H16V30.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,30.25H16V31.25H17V30.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,30.266H17V31.266H18V30.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,30.281H18V31.281H19V30.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,30.297H19V31.297H20V30.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,30.313H20V31.313H21V30.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,30.328H21V31.328H22V30.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,30.344H22V31.344H23V30.344Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M24,30.359H23V31.359H24V30.359Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M25,30.375H24V31.375H25V30.375Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M26,30.391H25V31.391H26V30.391Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M27,30.406H26V31.406H27V30.406Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M28,30.422H27V31.422H28V30.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,30.438H28V31.438H29V30.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,30.453H29V31.453H30V30.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,30.469H30V31.469H31V30.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,30.484H31V31.484H32V30.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,30.5H32V31.5H33V30.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,30.516H33V31.516H34V30.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,30.531H34V31.531H35V30.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,30.547H35V31.547H36V30.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,30.563H36V31.563H37V30.563Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M38,30.578H37V31.578H38V30.578Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M46,30.703H45V31.703H46V30.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,30.719H46V31.719H47V30.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,30.734H47V31.734H48V30.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,30.75H48V31.75H49V30.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,30.766H49V31.766H50V30.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,30.781H50V31.781H51V30.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,30.797H51V31.797H52V30.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,30.813H52V31.813H53V30.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,30.828H53V31.828H54V30.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,30.844H54V31.844H55V30.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,30.859H55V31.859H56V30.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,30.875H56V31.875H57V30.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,30.891H57V31.891H58V30.891Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M59,30.906H58V31.906H59V30.906Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M6,31.078H5V32.078H6V31.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,31.094H6V32.094H7V31.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,31.109H7V32.109H8V31.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,31.125H8V32.125H9V31.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,31.141H9V32.141H10V31.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,31.156H10V32.156H11V31.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,31.172H11V32.172H12V31.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,31.188H12V32.188H13V31.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,31.203H13V32.203H14V31.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,31.219H14V32.219H15V31.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,31.234H15V32.234H16V31.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,31.25H16V32.25H17V31.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,31.266H17V32.266H18V31.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,31.281H18V32.281H19V31.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,31.297H19V32.297H20V31.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,31.313H20V32.313H21V31.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,31.328H21V32.328H22V31.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,31.344H22V32.344H23V31.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,31.359H23V32.359H24V31.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,31.375H24V32.375H25V31.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,31.391H25V32.391H26V31.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,31.406H26V32.406H27V31.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,31.422H27V32.422H28V31.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,31.438H28V32.438H29V31.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,31.453H29V32.453H30V31.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,31.469H30V32.469H31V31.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,31.484H31V32.484H32V31.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,31.5H32V32.5H33V31.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,31.516H33V32.516H34V31.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,31.531H34V32.531H35V31.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,31.547H35V32.547H36V31.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,31.563H36V32.563H37V31.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,31.578H37V32.578H38V31.578Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M39,31.594H38V32.594H39V31.594Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M45,31.688H44V32.688H45V31.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,31.703H45V32.703H46V31.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,31.719H46V32.719H47V31.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,31.734H47V32.734H48V31.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,31.75H48V32.75H49V31.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,31.766H49V32.766H50V31.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,31.781H50V32.781H51V31.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,31.797H51V32.797H52V31.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,31.813H52V32.813H53V31.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,31.828H53V32.828H54V31.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,31.844H54V32.844H55V31.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,31.859H55V32.859H56V31.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,31.875H56V32.875H57V31.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,31.891H57V32.891H58V31.891Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M59,31.906H58V32.906H59V31.906Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M6,32.078H5V33.078H6V32.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,32.094H6V33.094H7V32.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,32.109H7V33.109H8V32.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,32.125H8V33.125H9V32.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,32.141H9V33.141H10V32.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,32.156H10V33.156H11V32.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,32.172H11V33.172H12V32.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,32.188H12V33.188H13V32.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,32.203H13V33.203H14V32.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,32.219H14V33.219H15V32.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,32.234H15V33.234H16V32.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,32.25H16V33.25H17V32.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,32.266H17V33.266H18V32.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,32.281H18V33.281H19V32.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,32.297H19V33.297H20V32.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,32.313H20V33.313H21V32.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,32.328H21V33.328H22V32.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,32.344H22V33.344H23V32.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,32.359H23V33.359H24V32.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,32.375H24V33.375H25V32.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,32.391H25V33.391H26V32.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,32.406H26V33.406H27V32.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,32.422H27V33.422H28V32.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,32.438H28V33.438H29V32.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,32.453H29V33.453H30V32.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,32.469H30V33.469H31V32.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,32.484H31V33.484H32V32.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,32.5H32V33.5H33V32.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,32.516H33V33.516H34V32.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,32.531H34V33.531H35V32.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,32.547H35V33.547H36V32.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,32.563H36V33.563H37V32.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,32.578H37V33.578H38V32.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,32.594H38V33.594H39V32.594Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M40,32.609H39V33.609H40V32.609Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M41,32.625H40V33.625H41V32.625Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M42,32.641H41V33.641H42V32.641Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M43,32.656H42V33.656H43V32.656Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M44,32.672H43V33.672H44V32.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,32.688H44V33.688H45V32.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,32.703H45V33.703H46V32.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,32.719H46V33.719H47V32.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,32.734H47V33.734H48V32.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,32.75H48V33.75H49V32.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,32.766H49V33.766H50V32.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,32.781H50V33.781H51V32.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,32.797H51V33.797H52V32.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,32.813H52V33.813H53V32.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,32.828H53V33.828H54V32.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,32.844H54V33.844H55V32.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,32.859H55V33.859H56V32.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,32.875H56V33.875H57V32.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,32.891H57V33.891H58V32.891Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M59,32.906H58V33.906H59V32.906Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M6,33.078H5V34.078H6V33.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,33.094H6V34.094H7V33.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,33.109H7V34.109H8V33.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,33.125H8V34.125H9V33.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,33.141H9V34.141H10V33.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,33.156H10V34.156H11V33.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,33.172H11V34.172H12V33.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,33.188H12V34.188H13V33.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,33.203H13V34.203H14V33.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,33.219H14V34.219H15V33.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,33.234H15V34.234H16V33.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,33.25H16V34.25H17V33.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,33.266H17V34.266H18V33.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,33.281H18V34.281H19V33.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,33.297H19V34.297H20V33.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,33.313H20V34.313H21V33.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,33.328H21V34.328H22V33.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,33.344H22V34.344H23V33.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,33.359H23V34.359H24V33.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,33.375H24V34.375H25V33.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,33.391H25V34.391H26V33.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,33.406H26V34.406H27V33.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,33.422H27V34.422H28V33.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,33.438H28V34.438H29V33.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,33.453H29V34.453H30V33.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,33.469H30V34.469H31V33.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,33.484H31V34.484H32V33.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,33.5H32V34.5H33V33.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,33.516H33V34.516H34V33.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,33.531H34V34.531H35V33.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,33.547H35V34.547H36V33.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,33.563H36V34.563H37V33.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,33.578H37V34.578H38V33.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,33.594H38V34.594H39V33.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,33.609H39V34.609H40V33.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,33.625H40V34.625H41V33.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,33.641H41V34.641H42V33.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,33.656H42V34.656H43V33.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,33.672H43V34.672H44V33.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,33.688H44V34.688H45V33.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,33.703H45V34.703H46V33.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,33.719H46V34.719H47V33.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,33.734H47V34.734H48V33.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,33.75H48V34.75H49V33.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,33.766H49V34.766H50V33.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,33.781H50V34.781H51V33.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,33.797H51V34.797H52V33.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,33.813H52V34.813H53V33.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,33.828H53V34.828H54V33.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,33.844H54V34.844H55V33.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,33.859H55V34.859H56V33.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,33.875H56V34.875H57V33.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,33.891H57V34.891H58V33.891Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M59,33.906H58V34.906H59V33.906Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M6,34.078H5V35.078H6V34.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,34.094H6V35.094H7V34.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,34.109H7V35.109H8V34.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,34.125H8V35.125H9V34.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,34.141H9V35.141H10V34.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,34.156H10V35.156H11V34.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,34.172H11V35.172H12V34.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,34.188H12V35.188H13V34.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,34.203H13V35.203H14V34.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,34.219H14V35.219H15V34.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,34.234H15V35.234H16V34.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,34.25H16V35.25H17V34.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,34.266H17V35.266H18V34.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,34.281H18V35.281H19V34.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,34.297H19V35.297H20V34.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,34.313H20V35.313H21V34.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,34.328H21V35.328H22V34.328Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M23,34.344H22V35.344H23V34.344Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M24,34.359H23V35.359H24V34.359Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M25,34.375H24V35.375H25V34.375Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M26,34.391H25V35.391H26V34.391Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M27,34.406H26V35.406H27V34.406Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M28,34.422H27V35.422H28V34.422Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M29,34.438H28V35.438H29V34.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,34.453H29V35.453H30V34.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,34.469H30V35.469H31V34.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,34.484H31V35.484H32V34.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,34.5H32V35.5H33V34.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,34.516H33V35.516H34V34.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,34.531H34V35.531H35V34.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,34.547H35V35.547H36V34.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,34.563H36V35.563H37V34.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,34.578H37V35.578H38V34.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,34.594H38V35.594H39V34.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,34.609H39V35.609H40V34.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,34.625H40V35.625H41V34.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,34.641H41V35.641H42V34.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,34.656H42V35.656H43V34.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,34.672H43V35.672H44V34.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,34.688H44V35.688H45V34.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,34.703H45V35.703H46V34.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,34.719H46V35.719H47V34.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,34.734H47V35.734H48V34.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,34.75H48V35.75H49V34.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,34.766H49V35.766H50V34.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,34.781H50V35.781H51V34.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,34.797H51V35.797H52V34.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,34.813H52V35.813H53V34.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,34.828H53V35.828H54V34.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,34.844H54V35.844H55V34.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,34.859H55V35.859H56V34.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,34.875H56V35.875H57V34.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,34.891H57V35.891H58V34.891Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M59,34.906H58V35.906H59V34.906Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M6,35.078H5V36.078H6V35.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,35.094H6V36.094H7V35.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,35.109H7V36.109H8V35.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,35.125H8V36.125H9V35.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,35.141H9V36.141H10V35.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,35.156H10V36.156H11V35.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,35.172H11V36.172H12V35.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,35.188H12V36.188H13V35.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,35.203H13V36.203H14V35.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,35.219H14V36.219H15V35.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,35.234H15V36.234H16V35.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,35.25H16V36.25H17V35.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,35.266H17V36.266H18V35.266Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M19,35.281H18V36.281H19V35.281Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M20,35.297H19V36.297H20V35.297Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M21,35.313H20V36.313H21V35.313Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M30,35.453H29V36.453H30V35.453Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,35.469H30V36.469H31V35.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,35.484H31V36.484H32V35.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,35.5H32V36.5H33V35.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,35.516H33V36.516H34V35.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,35.531H34V36.531H35V35.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,35.547H35V36.547H36V35.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,35.563H36V36.563H37V35.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,35.578H37V36.578H38V35.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,35.594H38V36.594H39V35.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,35.609H39V36.609H40V35.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,35.625H40V36.625H41V35.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,35.641H41V36.641H42V35.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,35.656H42V36.656H43V35.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,35.672H43V36.672H44V35.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,35.688H44V36.688H45V35.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,35.703H45V36.703H46V35.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,35.719H46V36.719H47V35.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,35.734H47V36.734H48V35.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,35.75H48V36.75H49V35.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,35.766H49V36.766H50V35.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,35.781H50V36.781H51V35.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,35.797H51V36.797H52V35.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,35.813H52V36.813H53V35.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,35.828H53V36.828H54V35.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,35.844H54V36.844H55V35.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,35.859H55V36.859H56V35.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,35.875H56V36.875H57V35.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,35.891H57V36.891H58V35.891Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M59,35.906H58V36.906H59V35.906Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M6,36.078H5V37.078H6V36.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,36.094H6V37.094H7V36.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,36.109H7V37.109H8V36.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,36.125H8V37.125H9V36.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,36.141H9V37.141H10V36.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,36.156H10V37.156H11V36.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,36.172H11V37.172H12V36.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,36.188H12V37.188H13V36.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,36.203H13V37.203H14V36.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,36.219H14V37.219H15V36.219Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M16,36.234H15V37.234H16V36.234Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M17,36.25H16V37.25H17V36.25Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M18,36.266H17V37.266H18V36.266Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M29,36.438H28V37.438H29V36.438Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M30,36.453H29V37.453H30V36.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,36.469H30V37.469H31V36.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,36.484H31V37.484H32V36.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,36.5H32V37.5H33V36.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,36.516H33V37.516H34V36.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,36.531H34V37.531H35V36.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,36.547H35V37.547H36V36.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,36.563H36V37.563H37V36.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,36.578H37V37.578H38V36.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,36.594H38V37.594H39V36.594Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M40,36.609H39V37.609H40V36.609Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M41,36.625H40V37.625H41V36.625Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M42,36.641H41V37.641H42V36.641Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M43,36.656H42V37.656H43V36.656Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M44,36.672H43V37.672H44V36.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,36.688H44V37.688H45V36.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,36.703H45V37.703H46V36.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,36.719H46V37.719H47V36.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,36.734H47V37.734H48V36.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,36.75H48V37.75H49V36.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,36.766H49V37.766H50V36.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,36.781H50V37.781H51V36.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,36.797H51V37.797H52V36.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,36.813H52V37.813H53V36.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,36.828H53V37.828H54V36.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,36.844H54V37.844H55V36.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,36.859H55V37.859H56V36.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,36.875H56V37.875H57V36.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,36.891H57V37.891H58V36.891Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M59,36.906H58V37.906H59V36.906Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M6,37.078H5V38.078H6V37.078Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,37.094H6V38.094H7V37.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,37.109H7V38.109H8V37.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,37.125H8V38.125H9V37.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,37.141H9V38.141H10V37.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,37.156H10V38.156H11V37.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,37.172H11V38.172H12V37.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,37.188H12V38.188H13V37.188Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M14,37.203H13V38.203H14V37.203Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M15,37.219H14V38.219H15V37.219Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M28,37.422H27V38.422H28V37.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,37.438H28V38.438H29V37.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,37.453H29V38.453H30V37.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,37.469H30V38.469H31V37.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,37.484H31V38.484H32V37.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,37.5H32V38.5H33V37.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,37.516H33V38.516H34V37.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,37.531H34V38.531H35V37.531Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M36,37.547H35V38.547H36V37.547Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M37,37.563H36V38.563H37V37.563Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M38,37.578H37V38.578H38V37.578Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M46,37.703H45V38.703H46V37.703Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M47,37.719H46V38.719H47V37.719Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M48,37.734H47V38.734H48V37.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,37.75H48V38.75H49V37.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,37.766H49V38.766H50V37.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,37.781H50V38.781H51V37.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,37.797H51V38.797H52V37.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,37.813H52V38.813H53V37.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,37.828H53V38.828H54V37.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,37.844H54V38.844H55V37.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,37.859H55V38.859H56V37.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,37.875H56V38.875H57V37.875Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,37.891H57V38.891H58V37.891Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M59,37.906H58V38.906H59V37.906Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M7,38.094H6V39.094H7V38.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,38.109H7V39.109H8V38.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,38.125H8V39.125H9V38.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,38.141H9V39.141H10V38.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,38.156H10V39.156H11V38.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,38.172H11V39.172H12V38.172Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M13,38.188H12V39.188H13V38.188Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M27,38.406H26V39.406H27V38.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,38.422H27V39.422H28V38.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,38.438H28V39.438H29V38.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,38.453H29V39.453H30V38.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,38.469H30V39.469H31V38.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,38.484H31V39.484H32V38.484Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M33,38.5H32V39.5H33V38.5Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M34,38.516H33V39.516H34V38.516Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,38.531H34V39.531H35V38.531Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M49,38.75H48V39.75H49V38.75Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M50,38.766H49V39.766H50V38.766Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M51,38.781H50V39.781H51V38.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,38.797H51V39.797H52V38.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,38.813H52V39.813H53V38.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,38.828H53V39.828H54V38.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,38.844H54V39.844H55V38.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,38.859H55V39.859H56V38.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,38.875H56V39.875H57V38.875Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M58,38.891H57V39.891H58V38.891Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M7,39.094H6V40.094H7V39.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,39.109H7V40.109H8V39.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,39.125H8V40.125H9V39.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,39.141H9V40.141H10V39.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,39.156H10V40.156H11V39.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,39.172H11V40.172H12V39.172Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M13,39.188H12V40.188H13V39.188Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M27,39.406H26V40.406H27V39.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,39.422H27V40.422H28V39.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,39.438H28V40.438H29V39.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,39.453H29V40.453H30V39.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,39.469H30V40.469H31V39.469Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M32,39.484H31V40.484H32V39.484Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M33,39.5H32V40.5H33V39.5Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M51,39.781H50V40.781H51V39.781Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M52,39.797H51V40.797H52V39.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,39.813H52V40.813H53V39.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,39.828H53V40.828H54V39.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,39.844H54V40.844H55V39.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,39.859H55V40.859H56V39.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,39.875H56V40.875H57V39.875Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M58,39.891H57V40.891H58V39.891Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M7,40.094H6V41.094H7V40.094Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,40.109H7V41.109H8V40.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,40.125H8V41.125H9V40.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,40.141H9V41.141H10V40.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,40.156H10V41.156H11V40.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,40.172H11V41.172H12V40.172Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M13,40.188H12V41.188H13V40.188Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M26,40.391H25V41.391H26V40.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,40.406H26V41.406H27V40.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,40.422H27V41.422H28V40.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,40.438H28V41.438H29V40.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,40.453H29V41.453H30V40.453Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,40.469H30V41.469H31V40.469Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M52,40.797H51V41.797H52V40.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,40.813H52V41.813H53V40.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,40.828H53V41.828H54V40.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,40.844H54V41.844H55V40.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,40.859H55V41.859H56V40.859Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,40.875H56V41.875H57V40.875Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M58,40.891H57V41.891H58V40.891Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M8,41.109H7V42.109H8V41.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,41.125H8V42.125H9V41.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,41.141H9V42.141H10V41.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,41.156H10V42.156H11V41.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,41.172H11V42.172H12V41.172Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M13,41.188H12V42.188H13V41.188Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M26,41.391H25V42.391H26V41.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,41.406H26V42.406H27V41.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,41.422H27V42.422H28V41.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,41.438H28V42.438H29V41.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,41.453H29V42.453H30V41.453Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,41.469H30V42.469H31V41.469Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M51,41.781H50V42.781H51V41.781Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M52,41.797H51V42.797H52V41.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,41.813H52V42.813H53V41.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,41.828H53V42.828H54V41.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,41.844H54V42.844H55V41.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,41.859H55V42.859H56V41.859Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M57,41.875H56V42.875H57V41.875Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M8,42.109H7V43.109H8V42.109Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,42.125H8V43.125H9V42.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,42.141H9V43.141H10V42.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,42.156H10V43.156H11V42.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,42.172H11V43.172H12V42.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,42.188H12V43.188H13V42.188Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M14,42.203H13V43.203H14V42.203Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,42.391H25V43.391H26V42.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,42.406H26V43.406H27V42.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,42.422H27V43.422H28V42.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,42.438H28V43.438H29V42.438Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M30,42.453H29V43.453H30V42.453Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M51,42.781H50V43.781H51V42.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,42.797H51V43.797H52V42.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,42.813H52V43.813H53V42.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,42.828H53V43.828H54V42.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,42.844H54V43.844H55V42.844Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,42.859H55V43.859H56V42.859Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M57,42.875H56V43.875H57V42.875Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M8,43.109H7V44.109H8V43.109Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M9,43.125H8V44.125H9V43.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,43.141H9V44.141H10V43.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,43.156H10V44.156H11V43.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,43.172H11V44.172H12V43.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,43.188H12V44.188H13V43.188Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M14,43.203H13V44.203H14V43.203Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M15,43.219H14V44.219H15V43.219Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,43.391H25V44.391H26V43.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,43.406H26V44.406H27V43.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,43.422H27V44.422H28V43.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,43.438H28V44.438H29V43.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,43.453H29V44.453H30V43.453Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M50,43.766H49V44.766H50V43.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,43.781H50V44.781H51V43.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,43.797H51V44.797H52V43.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,43.813H52V44.813H53V43.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,43.828H53V44.828H54V43.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,43.844H54V44.844H55V43.844Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M56,43.859H55V44.859H56V43.859Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,43.875H56V44.875H57V43.875Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M9,44.125H8V45.125H9V44.125Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,44.141H9V45.141H10V44.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,44.156H10V45.156H11V44.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,44.172H11V45.172H12V44.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,44.188H12V45.188H13V44.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,44.203H13V45.203H14V44.203Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M15,44.219H14V45.219H15V44.219Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,44.391H25V45.391H26V44.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,44.406H26V45.406H27V44.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,44.422H27V45.422H28V44.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,44.438H28V45.438H29V44.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,44.453H29V45.453H30V44.453Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M50,44.766H49V45.766H50V44.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,44.781H50V45.781H51V44.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,44.797H51V45.797H52V44.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,44.813H52V45.813H53V44.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,44.828H53V45.828H54V44.828Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,44.844H54V45.844H55V44.844Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M56,44.859H55V45.859H56V44.859Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M9,45.125H8V46.125H9V45.125Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M10,45.141H9V46.141H10V45.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,45.156H10V46.156H11V45.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,45.172H11V46.172H12V45.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,45.188H12V46.188H13V45.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,45.203H13V46.203H14V45.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,45.219H14V46.219H15V45.219Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M16,45.234H15V46.234H16V45.234Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,45.391H25V46.391H26V45.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,45.406H26V46.406H27V45.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,45.422H27V46.422H28V45.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,45.438H28V46.438H29V45.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,45.453H29V46.453H30V45.453Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M49,45.75H48V46.75H49V45.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,45.766H49V46.766H50V45.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,45.781H50V46.781H51V45.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,45.797H51V46.797H52V45.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,45.813H52V46.813H53V45.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,45.828H53V46.828H54V45.828Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M55,45.844H54V46.844H55V45.844Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M56,45.859H55V46.859H56V45.859Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M10,46.141H9V47.141H10V46.141Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,46.156H10V47.156H11V46.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,46.172H11V47.172H12V46.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,46.188H12V47.188H13V46.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,46.203H13V47.203H14V46.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,46.219H14V47.219H15V46.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,46.234H15V47.234H16V46.234Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M17,46.25H16V47.25H17V46.25Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,46.391H25V47.391H26V46.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,46.406H26V47.406H27V46.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,46.422H27V47.422H28V46.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,46.438H28V47.438H29V46.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,46.453H29V47.453H30V46.453Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M48,46.734H47V47.734H48V46.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,46.75H48V47.75H49V46.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,46.766H49V47.766H50V46.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,46.781H50V47.781H51V46.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,46.797H51V47.797H52V46.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,46.813H52V47.813H53V46.813Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,46.828H53V47.828H54V46.828Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M55,46.844H54V47.844H55V46.844Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M11,47.156H10V48.156H11V47.156Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,47.172H11V48.172H12V47.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,47.188H12V48.188H13V47.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,47.203H13V48.203H14V47.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,47.219H14V48.219H15V47.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,47.234H15V48.234H16V47.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,47.25H16V48.25H17V47.25Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M18,47.266H17V48.266H18V47.266Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,47.391H25V48.391H26V47.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,47.406H26V48.406H27V47.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,47.422H27V48.422H28V47.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,47.438H28V48.438H29V47.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,47.453H29V48.453H30V47.453Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M47,47.719H46V48.719H47V47.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,47.734H47V48.734H48V47.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,47.75H48V48.75H49V47.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,47.766H49V48.766H50V47.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,47.781H50V48.781H51V47.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,47.797H51V48.797H52V47.797Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,47.813H52V48.813H53V47.813Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M54,47.828H53V48.828H54V47.828Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M11,48.156H10V49.156H11V48.156Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M12,48.172H11V49.172H12V48.172Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,48.188H12V49.188H13V48.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,48.203H13V49.203H14V48.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,48.219H14V49.219H15V48.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,48.234H15V49.234H16V48.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,48.25H16V49.25H17V48.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,48.266H17V49.266H18V48.266Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M19,48.281H18V49.281H19V48.281Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,48.391H25V49.391H26V48.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,48.406H26V49.406H27V48.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,48.422H27V49.422H28V48.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,48.438H28V49.438H29V48.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,48.453H29V49.453H30V48.453Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M46,48.703H45V49.703H46V48.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,48.719H46V49.719H47V48.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,48.734H47V49.734H48V48.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,48.75H48V49.75H49V48.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,48.766H49V49.766H50V48.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,48.781H50V49.781H51V48.781Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,48.797H51V49.797H52V48.797Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M53,48.813H52V49.813H53V48.813Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M54,48.828H53V49.828H54V48.828Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M12,49.172H11V50.172H12V49.172Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M13,49.188H12V50.188H13V49.188Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,49.203H13V50.203H14V49.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,49.219H14V50.219H15V49.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,49.234H15V50.234H16V49.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,49.25H16V50.25H17V49.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,49.266H17V50.266H18V49.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,49.281H18V50.281H19V49.281Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M20,49.297H19V50.297H20V49.297Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M21,49.313H20V50.313H21V49.313Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,49.391H25V50.391H26V49.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,49.406H26V50.406H27V49.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,49.422H27V50.422H28V49.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,49.438H28V50.438H29V49.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,49.453H29V50.453H30V49.453Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M44,49.672H43V50.672H44V49.672Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M45,49.688H44V50.688H45V49.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,49.703H45V50.703H46V49.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,49.719H46V50.719H47V49.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,49.734H47V50.734H48V49.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,49.75H48V50.75H49V49.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,49.766H49V50.766H50V49.766Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,49.781H50V50.781H51V49.781Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M52,49.797H51V50.797H52V49.797Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M53,49.813H52V50.813H53V49.813Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M13,50.188H12V51.188H13V50.188Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M14,50.203H13V51.203H14V50.203Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,50.219H14V51.219H15V50.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,50.234H15V51.234H16V50.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,50.25H16V51.25H17V50.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,50.266H17V51.266H18V50.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,50.281H18V51.281H19V50.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,50.297H19V51.297H20V50.297Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M21,50.313H20V51.313H21V50.313Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M22,50.328H21V51.328H22V50.328Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,50.391H25V51.391H26V50.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,50.406H26V51.406H27V50.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,50.422H27V51.422H28V50.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,50.438H28V51.438H29V50.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,50.453H29V51.453H30V50.453Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M42,50.641H41V51.641H42V50.641Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M43,50.656H42V51.656H43V50.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,50.672H43V51.672H44V50.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,50.688H44V51.688H45V50.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,50.703H45V51.703H46V50.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,50.719H46V51.719H47V50.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,50.734H47V51.734H48V50.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,50.75H48V51.75H49V50.75Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,50.766H49V51.766H50V50.766Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M51,50.781H50V51.781H51V50.781Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M52,50.797H51V51.797H52V50.797Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M14,51.203H13V52.203H14V51.203Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M15,51.219H14V52.219H15V51.219Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,51.234H15V52.234H16V51.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,51.25H16V52.25H17V51.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,51.266H17V52.266H18V51.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,51.281H18V52.281H19V51.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,51.297H19V52.297H20V51.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,51.313H20V52.313H21V51.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,51.328H21V52.328H22V51.328Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M23,51.344H22V52.344H23V51.344Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M24,51.359H23V52.359H24V51.359Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M25,51.375H24V52.375H25V51.375Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M26,51.391H25V52.391H26V51.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,51.406H26V52.406H27V51.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,51.422H27V52.422H28V51.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,51.438H28V52.438H29V51.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,51.453H29V52.453H30V51.453Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M40,51.609H39V52.609H40V51.609Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M41,51.625H40V52.625H41V51.625Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M42,51.641H41V52.641H42V51.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,51.656H42V52.656H43V51.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,51.672H43V52.672H44V51.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,51.688H44V52.688H45V51.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,51.703H45V52.703H46V51.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,51.719H46V52.719H47V51.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,51.734H47V52.734H48V51.734Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,51.75H48V52.75H49V51.75Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M50,51.766H49V52.766H50V51.766Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M51,51.781H50V52.781H51V51.781Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M15,52.219H14V53.219H15V52.219Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M16,52.234H15V53.234H16V52.234Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,52.25H16V53.25H17V52.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,52.266H17V53.266H18V52.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,52.281H18V53.281H19V52.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,52.297H19V53.297H20V52.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,52.313H20V53.313H21V52.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,52.328H21V53.328H22V52.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,52.344H22V53.344H23V52.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,52.359H23V53.359H24V52.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,52.375H24V53.375H25V52.375Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M26,52.391H25V53.391H26V52.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,52.406H26V53.406H27V52.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,52.422H27V53.422H28V52.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,52.438H28V53.438H29V52.438Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,52.453H29V53.453H30V52.453Z" />
+            <path
+                android:fillAlpha="0.247059"
+                android:fillColor="#ffffff"
+                android:pathData="M37,52.563H36V53.563H37V52.563Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M38,52.578H37V53.578H38V52.578Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M39,52.594H38V53.594H39V52.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,52.609H39V53.609H40V52.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,52.625H40V53.625H41V52.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,52.641H41V53.641H42V52.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,52.656H42V53.656H43V52.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,52.672H43V53.672H44V52.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,52.688H44V53.688H45V52.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,52.703H45V53.703H46V52.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,52.719H46V53.719H47V52.719Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,52.734H47V53.734H48V52.734Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M49,52.75H48V53.75H49V52.75Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M50,52.766H49V53.766H50V52.766Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M16,53.234H15V54.234H16V53.234Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M17,53.25H16V54.25H17V53.25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,53.266H17V54.266H18V53.266Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,53.281H18V54.281H19V53.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,53.297H19V54.297H20V53.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,53.313H20V54.313H21V53.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,53.328H21V54.328H22V53.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,53.344H22V54.344H23V53.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,53.359H23V54.359H24V53.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,53.375H24V54.375H25V53.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,53.391H25V54.391H26V53.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,53.406H26V54.406H27V53.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,53.422H27V54.422H28V53.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,53.438H28V54.438H29V53.438Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M30,53.453H29V54.453H30V53.453Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M31,53.469H30V54.469H31V53.469Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M32,53.484H31V54.484H32V53.484Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M33,53.5H32V54.5H33V53.5Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M34,53.516H33V54.516H34V53.516Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,53.531H34V54.531H35V53.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,53.547H35V54.547H36V53.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,53.563H36V54.563H37V53.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,53.578H37V54.578H38V53.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,53.594H38V54.594H39V53.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,53.609H39V54.609H40V53.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,53.625H40V54.625H41V53.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,53.641H41V54.641H42V53.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,53.656H42V54.656H43V53.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,53.672H43V54.672H44V53.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,53.688H44V54.688H45V53.688Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,53.703H45V54.703H46V53.703Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,53.719H46V54.719H47V53.719Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M48,53.734H47V54.734H48V53.734Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M49,53.75H48V54.75H49V53.75Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M18,54.266H17V55.266H18V54.266Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M19,54.281H18V55.281H19V54.281Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,54.297H19V55.297H20V54.297Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,54.313H20V55.313H21V54.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,54.328H21V55.328H22V54.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,54.344H22V55.344H23V54.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,54.359H23V55.359H24V54.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,54.375H24V55.375H25V54.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,54.391H25V55.391H26V54.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,54.406H26V55.406H27V54.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,54.422H27V55.422H28V54.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,54.438H28V55.438H29V54.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,54.453H29V55.453H30V54.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,54.469H30V55.469H31V54.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,54.484H31V55.484H32V54.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,54.5H32V55.5H33V54.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,54.516H33V55.516H34V54.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,54.531H34V55.531H35V54.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,54.547H35V55.547H36V54.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,54.563H36V55.563H37V54.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,54.578H37V55.578H38V54.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,54.594H38V55.594H39V54.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,54.609H39V55.609H40V54.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,54.625H40V55.625H41V54.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,54.641H41V55.641H42V54.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,54.656H42V55.656H43V54.656Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,54.672H43V55.672H44V54.672Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,54.688H44V55.688H45V54.688Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M46,54.703H45V55.703H46V54.703Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M47,54.719H46V55.719H47V54.719Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M19,55.281H18V56.281H19V55.281Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M20,55.297H19V56.297H20V55.297Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M21,55.313H20V56.313H21V55.313Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,55.328H21V56.328H22V55.328Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,55.344H22V56.344H23V55.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,55.359H23V56.359H24V55.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,55.375H24V56.375H25V55.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,55.391H25V56.391H26V55.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,55.406H26V56.406H27V55.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,55.422H27V56.422H28V55.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,55.438H28V56.438H29V55.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,55.453H29V56.453H30V55.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,55.469H30V56.469H31V55.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,55.484H31V56.484H32V55.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,55.5H32V56.5H33V55.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,55.516H33V56.516H34V55.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,55.531H34V56.531H35V55.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,55.547H35V56.547H36V55.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,55.563H36V56.563H37V55.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,55.578H37V56.578H38V55.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,55.594H38V56.594H39V55.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,55.609H39V56.609H40V55.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,55.625H40V56.625H41V55.625Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,55.641H41V56.641H42V55.641Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,55.656H42V56.656H43V55.656Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M44,55.672H43V56.672H44V55.672Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M45,55.688H44V56.688H45V55.688Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M46,55.703H45V56.703H46V55.703Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M21,56.313H20V57.313H21V56.313Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M22,56.328H21V57.328H22V56.328Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M23,56.344H22V57.344H23V56.344Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,56.359H23V57.359H24V56.359Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,56.375H24V57.375H25V56.375Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,56.391H25V57.391H26V56.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,56.406H26V57.406H27V56.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,56.422H27V57.422H28V56.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,56.438H28V57.438H29V56.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,56.453H29V57.453H30V56.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,56.469H30V57.469H31V56.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,56.484H31V57.484H32V56.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,56.5H32V57.5H33V56.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,56.516H33V57.516H34V56.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,56.531H34V57.531H35V56.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,56.547H35V57.547H36V56.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,56.563H36V57.563H37V56.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,56.578H37V57.578H38V56.578Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,56.594H38V57.594H39V56.594Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,56.609H39V57.609H40V56.609Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,56.625H40V57.625H41V56.625Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M42,56.641H41V57.641H42V56.641Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M43,56.656H42V57.656H43V56.656Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M44,56.672H43V57.672H44V56.672Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M24,57.359H23V58.359H24V57.359Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M25,57.375H24V58.375H25V57.375Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M26,57.391H25V58.391H26V57.391Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,57.406H26V58.406H27V57.406Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,57.422H27V58.422H28V57.422Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,57.438H28V58.438H29V57.438Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,57.453H29V58.453H30V57.453Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,57.469H30V58.469H31V57.469Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,57.484H31V58.484H32V57.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,57.5H32V58.5H33V57.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,57.516H33V58.516H34V57.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,57.531H34V58.531H35V57.531Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,57.547H35V58.547H36V57.547Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,57.563H36V58.563H37V57.563Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,57.578H37V58.578H38V57.578Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M39,57.594H38V58.594H39V57.594Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M40,57.609H39V58.609H40V57.609Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M41,57.625H40V58.625H41V57.625Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M27,58.406H26V59.406H27V58.406Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M28,58.422H27V59.422H28V58.422Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M29,58.438H28V59.438H29V58.438Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M30,58.453H29V59.453H30V58.453Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M31,58.469H30V59.469H31V58.469Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M32,58.484H31V59.484H32V58.484Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M33,58.5H32V59.5H33V58.5Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M34,58.516H33V59.516H34V58.516Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M35,58.531H34V59.531H35V58.531Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M36,58.547H35V59.547H36V58.547Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M37,58.563H36V59.563H37V58.563Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M38,58.578H37V59.578H38V58.578Z" />
+        </group>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__infant.xml b/app/src/main/res/drawable/ic__infant.xml
new file mode 100644
index 000000000..624997f35
--- /dev/null
+++ b/app/src/main/res/drawable/ic__infant.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="17.6dp"
+    android:viewportWidth="60"
+    android:viewportHeight="44">
+    <group>
+        <clip-path android:pathData="M0,0h60v44h-60z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M10.642,34.028H3.59C3.59,34.028 0,34.022 0,39.525C0.171,43.078 2.927,43.646 3.419,43.646C3.91,43.646 17.777,43.646 17.777,43.646C17.777,43.646 21.374,43.651 21.533,39.309C21.539,39.144 21.552,39.305 21.554,39.138C21.561,38.497 21.554,35.185 21.554,35.185C21.563,34.713 21.92,34.178 22.403,34.178H33.646C33.812,34.178 33.955,34.313 33.97,34.478L36.625,40.519C37.616,42.99 39.542,44.803 42.761,43.639C45.807,42.536 45.965,40.107 45.427,38.402L38.823,18.267C37.831,15.882 35.327,14.491 32.194,14.491H25.47H16.709C8.328,14.491 1.296,24.313 10.816,33.755C10.884,33.906 10.807,34.028 10.642,34.028Z" />
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M49.597,21.14C55.342,21.14 60,16.455 60,10.676C60,4.897 55.342,0.212 49.597,0.212C43.852,0.212 39.194,4.897 39.194,10.676C39.194,16.455 43.852,21.14 49.597,21.14Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__infant_registration.xml b/app/src/main/res/drawable/ic__infant_registration.xml
new file mode 100644
index 000000000..4c1067018
--- /dev/null
+++ b/app/src/main/res/drawable/ic__infant_registration.xml
@@ -0,0 +1,17 @@
+<vector android:alpha="0.96" android:height="24dp"
+    android:viewportHeight="40" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M11.66,0.05C10.917,0.236 10.263,0.785 9.932,1.471C9.762,1.81 9.73,2.036 9.698,2.859L9.666,3.844L8.148,3.868C6.485,3.893 6.412,3.917 6.017,4.45C5.847,4.668 5.847,4.692 5.823,17.035L5.807,29.403L3.191,32.027C0.349,34.884 0.236,35.03 0.051,36.095C-0.458,39.058 2.965,41.125 5.403,39.333C5.629,39.163 5.823,39.042 5.831,39.058C5.847,39.074 5.904,39.195 5.968,39.325C6.033,39.454 6.21,39.647 6.364,39.769L6.638,39.978H19.377H32.116L32.334,39.809C32.851,39.429 32.891,39.308 32.931,37.936L32.972,36.677L35.757,36.168C37.283,35.894 38.647,35.619 38.784,35.563C39.398,35.304 39.931,34.586 40.003,33.9C40.044,33.528 36.427,2.423 36.241,1.543C36.08,0.76 35.394,0.115 34.619,0.01C34.377,-0.023 31.454,0.349 25.424,1.18C20.564,1.85 16.487,2.415 16.374,2.431C16.18,2.472 16.148,2.44 16.1,2.173C15.954,1.35 15.422,0.639 14.663,0.244C14.267,0.034 14.17,0.018 13.072,0.002C12.427,-0.007 11.797,0.018 11.66,0.05ZM14.251,1.479C14.735,1.834 14.808,2.02 14.832,2.972L14.865,3.852H14.211H13.557V3.206V2.561H12.911H12.265V3.206V3.852H11.619H10.973V3.093C10.973,2.27 11.046,1.987 11.321,1.681C11.651,1.326 11.902,1.269 13.008,1.285C13.896,1.309 14.057,1.334 14.251,1.479ZM34.732,1.43C34.837,1.519 34.95,1.673 34.974,1.77C34.998,1.874 35.862,9.108 36.887,17.851C38.647,32.753 38.752,33.762 38.639,34.005C38.575,34.142 38.413,34.303 38.284,34.352C38.074,34.44 33.279,35.336 33.036,35.336C32.956,35.336 32.931,32.414 32.915,20.006L32.891,4.668L32.722,4.45C32.633,4.329 32.455,4.151 32.334,4.062C32.116,3.893 32.035,3.893 24.108,3.852C19.7,3.828 16.14,3.796 16.18,3.788C16.35,3.739 34.037,1.285 34.272,1.277C34.409,1.269 34.619,1.342 34.732,1.43ZM9.682,6.242C9.682,6.872 9.722,7.485 9.779,7.679C9.908,8.123 10.578,8.793 11.022,8.922C11.781,9.148 12.386,8.987 12.951,8.413C13.484,7.889 13.557,7.614 13.557,6.242V5.144H14.203H14.848V6.436V7.727H15.494H16.14V6.436V5.144H23.89H31.64V21.935V38.727H19.369H7.098V38.227V37.718L10.933,33.883L14.768,30.049L15.68,27.304L16.6,24.559L23.47,24.535L30.348,24.519V23.873V23.227H23.18H16.019L12.992,24.236L9.964,25.245L8.535,26.674L7.098,28.111V16.624V5.144H8.39H9.682V6.242ZM12.265,6.234C12.265,7.291 12.257,7.34 12.063,7.525C11.942,7.655 11.773,7.727 11.619,7.727C11.466,7.727 11.296,7.655 11.175,7.525C10.981,7.34 10.973,7.291 10.973,6.234V5.144H11.619H12.265V6.234ZM15.066,25.019C15.05,25.076 14.961,25.334 14.881,25.593L14.735,26.053L14.348,25.673L13.952,25.286L14.461,25.108C15.066,24.898 15.123,24.89 15.066,25.019ZM14.097,27.958L13.928,28.483L12.733,27.288L11.538,26.093L12.039,25.924L12.548,25.746L13.403,26.594L14.259,27.441L14.097,27.958ZM11.821,28.232L13.274,29.685L9.859,33.1L6.453,36.507L4.983,35.03L3.506,33.561L6.897,30.17C8.761,28.305 10.303,26.779 10.328,26.779C10.352,26.779 11.022,27.433 11.821,28.232ZM4.071,35.982L5.524,37.435L5.08,37.888C4.442,38.533 4.128,38.687 3.385,38.687C2.925,38.687 2.707,38.646 2.456,38.509C2.077,38.307 1.69,37.912 1.48,37.516C1.27,37.129 1.27,36.136 1.48,35.74C1.617,35.482 2.473,34.529 2.578,34.529C2.602,34.529 3.272,35.183 4.071,35.982Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,10.957V11.602H12.265H16.14V10.957V10.311H12.265H8.39V10.957Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,13.54V14.186H12.265H16.14V13.54V12.894H12.265H8.39V13.54Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,16.123V16.769H12.265H16.14V16.123V15.477H12.265H8.39V16.123Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,18.706V19.352H12.265H16.14V18.706V18.061H12.265H8.39V18.706Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,21.29V21.935H19.369H30.348V21.29V20.644H19.369H8.39V21.29Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M21.307,34.852V37.436H25.827H30.348V34.852V32.269H25.827H21.307V34.852ZM29.057,34.852V36.144H25.827H22.598V34.852V33.561H25.827H29.057V34.852Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,34.206V34.852H17.432H20.015V34.206V33.56H17.432H14.849V34.206Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,36.79V37.436H17.432H20.015V36.79V36.144H17.432H14.849V36.79Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M22.377,13.068H22.377C22.391,13.021 22.42,12.979 22.458,12.95C22.497,12.92 22.544,12.903 22.597,12.903C22.65,12.903 22.698,12.921 22.737,12.95C22.775,12.98 22.804,13.023 22.817,13.071C22.836,13.136 22.903,13.175 22.969,13.157C23.034,13.139 23.073,13.071 23.055,13.005C23.027,12.905 22.967,12.818 22.887,12.756C22.807,12.694 22.706,12.657 22.597,12.657C22.489,12.657 22.388,12.693 22.309,12.754C22.229,12.816 22.169,12.901 22.14,13.001C22.122,13.066 22.16,13.134 22.225,13.153C22.29,13.172 22.358,13.134 22.377,13.068Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M24.692,12.756C24.612,12.694 24.51,12.657 24.402,12.657C24.294,12.657 24.193,12.693 24.113,12.754C24.034,12.816 23.974,12.901 23.945,13.001C23.927,13.066 23.964,13.134 24.03,13.153C24.095,13.172 24.163,13.134 24.182,13.068C24.195,13.021 24.224,12.979 24.263,12.95C24.302,12.92 24.349,12.903 24.402,12.903C24.455,12.903 24.503,12.921 24.541,12.95C24.58,12.98 24.609,13.023 24.622,13.071C24.64,13.136 24.708,13.175 24.773,13.157C24.839,13.139 24.878,13.071 24.86,13.005C24.832,12.905 24.772,12.818 24.692,12.756Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M23.5,14.668C23.969,14.668 24.4,14.439 24.666,14.071H22.333C22.599,14.439 23.03,14.668 23.5,14.668Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M26.986,12.882C26.86,10.305 23.908,9 23.5,9C23.092,9 20.14,10.305 20.014,12.882C19.902,15.194 20.391,20.449 23.5,20.449C26.609,20.449 27.098,15.194 26.986,12.882ZM23.197,10.866C23.289,10.854 23.383,10.848 23.479,10.848C23.608,10.848 23.734,10.859 23.857,10.881C23.87,10.895 23.883,10.912 23.896,10.932C23.952,11.016 24.008,11.149 24.008,11.358C24.008,11.516 23.975,11.719 23.881,11.976C23.584,11.737 23.415,11.517 23.319,11.336C23.215,11.138 23.196,10.986 23.196,10.897C23.196,10.886 23.197,10.875 23.197,10.866ZM22.985,10.903C22.986,11.023 23.014,11.21 23.132,11.434C23.186,11.535 23.257,11.643 23.351,11.756C23.257,11.718 23.163,11.683 23.074,11.645C22.921,11.581 22.786,11.509 22.695,11.412C22.65,11.364 22.614,11.311 22.588,11.245C22.567,11.191 22.553,11.128 22.549,11.053C22.688,10.989 22.833,10.938 22.985,10.903ZM25.37,17.593C25.324,17.643 25.247,17.647 25.196,17.602L22.871,15.522C23.015,15.557 23.163,15.58 23.316,15.589L23.86,16.076L24.47,15.394C24.587,15.345 24.699,15.248 24.805,15.222C24.848,15.268 24.85,15.34 24.807,15.387L24.044,16.241L25.36,17.419C25.411,17.464 25.415,17.542 25.37,17.593ZM26.205,13.562C26.13,13.637 26.028,13.682 25.915,13.682C25.868,13.682 25.823,13.674 25.779,13.659L25.612,13.6L25.554,13.767C25.405,14.196 25.126,14.566 24.765,14.827C24.403,15.089 23.959,15.243 23.479,15.243C22.999,15.243 22.558,15.091 22.197,14.831C21.836,14.571 21.557,14.205 21.406,13.778L21.351,13.624L21.194,13.667C21.158,13.677 21.122,13.682 21.085,13.682C20.971,13.682 20.87,13.637 20.795,13.562C20.72,13.487 20.675,13.386 20.675,13.272C20.675,13.158 20.72,13.057 20.795,12.982C20.87,12.908 20.971,12.862 21.085,12.862C21.092,12.862 21.103,12.862 21.118,12.863L21.281,12.876L21.305,12.715C21.385,12.186 21.653,11.72 22.039,11.385C22.135,11.301 22.239,11.226 22.349,11.16C22.358,11.219 22.373,11.275 22.393,11.327C22.426,11.408 22.471,11.479 22.525,11.539C22.619,11.645 22.738,11.719 22.861,11.78C23.046,11.871 23.246,11.934 23.414,12.013C23.499,12.052 23.574,12.094 23.636,12.143C23.698,12.192 23.747,12.246 23.781,12.313C23.8,12.349 23.837,12.37 23.878,12.369C23.918,12.368 23.954,12.345 23.971,12.308C24.153,11.913 24.219,11.602 24.219,11.358C24.219,11.191 24.188,11.056 24.144,10.95C24.433,11.042 24.696,11.192 24.92,11.386C25.306,11.722 25.573,12.19 25.652,12.719L25.678,12.894L25.853,12.867C25.876,12.864 25.896,12.862 25.915,12.862C26.028,12.862 26.13,12.908 26.205,12.982C26.279,13.057 26.325,13.158 26.325,13.272C26.325,13.386 26.279,13.488 26.205,13.562Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic__maternal_health.xml b/app/src/main/res/drawable/ic__maternal_health.xml
new file mode 100644
index 000000000..6e3b427c6
--- /dev/null
+++ b/app/src/main/res/drawable/ic__maternal_health.xml
@@ -0,0 +1,5195 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="62"
+    android:viewportHeight="61">
+    <group>
+        <clip-path android:pathData="M0,0h62v61h-62z" />
+        <group>
+            <clip-path android:pathData="M0,0h62v61h-62z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M31,0.484H30V1.484H31V0.484Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M32,0.5H31V1.5H32V0.5Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M33,0.516H32V1.516H33V0.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,0.532H33V1.532H34V0.532Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,0.548H34V1.548H35V0.548Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M29,1.452H28V2.452H29V1.452Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M30,1.468H29V2.468H30V1.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,1.484H30V2.484H31V1.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,1.5H31V2.5H32V1.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,1.516H32V2.516H33V1.516Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M34,1.532H33V2.532H34V1.532Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M28,2.435H27V3.435H28V2.435Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M29,2.452H28V3.452H29V2.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,2.468H29V3.468H30V2.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,2.484H30V3.484H31V2.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,2.5H31V3.5H32V2.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,2.516H32V3.516H33V2.516Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M34,2.532H33V3.532H34V2.532Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M27,3.419H26V4.419H27V3.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,3.435H27V4.435H28V3.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,3.452H28V4.452H29V3.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,3.468H29V4.468H30V3.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,3.484H30V4.484H31V3.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,3.5H31V4.5H32V3.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,3.516H32V4.516H33V3.516Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M34,3.532H33V4.532H34V3.532Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M26,4.403H25V5.403H26V4.403Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M27,4.419H26V5.419H27V4.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,4.435H27V5.435H28V4.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,4.452H28V5.452H29V4.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,4.468H29V5.468H30V4.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,4.484H30V5.484H31V4.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,4.5H31V5.5H32V4.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,4.516H32V5.516H33V4.516Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M34,4.532H33V5.532H34V4.532Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M26,5.403H25V6.403H26V5.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,5.419H26V6.419H27V5.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,5.435H27V6.435H28V5.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,5.452H28V6.452H29V5.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,5.468H29V6.468H30V5.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,5.484H30V6.484H31V5.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,5.5H31V6.5H32V5.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,5.516H32V6.516H33V5.516Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M34,5.532H33V6.532H34V5.532Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M25,6.387H24V7.387H25V6.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,6.403H25V7.403H26V6.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,6.419H26V7.419H27V6.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,6.435H27V7.435H28V6.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,6.452H28V7.452H29V6.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,6.468H29V7.468H30V6.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,6.484H30V7.484H31V6.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,6.5H31V7.5H32V6.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,6.516H32V7.516H33V6.516Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M34,6.532H33V7.532H34V6.532Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M25,7.387H24V8.387H25V7.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,7.403H25V8.403H26V7.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,7.419H26V8.419H27V7.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,7.435H27V8.435H28V7.435Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M29,7.452H28V8.452H29V7.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,7.468H29V8.468H30V7.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,7.484H30V8.484H31V7.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,7.5H31V8.5H32V7.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,7.516H32V8.516H33V7.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,7.532H33V8.532H34V7.532Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M35,7.548H34V8.548H35V7.548Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M25,8.387H24V9.387H25V8.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,8.403H25V9.403H26V8.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,8.419H26V9.419H27V8.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,8.435H27V9.435H28V8.435Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M29,8.452H28V9.452H29V8.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,8.468H29V9.468H30V8.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,8.484H30V9.484H31V8.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,8.5H31V9.5H32V8.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,8.516H32V9.516H33V8.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,8.532H33V9.532H34V8.532Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M35,8.548H34V9.548H35V8.548Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M25,9.387H24V10.387H25V9.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,9.403H25V10.403H26V9.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,9.419H26V10.419H27V9.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,9.435H27V10.436H28V9.435Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M29,9.452H28V10.452H29V9.452Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M30,9.468H29V10.468H30V9.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,9.484H30V10.484H31V9.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,9.5H31V10.5H32V9.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,9.516H32V10.516H33V9.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,9.532H33V10.532H34V9.532Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M35,9.548H34V10.548H35V9.548Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M25,10.387H24V11.387H25V10.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,10.403H25V11.403H26V10.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,10.419H26V11.419H27V10.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,10.436H27V11.436H28V10.436Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M29,10.452H28V11.452H29V10.452Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M30,10.468H29V11.468H30V10.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,10.484H30V11.484H31V10.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,10.5H31V11.5H32V10.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,10.516H32V11.516H33V10.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,10.532H33V11.532H34V10.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,10.548H34V11.548H35V10.548Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M36,10.564H35V11.564H36V10.564Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M24,11.371H23V12.371H24V11.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,11.387H24V12.387H25V11.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,11.403H25V12.403H26V11.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,11.419H26V12.419H27V11.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,11.436H27V12.436H28V11.436Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,11.452H28V12.452H29V11.452Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M30,11.468H29V12.468H30V11.468Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,11.484H30V12.484H31V11.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,11.5H31V12.5H32V11.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,11.516H32V12.516H33V11.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,11.532H33V12.532H34V11.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,11.548H34V12.548H35V11.548Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M36,11.564H35V12.564H36V11.564Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M22,12.339H21V13.339H22V12.339Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M23,12.355H22V13.355H23V12.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,12.371H23V13.371H24V12.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,12.387H24V13.387H25V12.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,12.403H25V13.403H26V12.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,12.419H26V13.419H27V12.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,12.436H27V13.436H28V12.436Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,12.452H28V13.452H29V12.452Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M30,12.468H29V13.468H30V12.468Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,12.484H30V13.484H31V12.484Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M32,12.5H31V13.5H32V12.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,12.516H32V13.516H33V12.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,12.532H33V13.532H34V12.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,12.548H34V13.548H35V12.548Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M36,12.564H35V13.564H36V12.564Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M22,13.339H21V14.339H22V13.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,13.355H22V14.355H23V13.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,13.371H23V14.371H24V13.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,13.387H24V14.387H25V13.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,13.403H25V14.403H26V13.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,13.419H26V14.419H27V13.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,13.436H27V14.436H28V13.436Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,13.452H28V14.452H29V13.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,13.468H29V14.468H30V13.468Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M31,13.484H30V14.484H31V13.484Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M32,13.5H31V14.5H32V13.5Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M33,13.516H32V14.516H33V13.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,13.532H33V14.532H34V13.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,13.548H34V14.548H35V13.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,13.564H35V14.564H36V13.564Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M37,13.581H36V14.581H37V13.581Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M22,14.339H21V15.339H22V14.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,14.355H22V15.355H23V14.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,14.371H23V15.371H24V14.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,14.387H24V15.387H25V14.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,14.403H25V15.403H26V14.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,14.419H26V15.419H27V14.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,14.436H27V15.436H28V14.436Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,14.452H28V15.452H29V14.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,14.468H29V15.468H30V14.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,14.484H30V15.484H31V14.484Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M32,14.5H31V15.5H32V14.5Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M33,14.516H32V15.516H33V14.516Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M34,14.532H33V15.532H34V14.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,14.548H34V15.548H35V14.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,14.564H35V15.564H36V14.564Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M37,14.581H36V15.581H37V14.581Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M2,15.016H1V16.016H2V15.016Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M3,15.032H2V16.032H3V15.032Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M4,15.048H3V16.048H4V15.048Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M22,15.339H21V16.339H22V15.339Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M23,15.355H22V16.355H23V15.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,15.371H23V16.371H24V15.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,15.387H24V16.387H25V15.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,15.403H25V16.403H26V15.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,15.419H26V16.419H27V15.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,15.436H27V16.435H28V15.436Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,15.452H28V16.452H29V15.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,15.468H29V16.468H30V15.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,15.484H30V16.484H31V15.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,15.5H31V16.5H32V15.5Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M33,15.516H32V16.516H33V15.516Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M34,15.532H33V16.532H34V15.532Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M35,15.548H34V16.548H35V15.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,15.564H35V16.565H36V15.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,15.581H36V16.581H37V15.581Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M38,15.597H37V16.597H38V15.597Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M59,15.936H58V16.935H59V15.936Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M60,15.952H59V16.952H60V15.952Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M1,16H0V17H1V16Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,16.016H1V17.016H2V16.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,16.032H2V17.032H3V16.032Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M4,16.048H3V17.048H4V16.048Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,16.339H21V17.339H22V16.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,16.355H22V17.355H23V16.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,16.371H23V17.371H24V16.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,16.387H24V17.387H25V16.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,16.403H25V17.403H26V16.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,16.419H26V17.419H27V16.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,16.435H27V17.435H28V16.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,16.452H28V17.452H29V16.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,16.468H29V17.468H30V16.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,16.484H30V17.484H31V16.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,16.5H31V17.5H32V16.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,16.516H32V17.516H33V16.516Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M34,16.532H33V17.532H34V16.532Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,16.548H34V17.548H35V16.548Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M36,16.565H35V17.565H36V16.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,16.581H36V17.581H37V16.581Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M38,16.597H37V17.597H38V16.597Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M39,16.613H38V17.613H39V16.613Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M58,16.919H57V17.919H58V16.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,16.935H58V17.935H59V16.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,16.952H59V17.952H60V16.952Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M61,16.968H60V17.968H61V16.968Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M1,17H0V18H1V17Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,17.016H1V18.016H2V17.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,17.032H2V18.032H3V17.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,17.048H3V18.048H4V17.048Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M5,17.065H4V18.065H5V17.065Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M22,17.339H21V18.339H22V17.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,17.355H22V18.355H23V17.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,17.371H23V18.371H24V17.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,17.387H24V18.387H25V17.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,17.403H25V18.403H26V17.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,17.419H26V18.419H27V17.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,17.435H27V18.435H28V17.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,17.452H28V18.452H29V17.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,17.468H29V18.468H30V17.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,17.484H30V18.484H31V17.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,17.5H31V18.5H32V17.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,17.516H32V18.516H33V17.516Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M34,17.532H33V18.532H34V17.532Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M35,17.548H34V18.548H35V17.548Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M37,17.581H36V18.581H37V17.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,17.597H37V18.597H38V17.597Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M39,17.613H38V18.613H39V17.613Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,17.903H56V18.903H57V17.903Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M58,17.919H57V18.919H58V17.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,17.935H58V18.935H59V17.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,17.952H59V18.952H60V17.952Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M61,17.968H60V18.968H61V17.968Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M1,18H0V19H1V18Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,18.016H1V19.016H2V18.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,18.032H2V19.032H3V18.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,18.048H3V19.048H4V18.048Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M5,18.065H4V19.065H5V18.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,18.339H21V19.339H22V18.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,18.355H22V19.355H23V18.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,18.371H23V19.371H24V18.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,18.387H24V19.387H25V18.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,18.403H25V19.403H26V18.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,18.419H26V19.419H27V18.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,18.435H27V19.435H28V18.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,18.452H28V19.452H29V18.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,18.468H29V19.468H30V18.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,18.484H30V19.484H31V18.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,18.5H31V19.5H32V18.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,18.516H32V19.516H33V18.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,18.532H33V19.532H34V18.532Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M35,18.548H34V19.548H35V18.548Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M38,18.597H37V19.597H38V18.597Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M39,18.613H38V19.613H39V18.613Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M40,18.629H39V19.629H40V18.629Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M57,18.903H56V19.903H57V18.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,18.919H57V19.919H58V18.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,18.935H58V19.935H59V18.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,18.952H59V19.952H60V18.952Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M61,18.968H60V19.968H61V18.968Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M1,19H0V20H1V19Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,19.016H1V20.016H2V19.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,19.032H2V20.032H3V19.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,19.048H3V20.048H4V19.048Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M5,19.065H4V20.065H5V19.065Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M22,19.339H21V20.339H22V19.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,19.355H22V20.355H23V19.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,19.371H23V20.371H24V19.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,19.387H24V20.387H25V19.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,19.403H25V20.403H26V19.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,19.419H26V20.419H27V19.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,19.435H27V20.435H28V19.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,19.452H28V20.452H29V19.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,19.468H29V20.468H30V19.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,19.484H30V20.484H31V19.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,19.5H31V20.5H32V19.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,19.516H32V20.516H33V19.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,19.532H33V20.532H34V19.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,19.548H34V20.548H35V19.548Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M36,19.565H35V20.565H36V19.565Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M39,19.613H38V20.613H39V19.613Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M40,19.629H39V20.629H40V19.629Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,19.903H56V20.903H57V19.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,19.919H57V20.919H58V19.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,19.935H58V20.935H59V19.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,19.952H59V20.952H60V19.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,19.968H60V20.968H61V19.968Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M1,20H0V21H1V20Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,20.016H1V21.016H2V20.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,20.032H2V21.032H3V20.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,20.048H3V21.048H4V20.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,20.065H4V21.065H5V20.065Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M6,20.081H5V21.081H6V20.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,20.355H22V21.355H23V20.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,20.371H23V21.371H24V20.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,20.387H24V21.387H25V20.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,20.403H25V21.403H26V20.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,20.419H26V21.419H27V20.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,20.435H27V21.435H28V20.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,20.452H28V21.452H29V20.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,20.468H29V21.468H30V20.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,20.484H30V21.484H31V20.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,20.5H31V21.5H32V20.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,20.516H32V21.516H33V20.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,20.532H33V21.532H34V20.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,20.548H34V21.548H35V20.548Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M36,20.565H35V21.565H36V20.565Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M37,20.581H36V21.581H37V20.581Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,20.903H56V21.903H57V20.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,20.919H57V21.919H58V20.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,20.935H58V21.935H59V20.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,20.952H59V21.952H60V20.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,20.968H60V21.968H61V20.968Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M62,20.984H61V21.984H62V20.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,21H0V22H1V21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,21.016H1V22.016H2V21.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,21.032H2V22.032H3V21.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,21.048H3V22.048H4V21.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,21.065H4V22.065H5V21.065Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M6,21.081H5V22.081H6V21.081Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M23,21.355H22V22.355H23V21.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,21.371H23V22.371H24V21.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,21.387H24V22.387H25V21.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,21.403H25V22.403H26V21.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,21.419H26V22.419H27V21.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,21.435H27V22.435H28V21.435Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M29,21.452H28V22.452H29V21.452Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M30,21.468H29V22.468H30V21.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,21.484H30V22.484H31V21.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,21.5H31V22.5H32V21.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,21.516H32V22.516H33V21.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,21.532H33V22.532H34V21.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,21.548H34V22.548H35V21.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,21.565H35V22.565H36V21.565Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M37,21.581H36V22.581H37V21.581Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M56,21.887H55V22.887H56V21.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,21.903H56V22.903H57V21.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,21.919H57V22.919H58V21.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,21.935H58V22.935H59V21.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,21.952H59V22.952H60V21.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,21.968H60V22.968H61V21.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,21.984H61V22.984H62V21.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,22H0V23H1V22Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,22.016H1V23.016H2V22.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,22.032H2V23.032H3V22.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,22.048H3V23.048H4V22.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,22.065H4V23.065H5V22.065Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M6,22.081H5V23.081H6V22.081Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M23,22.355H22V23.355H23V22.355Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M24,22.371H23V23.371H24V22.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,22.387H24V23.387H25V22.387Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M26,22.403H25V23.403H26V22.403Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M27,22.419H26V23.419H27V22.419Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M28,22.435H27V23.435H28V22.435Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M29,22.452H28V23.452H29V22.452Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M30,22.468H29V23.468H30V22.468Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M31,22.484H30V23.484H31V22.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,22.5H31V23.5H32V22.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,22.516H32V23.516H33V22.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,22.532H33V23.532H34V22.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,22.548H34V23.548H35V22.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,22.565H35V23.565H36V22.565Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M37,22.581H36V23.581H37V22.581Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M56,22.887H55V23.887H56V22.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,22.903H56V23.903H57V22.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,22.919H57V23.919H58V22.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,22.935H58V23.935H59V22.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,22.952H59V23.952H60V22.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,22.968H60V23.968H61V22.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,22.984H61V23.984H62V22.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,23H0V24H1V23Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,23.016H1V24.016H2V23.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,23.032H2V24.032H3V23.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,23.048H3V24.048H4V23.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,23.065H4V24.065H5V23.065Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M6,23.081H5V24.081H6V23.081Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M31,23.484H30V24.484H31V23.484Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M32,23.5H31V24.5H32V23.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,23.516H32V24.516H33V23.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,23.532H33V24.532H34V23.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,23.548H34V24.548H35V23.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,23.565H35V24.565H36V23.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,23.581H36V24.581H37V23.581Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M38,23.597H37V24.597H38V23.597Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M56,23.887H55V24.887H56V23.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,23.903H56V24.903H57V23.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,23.919H57V24.919H58V23.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,23.935H58V24.935H59V23.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,23.952H59V24.952H60V23.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,23.968H60V24.968H61V23.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,23.984H61V24.984H62V23.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,24H0V25H1V24Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,24.016H1V25.016H2V24.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,24.032H2V25.032H3V24.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,24.048H3V25.048H4V24.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,24.065H4V25.065H5V24.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,24.081H5V25.081H6V24.081Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M32,24.5H31V25.5H32V24.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,24.516H32V25.516H33V24.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,24.532H33V25.532H34V24.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,24.548H34V25.548H35V24.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,24.565H35V25.565H36V24.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,24.581H36V25.581H37V24.581Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M38,24.597H37V25.597H38V24.597Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M56,24.887H55V25.887H56V24.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,24.903H56V25.903H57V24.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,24.919H57V25.919H58V24.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,24.935H58V25.935H59V24.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,24.952H59V25.952H60V24.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,24.968H60V25.968H61V24.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,24.984H61V25.984H62V24.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,25H0V26H1V25Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,25.016H1V26.016H2V25.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,25.032H2V26.032H3V25.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,25.048H3V26.048H4V25.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,25.065H4V26.065H5V25.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,25.081H5V26.081H6V25.081Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M7,25.097H6V26.097H7V25.097Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M32,25.5H31V26.5H32V25.5Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M33,25.516H32V26.516H33V25.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,25.532H33V26.532H34V25.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,25.548H34V26.548H35V25.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,25.565H35V26.565H36V25.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,25.581H36V26.581H37V25.581Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M38,25.597H37V26.597H38V25.597Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M56,25.887H55V26.887H56V25.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,25.903H56V26.903H57V25.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,25.919H57V26.919H58V25.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,25.935H58V26.935H59V25.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,25.952H59V26.952H60V25.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,25.968H60V26.968H61V25.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,25.984H61V26.984H62V25.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,26H0V27H1V26Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,26.016H1V27.016H2V26.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,26.032H2V27.032H3V26.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,26.048H3V27.048H4V26.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,26.065H4V27.065H5V26.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,26.081H5V27.081H6V26.081Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M7,26.097H6V27.097H7V26.097Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M33,26.516H32V27.516H33V26.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,26.532H33V27.532H34V26.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,26.548H34V27.548H35V26.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,26.565H35V27.565H36V26.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,26.581H36V27.581H37V26.581Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M38,26.597H37V27.597H38V26.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,26.887H55V27.887H56V26.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,26.903H56V27.903H57V26.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,26.919H57V27.919H58V26.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,26.935H58V27.935H59V26.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,26.952H59V27.952H60V26.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,26.968H60V27.968H61V26.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,26.984H61V27.984H62V26.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,27H0V28H1V27Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,27.016H1V28.016H2V27.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,27.032H2V28.032H3V27.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,27.048H3V28.048H4V27.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,27.065H4V28.065H5V27.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,27.081H5V28.081H6V27.081Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M7,27.097H6V28.097H7V27.097Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M33,27.516H32V28.516H33V27.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,27.532H33V28.532H34V27.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,27.548H34V28.548H35V27.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,27.565H35V28.565H36V27.565Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,27.581H36V28.581H37V27.581Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M38,27.597H37V28.597H38V27.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,27.887H55V28.887H56V27.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,27.903H56V28.903H57V27.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,27.919H57V28.919H58V27.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,27.935H58V28.935H59V27.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,27.952H59V28.952H60V27.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,27.968H60V28.968H61V27.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,27.984H61V28.984H62V27.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,28H0V29H1V28Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,28.016H1V29.016H2V28.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,28.032H2V29.032H3V28.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,28.048H3V29.048H4V28.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,28.065H4V29.065H5V28.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,28.081H5V29.081H6V28.081Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M7,28.097H6V29.097H7V28.097Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M33,28.516H32V29.516H33V28.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,28.532H33V29.532H34V28.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,28.548H34V29.548H35V28.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,28.565H35V29.565H36V28.565Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M37,28.581H36V29.581H37V28.581Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M55,28.871H54V29.871H55V28.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,28.887H55V29.887H56V28.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,28.903H56V29.903H57V28.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,28.919H57V29.919H58V28.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,28.935H58V29.935H59V28.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,28.952H59V29.952H60V28.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,28.968H60V29.968H61V28.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,28.984H61V29.984H62V28.984Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M1,29H0V30H1V29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,29.016H1V30.016H2V29.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,29.032H2V30.032H3V29.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,29.048H3V30.048H4V29.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,29.065H4V30.065H5V29.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,29.081H5V30.081H6V29.081Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M7,29.097H6V30.097H7V29.097Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M33,29.516H32V30.516H33V29.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,29.532H33V30.532H34V29.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,29.548H34V30.548H35V29.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,29.565H35V30.565H36V29.565Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M37,29.581H36V30.581H37V29.581Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M55,29.871H54V30.871H55V29.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,29.887H55V30.887H56V29.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,29.903H56V30.903H57V29.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,29.919H57V30.919H58V29.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,29.935H58V30.935H59V29.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,29.952H59V30.952H60V29.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,29.968H60V30.968H61V29.968Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M62,29.984H61V30.984H62V29.984Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M1,30H0V31H1V30Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,30.016H1V31.016H2V30.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,30.032H2V31.032H3V30.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,30.048H3V31.048H4V30.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,30.065H4V31.065H5V30.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,30.081H5V31.081H6V30.081Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M7,30.097H6V31.097H7V30.097Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M33,30.516H32V31.516H33V30.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,30.532H33V31.532H34V30.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,30.548H34V31.548H35V30.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,30.565H35V31.565H36V30.565Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M37,30.581H36V31.581H37V30.581Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M55,30.871H54V31.871H55V30.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,30.887H55V31.887H56V30.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,30.903H56V31.903H57V30.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,30.919H57V31.919H58V30.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,30.935H58V31.935H59V30.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,30.952H59V31.952H60V30.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,30.968H60V31.968H61V30.968Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M62,30.984H61V31.984H62V30.984Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M1,31H0V32H1V31Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,31.016H1V32.016H2V31.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,31.032H2V32.032H3V31.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,31.048H3V32.048H4V31.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,31.065H4V32.064H5V31.065Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,31.081H5V32.081H6V31.081Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M7,31.097H6V32.097H7V31.097Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M33,31.516H32V32.516H33V31.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,31.532H33V32.532H34V31.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,31.548H34V32.548H35V31.548Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M36,31.565H35V32.564H36V31.565Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M37,31.581H36V32.581H37V31.581Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M55,31.871H54V32.871H55V31.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,31.887H55V32.887H56V31.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,31.903H56V32.903H57V31.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,31.919H57V32.919H58V31.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,31.935H58V32.936H59V31.935Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,31.952H59V32.952H60V31.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,31.968H60V32.968H61V31.968Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M1,32H0V33H1V32Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,32.016H1V33.016H2V32.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,32.032H2V33.032H3V32.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,32.048H3V33.048H4V32.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,32.064H4V33.064H5V32.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,32.081H5V33.081H6V32.081Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M7,32.097H6V33.097H7V32.097Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M12,32.177H11V33.177H12V32.177Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M13,32.194H12V33.194H13V32.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,32.21H13V33.21H14V32.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,32.226H14V33.226H15V32.226Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M16,32.242H15V33.242H16V32.242Z" />
+            <path
+                android:fillAlpha="0.372549"
+                android:fillColor="#ffffff"
+                android:pathData="M17,32.258H16V33.258H17V32.258Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M18,32.274H17V33.274H18V32.274Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M33,32.516H32V33.516H33V32.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,32.532H33V33.532H34V32.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,32.548H34V33.548H35V32.548Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M36,32.564H35V33.564H36V32.564Z" />
+            <path
+                android:fillAlpha="0.309804"
+                android:fillColor="#ffffff"
+                android:pathData="M45,32.71H44V33.71H45V32.71Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M46,32.726H45V33.726H46V32.726Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M47,32.742H46V33.742H47V32.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,32.758H47V33.758H48V32.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,32.774H48V33.774H49V32.774Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M50,32.79H49V33.79H50V32.79Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M55,32.871H54V33.871H55V32.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,32.887H55V33.887H56V32.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,32.903H56V33.903H57V32.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,32.919H57V33.919H58V32.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,32.936H58V33.936H59V32.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,32.952H59V33.952H60V32.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,32.968H60V33.968H61V32.968Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M1,33H0V34H1V33Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,33.016H1V34.016H2V33.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,33.032H2V34.032H3V33.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,33.048H3V34.048H4V33.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,33.064H4V34.064H5V33.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,33.081H5V34.081H6V33.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,33.097H6V34.097H7V33.097Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M8,33.113H7V34.113H8V33.113Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M12,33.177H11V34.177H12V33.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,33.194H12V34.194H13V33.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,33.21H13V34.21H14V33.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,33.226H14V34.226H15V33.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,33.242H15V34.242H16V33.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,33.258H16V34.258H17V33.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,33.274H17V34.274H18V33.274Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M19,33.29H18V34.29H19V33.29Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M20,33.306H19V34.306H20V33.306Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M33,33.516H32V34.516H33V33.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,33.532H33V34.532H34V33.532Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M35,33.548H34V34.548H35V33.548Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M42,33.661H41V34.661H42V33.661Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M43,33.677H42V34.677H43V33.677Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M44,33.694H43V34.694H44V33.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,33.71H44V34.71H45V33.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,33.726H45V34.726H46V33.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,33.742H46V34.742H47V33.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,33.758H47V34.758H48V33.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,33.774H48V34.774H49V33.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,33.79H49V34.79H50V33.79Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M51,33.806H50V34.806H51V33.806Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M55,33.871H54V34.871H55V33.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,33.887H55V34.887H56V33.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,33.903H56V34.903H57V33.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,33.919H57V34.919H58V33.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,33.936H58V34.936H59V33.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,33.952H59V34.952H60V33.952Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M61,33.968H60V34.968H61V33.968Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M1,34H0V35H1V34Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,34.016H1V35.016H2V34.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,34.032H2V35.032H3V34.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,34.048H3V35.048H4V34.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,34.064H4V35.064H5V34.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,34.081H5V35.081H6V34.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,34.097H6V35.097H7V34.097Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M8,34.113H7V35.113H8V34.113Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M12,34.177H11V35.177H12V34.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,34.194H12V35.194H13V34.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,34.21H13V35.21H14V34.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,34.226H14V35.226H15V34.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,34.242H15V35.242H16V34.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,34.258H16V35.258H17V34.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,34.274H17V35.274H18V34.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,34.29H18V35.29H19V34.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,34.306H19V35.306H20V34.306Z" />
+            <path
+                android:fillAlpha="0.498039"
+                android:fillColor="#ffffff"
+                android:pathData="M21,34.323H20V35.323H21V34.323Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,34.339H21V35.339H22V34.339Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M32,34.5H31V35.5H32V34.5Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M33,34.516H32V35.516H33V34.516Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M34,34.532H33V35.532H34V34.532Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,34.548H34V35.548H35V34.548Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M41,34.645H40V35.645H41V34.645Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M42,34.661H41V35.661H42V34.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,34.677H42V35.677H43V34.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,34.694H43V35.694H44V34.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,34.71H44V35.71H45V34.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,34.726H45V35.726H46V34.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,34.742H46V35.742H47V34.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,34.758H47V35.758H48V34.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,34.774H48V35.774H49V34.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,34.79H49V35.79H50V34.79Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M54,34.855H53V35.855H54V34.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,34.871H54V35.871H55V34.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,34.887H55V35.887H56V34.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,34.903H56V35.903H57V34.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,34.919H57V35.919H58V34.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,34.936H58V35.936H59V34.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,34.952H59V35.952H60V34.952Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M61,34.968H60V35.968H61V34.968Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M1,35H0V36H1V35Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,35.016H1V36.016H2V35.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,35.032H2V36.032H3V35.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,35.048H3V36.048H4V35.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,35.064H4V36.064H5V35.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,35.081H5V36.081H6V35.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,35.097H6V36.097H7V35.097Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M8,35.113H7V36.113H8V35.113Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M12,35.177H11V36.177H12V35.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,35.194H12V36.194H13V35.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,35.21H13V36.21H14V35.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,35.226H14V36.226H15V35.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,35.242H15V36.242H16V35.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,35.258H16V36.258H17V35.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,35.274H17V36.274H18V35.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,35.29H18V36.29H19V35.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,35.306H19V36.306H20V35.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,35.323H20V36.323H21V35.323Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M22,35.339H21V36.339H22V35.339Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M23,35.355H22V36.355H23V35.355Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M32,35.5H31V36.5H32V35.5Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M33,35.516H32V36.516H33V35.516Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M34,35.532H33V36.532H34V35.532Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M39,35.613H38V36.613H39V35.613Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M40,35.629H39V36.629H40V35.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,35.645H40V36.645H41V35.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,35.661H41V36.661H42V35.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,35.677H42V36.677H43V35.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,35.694H43V36.694H44V35.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,35.71H44V36.71H45V35.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,35.726H45V36.726H46V35.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,35.742H46V36.742H47V35.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,35.758H47V36.758H48V35.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,35.774H48V36.774H49V35.774Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M50,35.79H49V36.79H50V35.79Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M54,35.855H53V36.855H54V35.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,35.871H54V36.871H55V35.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,35.887H55V36.887H56V35.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,35.903H56V36.903H57V35.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,35.919H57V36.919H58V35.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,35.936H58V36.936H59V35.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,35.952H59V36.952H60V35.952Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M61,35.968H60V36.968H61V35.968Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M1,36H0V37H1V36Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,36.016H1V37.016H2V36.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,36.032H2V37.032H3V36.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,36.048H3V37.048H4V36.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,36.064H4V37.064H5V36.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,36.081H5V37.081H6V36.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,36.097H6V37.097H7V36.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,36.113H7V37.113H8V36.113Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M9,36.129H8V37.129H9V36.129Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M13,36.194H12V37.194H13V36.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,36.21H13V37.21H14V36.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,36.226H14V37.226H15V36.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,36.242H15V37.242H16V36.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,36.258H16V37.258H17V36.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,36.274H17V37.274H18V36.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,36.29H18V37.29H19V36.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,36.306H19V37.306H20V36.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,36.323H20V37.323H21V36.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,36.339H21V37.339H22V36.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,36.355H22V37.355H23V36.355Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M24,36.371H23V37.371H24V36.371Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M25,36.387H24V37.387H25V36.387Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M31,36.484H30V37.484H31V36.484Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M32,36.5H31V37.5H32V36.5Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M37,36.581H36V37.581H37V36.581Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M38,36.597H37V37.597H38V36.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,36.613H38V37.613H39V36.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,36.629H39V37.629H40V36.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,36.645H40V37.645H41V36.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,36.661H41V37.661H42V36.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,36.677H42V37.677H43V36.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,36.694H43V37.694H44V36.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,36.71H44V37.71H45V36.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,36.726H45V37.726H46V36.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,36.742H46V37.742H47V36.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,36.758H47V37.758H48V36.758Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M49,36.774H48V37.774H49V36.774Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M50,36.79H49V37.79H50V36.79Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M54,36.855H53V37.855H54V36.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,36.871H54V37.871H55V36.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,36.887H55V37.887H56V36.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,36.903H56V37.903H57V36.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,36.919H57V37.919H58V36.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,36.936H58V37.936H59V36.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,36.952H59V37.952H60V36.952Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M61,36.968H60V37.968H61V36.968Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M1,37H0V38H1V37Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M2,37.016H1V38.016H2V37.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,37.032H2V38.032H3V37.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,37.048H3V38.048H4V37.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,37.064H4V38.064H5V37.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,37.081H5V38.081H6V37.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,37.097H6V38.097H7V37.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,37.113H7V38.113H8V37.113Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M9,37.129H8V38.129H9V37.129Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M14,37.21H13V38.21H14V37.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,37.226H14V38.226H15V37.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,37.242H15V38.242H16V37.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,37.258H16V38.258H17V37.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,37.274H17V38.274H18V37.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,37.29H18V38.29H19V37.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,37.306H19V38.306H20V37.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,37.323H20V38.323H21V37.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,37.339H21V38.339H22V37.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,37.355H22V38.355H23V37.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,37.371H23V38.371H24V37.371Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M25,37.387H24V38.387H25V37.387Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M26,37.403H25V38.403H26V37.403Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M31,37.484H30V38.484H31V37.484Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M36,37.564H35V38.564H36V37.564Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M37,37.581H36V38.581H37V37.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,37.597H37V38.597H38V37.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,37.613H38V38.613H39V37.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,37.629H39V38.629H40V37.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,37.645H40V38.645H41V37.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,37.661H41V38.661H42V37.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,37.677H42V38.677H43V37.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,37.694H43V38.694H44V37.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,37.71H44V38.71H45V37.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,37.726H45V38.726H46V37.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,37.742H46V38.742H47V37.742Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M48,37.758H47V38.758H48V37.758Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M49,37.774H48V38.774H49V37.774Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M53,37.839H52V38.839H53V37.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,37.855H53V38.855H54V37.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,37.871H54V38.871H55V37.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,37.887H55V38.887H56V37.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,37.903H56V38.903H57V37.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,37.919H57V38.919H58V37.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,37.936H58V38.936H59V37.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,37.952H59V38.952H60V37.952Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M61,37.968H60V38.968H61V37.968Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M2,38.016H1V39.016H2V38.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,38.032H2V39.032H3V38.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,38.048H3V39.048H4V38.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,38.064H4V39.064H5V38.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,38.081H5V39.081H6V38.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,38.097H6V39.097H7V38.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,38.113H7V39.113H8V38.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,38.129H8V39.129H9V38.129Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M10,38.145H9V39.145H10V38.145Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M15,38.226H14V39.226H15V38.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,38.242H15V39.242H16V38.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,38.258H16V39.258H17V38.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,38.274H17V39.274H18V38.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,38.29H18V39.29H19V38.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,38.306H19V39.306H20V38.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,38.323H20V39.323H21V38.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,38.339H21V39.339H22V38.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,38.355H22V39.355H23V38.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,38.371H23V39.371H24V38.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,38.387H24V39.387H25V38.387Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M26,38.403H25V39.403H26V38.403Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M27,38.419H26V39.419H27V38.419Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M35,38.548H34V39.548H35V38.548Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M36,38.564H35V39.564H36V38.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,38.581H36V39.581H37V38.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,38.597H37V39.597H38V38.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,38.613H38V39.613H39V38.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,38.629H39V39.629H40V38.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,38.645H40V39.645H41V38.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,38.661H41V39.661H42V38.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,38.677H42V39.677H43V38.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,38.694H43V39.694H44V38.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,38.71H44V39.71H45V38.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,38.726H45V39.726H46V38.726Z" />
+            <path
+                android:fillAlpha="0.690196"
+                android:fillColor="#ffffff"
+                android:pathData="M47,38.742H46V39.742H47V38.742Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M48,38.758H47V39.758H48V38.758Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M52,38.823H51V39.823H52V38.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,38.839H52V39.839H53V38.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,38.855H53V39.855H54V38.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,38.871H54V39.871H55V38.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,38.887H55V39.887H56V38.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,38.903H56V39.903H57V38.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,38.919H57V39.919H58V38.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,38.936H58V39.936H59V38.936Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M60,38.952H59V39.952H60V38.952Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M61,38.968H60V39.968H61V38.968Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M2,39.016H1V40.016H2V39.016Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M3,39.032H2V40.032H3V39.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,39.048H3V40.048H4V39.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,39.064H4V40.064H5V39.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,39.081H5V40.081H6V39.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,39.097H6V40.097H7V39.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,39.113H7V40.113H8V39.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,39.129H8V40.129H9V39.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,39.145H9V40.145H10V39.145Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M11,39.161H10V40.161H11V39.161Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M16,39.242H15V40.242H16V39.242Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M17,39.258H16V40.258H17V39.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,39.274H17V40.274H18V39.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,39.29H18V40.29H19V39.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,39.306H19V40.306H20V39.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,39.323H20V40.323H21V39.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,39.339H21V40.339H22V39.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,39.355H22V40.355H23V39.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,39.371H23V40.371H24V39.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,39.387H24V40.387H25V39.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,39.403H25V40.403H26V39.403Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M27,39.419H26V40.419H27V39.419Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M28,39.436H27V40.436H28V39.436Z" />
+            <path
+                android:fillAlpha="0.74902"
+                android:fillColor="#ffffff"
+                android:pathData="M35,39.548H34V40.548H35V39.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,39.564H35V40.564H36V39.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,39.581H36V40.581H37V39.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,39.597H37V40.597H38V39.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,39.613H38V40.613H39V39.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,39.629H39V40.629H40V39.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,39.645H40V40.645H41V39.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,39.661H41V40.661H42V39.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,39.677H42V40.677H43V39.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,39.694H43V40.694H44V39.694Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M45,39.71H44V40.71H45V39.71Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M46,39.726H45V40.726H46V39.726Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M51,39.806H50V40.806H51V39.806Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M52,39.823H51V40.823H52V39.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,39.839H52V40.839H53V39.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,39.855H53V40.855H54V39.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,39.871H54V40.871H55V39.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,39.887H55V40.887H56V39.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,39.903H56V40.903H57V39.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,39.919H57V40.919H58V39.919Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M59,39.936H58V40.936H59V39.936Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M60,39.952H59V40.952H60V39.952Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M3,40.032H2V41.032H3V40.032Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M4,40.048H3V41.048H4V40.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,40.064H4V41.064H5V40.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,40.081H5V41.081H6V40.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,40.097H6V41.097H7V40.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,40.113H7V41.113H8V40.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,40.129H8V41.129H9V40.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,40.145H9V41.145H10V40.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,40.161H10V41.161H11V40.161Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M12,40.177H11V41.177H12V40.177Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M17,40.258H16V41.258H17V40.258Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M18,40.274H17V41.274H18V40.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,40.29H18V41.29H19V40.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,40.306H19V41.306H20V40.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,40.323H20V41.323H21V40.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,40.339H21V41.339H22V40.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,40.355H22V41.355H23V40.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,40.371H23V41.371H24V40.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,40.387H24V41.387H25V40.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,40.403H25V41.403H26V40.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,40.419H26V41.419H27V40.419Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M28,40.436H27V41.436H28V40.436Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M34,40.532H33V41.532H34V40.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,40.548H34V41.548H35V40.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,40.564H35V41.564H36V40.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,40.581H36V41.581H37V40.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,40.597H37V41.597H38V40.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,40.613H38V41.613H39V40.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,40.629H39V41.629H40V40.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,40.645H40V41.645H41V40.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,40.661H41V41.661H42V40.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,40.677H42V41.677H43V40.677Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M44,40.694H43V41.694H44V40.694Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M45,40.71H44V41.71H45V40.71Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M50,40.79H49V41.79H50V40.79Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M51,40.806H50V41.806H51V40.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,40.823H51V41.823H52V40.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,40.839H52V41.839H53V40.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,40.855H53V41.855H54V40.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,40.871H54V41.871H55V40.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,40.887H55V41.887H56V40.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,40.903H56V41.903H57V40.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,40.919H57V41.919H58V40.919Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M59,40.936H58V41.936H59V40.936Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M60,40.952H59V41.952H60V40.952Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M3,41.032H2V42.032H3V41.032Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M4,41.048H3V42.048H4V41.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,41.064H4V42.064H5V41.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,41.081H5V42.081H6V41.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,41.097H6V42.097H7V41.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,41.113H7V42.113H8V41.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,41.129H8V42.129H9V41.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,41.145H9V42.145H10V41.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,41.161H10V42.161H11V41.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,41.177H11V42.177H12V41.177Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M13,41.194H12V42.194H13V41.194Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M19,41.29H18V42.29H19V41.29Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M20,41.306H19V42.306H20V41.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,41.323H20V42.323H21V41.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,41.339H21V42.339H22V41.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,41.355H22V42.355H23V41.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,41.371H23V42.371H24V41.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,41.387H24V42.387H25V41.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,41.403H25V42.403H26V41.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,41.419H26V42.419H27V41.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,41.436H27V42.436H28V41.436Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M29,41.452H28V42.452H29V41.452Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M34,41.532H33V42.532H34V41.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,41.548H34V42.548H35V41.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,41.564H35V42.564H36V41.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,41.581H36V42.581H37V41.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,41.597H37V42.597H38V41.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,41.613H38V42.613H39V41.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,41.629H39V42.629H40V41.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,41.645H40V42.645H41V41.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,41.661H41V42.661H42V41.661Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M43,41.677H42V42.677H43V41.677Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M49,41.774H48V42.774H49V41.774Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M50,41.79H49V42.79H50V41.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,41.806H50V42.806H51V41.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,41.823H51V42.823H52V41.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,41.839H52V42.839H53V41.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,41.855H53V42.855H54V41.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,41.871H54V42.871H55V41.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,41.887H55V42.887H56V41.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,41.903H56V42.903H57V41.903Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M58,41.919H57V42.919H58V41.919Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M59,41.936H58V42.936H59V41.936Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M4,42.048H3V43.048H4V42.048Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M5,42.064H4V43.064H5V42.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,42.081H5V43.081H6V42.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,42.097H6V43.097H7V42.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,42.113H7V43.113H8V42.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,42.129H8V43.129H9V42.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,42.145H9V43.145H10V42.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,42.161H10V43.161H11V42.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,42.177H11V43.177H12V42.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,42.194H12V43.194H13V42.194Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M14,42.21H13V43.21H14V42.21Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M15,42.226H14V43.226H15V42.226Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M20,42.306H19V43.306H20V42.306Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M21,42.323H20V43.323H21V42.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,42.339H21V43.339H22V42.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,42.355H22V43.355H23V42.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,42.371H23V43.371H24V42.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,42.387H24V43.387H25V42.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,42.403H25V43.403H26V42.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,42.419H26V43.419H27V42.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,42.436H27V43.436H28V42.436Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M29,42.452H28V43.452H29V42.452Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M33,42.516H32V43.516H33V42.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,42.532H33V43.532H34V42.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,42.548H34V43.548H35V42.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,42.564H35V43.564H36V42.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,42.581H36V43.581H37V42.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,42.597H37V43.597H38V42.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,42.613H38V43.613H39V42.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,42.629H39V43.629H40V42.629Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M41,42.645H40V43.645H41V42.645Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M42,42.661H41V43.661H42V42.661Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M47,42.742H46V43.742H47V42.742Z" />
+            <path
+                android:fillAlpha="0.623529"
+                android:fillColor="#ffffff"
+                android:pathData="M48,42.758H47V43.758H48V42.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,42.774H48V43.774H49V42.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,42.79H49V43.79H50V42.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,42.806H50V43.806H51V42.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,42.823H51V43.823H52V42.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,42.839H52V43.839H53V42.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,42.855H53V43.855H54V42.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,42.871H54V43.871H55V42.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,42.887H55V43.887H56V42.887Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M57,42.903H56V43.903H57V42.903Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M58,42.919H57V43.919H58V42.919Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M5,43.064H4V44.064H5V43.064Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M6,43.081H5V44.081H6V43.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,43.097H6V44.097H7V43.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,43.113H7V44.113H8V43.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,43.129H8V44.129H9V43.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,43.145H9V44.145H10V43.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,43.161H10V44.161H11V43.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,43.177H11V44.177H12V43.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,43.194H12V44.194H13V43.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,43.21H13V44.21H14V43.21Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M15,43.226H14V44.226H15V43.226Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M16,43.242H15V44.242H16V43.242Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M22,43.339H21V44.339H22V43.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,43.355H22V44.355H23V43.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,43.371H23V44.371H24V43.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,43.387H24V44.387H25V43.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,43.403H25V44.403H26V43.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,43.419H26V44.419H27V43.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,43.436H27V44.436H28V43.436Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M29,43.452H28V44.452H29V43.452Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M33,43.516H32V44.516H33V43.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,43.532H33V44.532H34V43.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,43.548H34V44.548H35V43.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,43.564H35V44.564H36V43.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,43.581H36V44.581H37V43.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,43.597H37V44.597H38V43.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,43.613H38V44.613H39V43.613Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M40,43.629H39V44.629H40V43.629Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M41,43.645H40V44.645H41V43.645Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M46,43.726H45V44.726H46V43.726Z" />
+            <path
+                android:fillAlpha="0.811765"
+                android:fillColor="#ffffff"
+                android:pathData="M47,43.742H46V44.742H47V43.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,43.758H47V44.758H48V43.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,43.774H48V44.774H49V43.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,43.79H49V44.79H50V43.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,43.806H50V44.806H51V43.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,43.823H51V44.823H52V43.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,43.839H52V44.839H53V43.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,43.855H53V44.855H54V43.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,43.871H54V44.871H55V43.871Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M56,43.887H55V44.887H56V43.887Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M57,43.903H56V44.903H57V43.903Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M6,44.081H5V45.081H6V44.081Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M7,44.097H6V45.097H7V44.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,44.113H7V45.113H8V44.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,44.129H8V45.129H9V44.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,44.145H9V45.145H10V44.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,44.161H10V45.161H11V44.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,44.177H11V45.177H12V44.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,44.194H12V45.194H13V44.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,44.21H13V45.21H14V44.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,44.226H14V45.226H15V44.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,44.242H15V45.242H16V44.242Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M17,44.258H16V45.258H17V44.258Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M18,44.274H17V45.274H18V44.274Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M22,44.339H21V45.339H22V44.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,44.355H22V45.355H23V44.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,44.371H23V45.371H24V44.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,44.387H24V45.387H25V44.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,44.403H25V45.403H26V44.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,44.419H26V45.419H27V44.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,44.436H27V45.436H28V44.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,44.452H28V45.452H29V44.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,44.516H32V45.516H33V44.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,44.532H33V45.532H34V44.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,44.548H34V45.548H35V44.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,44.564H35V45.564H36V44.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,44.581H36V45.581H37V44.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,44.597H37V45.597H38V44.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,44.613H38V45.613H39V44.613Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M40,44.629H39V45.629H40V44.629Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M41,44.645H40V45.645H41V44.645Z" />
+            <path
+                android:fillAlpha="0.435294"
+                android:fillColor="#ffffff"
+                android:pathData="M45,44.71H44V45.71H45V44.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,44.726H45V45.726H46V44.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,44.742H46V45.742H47V44.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,44.758H47V45.758H48V44.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,44.774H48V45.774H49V44.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,44.79H49V45.79H50V44.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,44.806H50V45.806H51V44.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,44.823H51V45.823H52V44.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,44.839H52V45.839H53V44.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,44.855H53V45.855H54V44.855Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M55,44.871H54V45.871H55V44.871Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M56,44.887H55V45.887H56V44.887Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M7,45.097H6V46.097H7V45.097Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M8,45.113H7V46.113H8V45.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,45.129H8V46.129H9V45.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,45.145H9V46.145H10V45.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,45.161H10V46.161H11V45.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,45.177H11V46.177H12V45.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,45.194H12V46.194H13V45.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,45.21H13V46.21H14V45.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,45.226H14V46.226H15V45.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,45.242H15V46.242H16V45.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,45.258H16V46.258H17V45.258Z" />
+            <path
+                android:fillAlpha="0.87451"
+                android:fillColor="#ffffff"
+                android:pathData="M18,45.274H17V46.274H18V45.274Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M19,45.29H18V46.29H19V45.29Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M21,45.323H20V46.323H21V45.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,45.339H21V46.339H22V45.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,45.355H22V46.355H23V45.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,45.371H23V46.371H24V45.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,45.387H24V46.387H25V45.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,45.403H25V46.403H26V45.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,45.419H26V46.419H27V45.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,45.436H27V46.436H28V45.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,45.452H28V46.452H29V45.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,45.516H32V46.516H33V45.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,45.532H33V46.532H34V45.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,45.548H34V46.548H35V45.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,45.564H35V46.564H36V45.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,45.581H36V46.581H37V45.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,45.597H37V46.597H38V45.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,45.613H38V46.613H39V45.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,45.629H39V46.629H40V45.629Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M41,45.645H40V46.645H41V45.645Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M43,45.677H42V46.677H43V45.677Z" />
+            <path
+                android:fillAlpha="0.686275"
+                android:fillColor="#ffffff"
+                android:pathData="M44,45.694H43V46.694H44V45.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,45.71H44V46.71H45V45.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,45.726H45V46.726H46V45.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,45.742H46V46.742H47V45.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,45.758H47V46.758H48V45.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,45.774H48V46.774H49V45.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,45.79H49V46.79H50V45.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,45.806H50V46.806H51V45.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,45.823H51V46.823H52V45.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,45.839H52V46.839H53V45.839Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M54,45.855H53V46.855H54V45.855Z" />
+            <path
+                android:fillAlpha="0.815686"
+                android:fillColor="#ffffff"
+                android:pathData="M55,45.871H54V46.871H55V45.871Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M56,45.887H55V46.887H56V45.887Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M8,46.113H7V47.113H8V46.113Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M9,46.129H8V47.129H9V46.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,46.145H9V47.145H10V46.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,46.161H10V47.161H11V46.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,46.177H11V47.177H12V46.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,46.194H12V47.194H13V46.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,46.21H13V47.21H14V46.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,46.226H14V47.226H15V46.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,46.242H15V47.242H16V46.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,46.258H16V47.258H17V46.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,46.274H17V47.274H18V46.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,46.29H18V47.29H19V46.29Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M20,46.306H19V47.306H20V46.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,46.323H20V47.323H21V46.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,46.339H21V47.339H22V46.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,46.355H22V47.355H23V46.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,46.371H23V47.371H24V46.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,46.387H24V47.387H25V46.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,46.403H25V47.403H26V46.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,46.419H26V47.419H27V46.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,46.436H27V47.436H28V46.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,46.452H28V47.452H29V46.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,46.516H32V47.516H33V46.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,46.532H33V47.532H34V46.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,46.548H34V47.548H35V46.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,46.564H35V47.564H36V46.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,46.581H36V47.581H37V46.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,46.597H37V47.597H38V46.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,46.613H38V47.613H39V46.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,46.629H39V47.629H40V46.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,46.645H40V47.645H41V46.645Z" />
+            <path
+                android:fillAlpha="0.560784"
+                android:fillColor="#ffffff"
+                android:pathData="M42,46.661H41V47.661H42V46.661Z" />
+            <path
+                android:fillAlpha="0.937255"
+                android:fillColor="#ffffff"
+                android:pathData="M43,46.677H42V47.677H43V46.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,46.694H43V47.694H44V46.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,46.71H44V47.71H45V46.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,46.726H45V47.726H46V46.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,46.742H46V47.742H47V46.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,46.758H47V47.758H48V46.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,46.774H48V47.774H49V46.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,46.79H49V47.79H50V46.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,46.806H50V47.806H51V46.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,46.823H51V47.823H52V46.823Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M53,46.839H52V47.839H53V46.839Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M54,46.855H53V47.855H54V46.855Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M55,46.871H54V47.871H55V46.871Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M9,47.129H8V48.129H9V47.129Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M10,47.145H9V48.145H10V47.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,47.161H10V48.161H11V47.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,47.177H11V48.177H12V47.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,47.194H12V48.194H13V47.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,47.21H13V48.21H14V47.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,47.226H14V48.226H15V47.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,47.242H15V48.242H16V47.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,47.258H16V48.258H17V47.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,47.274H17V48.274H18V47.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,47.29H18V48.29H19V47.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,47.306H19V48.306H20V47.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,47.323H20V48.323H21V47.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,47.339H21V48.339H22V47.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,47.355H22V48.355H23V47.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,47.371H23V48.371H24V47.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,47.387H24V48.387H25V47.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,47.403H25V48.403H26V47.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,47.419H26V48.419H27V47.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,47.436H27V48.436H28V47.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,47.452H28V48.452H29V47.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,47.516H32V48.516H33V47.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,47.532H33V48.532H34V47.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,47.548H34V48.548H35V47.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,47.564H35V48.564H36V47.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,47.581H36V48.581H37V47.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,47.597H37V48.597H38V47.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,47.613H38V48.613H39V47.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,47.629H39V48.629H40V47.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,47.645H40V48.645H41V47.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,47.661H41V48.661H42V47.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,47.677H42V48.677H43V47.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,47.694H43V48.694H44V47.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,47.71H44V48.71H45V47.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,47.726H45V48.726H46V47.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,47.742H46V48.742H47V47.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,47.758H47V48.758H48V47.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,47.774H48V48.774H49V47.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,47.79H49V48.79H50V47.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,47.806H50V48.806H51V47.806Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M52,47.823H51V48.823H52V47.823Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M53,47.839H52V48.839H53V47.839Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M10,48.145H9V49.145H10V48.145Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M11,48.161H10V49.161H11V48.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,48.177H11V49.177H12V48.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,48.194H12V49.194H13V48.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,48.21H13V49.21H14V48.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,48.226H14V49.226H15V48.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,48.242H15V49.242H16V48.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,48.258H16V49.258H17V48.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,48.274H17V49.274H18V48.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,48.29H18V49.29H19V48.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,48.306H19V49.306H20V48.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,48.323H20V49.323H21V48.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,48.339H21V49.339H22V48.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,48.355H22V49.355H23V48.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,48.371H23V49.371H24V48.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,48.387H24V49.387H25V48.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,48.403H25V49.403H26V48.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,48.419H26V49.419H27V48.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,48.436H27V49.436H28V48.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,48.452H28V49.452H29V48.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,48.516H32V49.516H33V48.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,48.532H33V49.532H34V48.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,48.548H34V49.548H35V48.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,48.564H35V49.564H36V48.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,48.581H36V49.581H37V48.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,48.597H37V49.597H38V48.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,48.613H38V49.613H39V48.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,48.629H39V49.629H40V48.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,48.645H40V49.645H41V48.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,48.661H41V49.661H42V48.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,48.677H42V49.677H43V48.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,48.694H43V49.694H44V48.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,48.71H44V49.71H45V48.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,48.726H45V49.726H46V48.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,48.742H46V49.742H47V48.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,48.758H47V49.758H48V48.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,48.774H48V49.774H49V48.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,48.79H49V49.79H50V48.79Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M51,48.806H50V49.806H51V48.806Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M52,48.823H51V49.823H52V48.823Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M11,49.161H10V50.161H11V49.161Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M12,49.177H11V50.177H12V49.177Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M13,49.194H12V50.194H13V49.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,49.21H13V50.21H14V49.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,49.226H14V50.226H15V49.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,49.242H15V50.242H16V49.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,49.258H16V50.258H17V49.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,49.274H17V50.274H18V49.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,49.29H18V50.29H19V49.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,49.306H19V50.306H20V49.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,49.323H20V50.323H21V49.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,49.339H21V50.339H22V49.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,49.355H22V50.355H23V49.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,49.371H23V50.371H24V49.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,49.387H24V50.387H25V49.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,49.403H25V50.403H26V49.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,49.419H26V50.419H27V49.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,49.436H27V50.436H28V49.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,49.452H28V50.452H29V49.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,49.516H32V50.516H33V49.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,49.532H33V50.532H34V49.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,49.548H34V50.548H35V49.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,49.564H35V50.564H36V49.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,49.581H36V50.581H37V49.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,49.597H37V50.597H38V49.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,49.613H38V50.613H39V49.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,49.629H39V50.629H40V49.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,49.645H40V50.645H41V49.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,49.661H41V50.661H42V49.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,49.677H42V50.677H43V49.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,49.694H43V50.694H44V49.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,49.71H44V50.71H45V49.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,49.726H45V50.726H46V49.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,49.742H46V50.742H47V49.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,49.758H47V50.758H48V49.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,49.774H48V50.774H49V49.774Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M50,49.79H49V50.79H50V49.79Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M51,49.806H50V50.806H51V49.806Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M12,50.177H11V51.177H12V50.177Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M13,50.194H12V51.194H13V50.194Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M14,50.21H13V51.21H14V50.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,50.226H14V51.226H15V50.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,50.242H15V51.242H16V50.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,50.258H16V51.258H17V50.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,50.274H17V51.274H18V50.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,50.29H18V51.29H19V50.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,50.306H19V51.306H20V50.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,50.323H20V51.323H21V50.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,50.339H21V51.339H22V50.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,50.355H22V51.355H23V50.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,50.371H23V51.371H24V50.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,50.387H24V51.387H25V50.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,50.403H25V51.403H26V50.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,50.419H26V51.419H27V50.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,50.436H27V51.436H28V50.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,50.452H28V51.452H29V50.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,50.516H32V51.516H33V50.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,50.532H33V51.532H34V50.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,50.548H34V51.548H35V50.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,50.564H35V51.564H36V50.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,50.581H36V51.581H37V50.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,50.597H37V51.597H38V50.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,50.613H38V51.613H39V50.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,50.629H39V51.629H40V50.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,50.645H40V51.645H41V50.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,50.661H41V51.661H42V50.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,50.677H42V51.677H43V50.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,50.694H43V51.694H44V50.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,50.71H44V51.71H45V50.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,50.726H45V51.726H46V50.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,50.742H46V51.742H47V50.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,50.758H47V51.758H48V50.758Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M49,50.774H48V51.774H49V50.774Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M50,50.79H49V51.79H50V50.79Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M13,51.194H12V52.194H13V51.194Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M14,51.21H13V52.21H14V51.21Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M15,51.226H14V52.226H15V51.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,51.242H15V52.242H16V51.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,51.258H16V52.258H17V51.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,51.274H17V52.274H18V51.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,51.29H18V52.29H19V51.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,51.306H19V52.306H20V51.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,51.323H20V52.323H21V51.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,51.339H21V52.339H22V51.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,51.355H22V52.355H23V51.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,51.371H23V52.371H24V51.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,51.387H24V52.387H25V51.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,51.403H25V52.403H26V51.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,51.419H26V52.419H27V51.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,51.436H27V52.436H28V51.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,51.452H28V52.452H29V51.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,51.516H32V52.516H33V51.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,51.532H33V52.532H34V51.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,51.548H34V52.548H35V51.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,51.564H35V52.564H36V51.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,51.581H36V52.581H37V51.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,51.597H37V52.597H38V51.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,51.613H38V52.613H39V51.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,51.629H39V52.629H40V51.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,51.645H40V52.645H41V51.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,51.661H41V52.661H42V51.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,51.677H42V52.677H43V51.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,51.694H43V52.694H44V51.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,51.71H44V52.71H45V51.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,51.726H45V52.726H46V51.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,51.742H46V52.742H47V51.742Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M48,51.758H47V52.758H48V51.758Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M49,51.774H48V52.774H49V51.774Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M14,52.21H13V53.21H14V52.21Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M15,52.226H14V53.226H15V52.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,52.242H15V53.242H16V52.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,52.258H16V53.258H17V52.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,52.274H17V53.274H18V52.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,52.29H18V53.29H19V52.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,52.306H19V53.306H20V52.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,52.323H20V53.323H21V52.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,52.339H21V53.339H22V52.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,52.355H22V53.355H23V52.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,52.371H23V53.371H24V52.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,52.387H24V53.387H25V52.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,52.403H25V53.403H26V52.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,52.419H26V53.419H27V52.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,52.436H27V53.436H28V52.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,52.452H28V53.452H29V52.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,52.516H32V53.516H33V52.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,52.532H33V53.532H34V52.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,52.548H34V53.548H35V52.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,52.564H35V53.564H36V52.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,52.581H36V53.581H37V52.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,52.597H37V53.597H38V52.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,52.613H38V53.613H39V52.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,52.629H39V53.629H40V52.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,52.645H40V53.645H41V52.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,52.661H41V53.661H42V52.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,52.677H42V53.677H43V52.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,52.694H43V53.694H44V52.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,52.71H44V53.71H45V52.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,52.726H45V53.726H46V52.726Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M47,52.742H46V53.742H47V52.742Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M48,52.758H47V53.758H48V52.758Z" />
+            <path
+                android:fillAlpha="0.313726"
+                android:fillColor="#ffffff"
+                android:pathData="M15,53.226H14V54.226H15V53.226Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M16,53.242H15V54.242H16V53.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,53.258H16V54.258H17V53.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,53.274H17V54.274H18V53.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,53.29H18V54.29H19V53.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,53.306H19V54.306H20V53.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,53.323H20V54.323H21V53.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,53.339H21V54.339H22V53.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,53.355H22V54.355H23V53.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,53.371H23V54.371H24V53.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,53.387H24V54.387H25V53.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,53.403H25V54.403H26V53.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,53.419H26V54.419H27V53.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,53.436H27V54.436H28V53.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,53.452H28V54.452H29V53.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,53.516H32V54.516H33V53.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,53.532H33V54.532H34V53.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,53.548H34V54.548H35V53.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,53.564H35V54.564H36V53.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,53.581H36V54.581H37V53.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,53.597H37V54.597H38V53.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,53.613H38V54.613H39V53.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,53.629H39V54.629H40V53.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,53.645H40V54.645H41V53.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,53.661H41V54.661H42V53.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,53.677H42V54.677H43V53.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,53.694H43V54.694H44V53.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,53.71H44V54.71H45V53.71Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M46,53.726H45V54.726H46V53.726Z" />
+            <path
+                android:fillAlpha="0.627451"
+                android:fillColor="#ffffff"
+                android:pathData="M47,53.742H46V54.742H47V53.742Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M16,54.242H15V55.242H16V54.242Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M17,54.258H16V55.258H17V54.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,54.274H17V55.274H18V54.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,54.29H18V55.29H19V54.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,54.306H19V55.306H20V54.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,54.323H20V55.323H21V54.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,54.339H21V55.339H22V54.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,54.355H22V55.355H23V54.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,54.371H23V55.371H24V54.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,54.387H24V55.387H25V54.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,54.403H25V55.403H26V54.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,54.419H26V55.419H27V54.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,54.436H27V55.436H28V54.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,54.452H28V55.452H29V54.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,54.516H32V55.516H33V54.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,54.532H33V55.532H34V54.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,54.548H34V55.548H35V54.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,54.564H35V55.564H36V54.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,54.581H36V55.581H37V54.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,54.597H37V55.597H38V54.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,54.613H38V55.613H39V54.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,54.629H39V55.629H40V54.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,54.645H40V55.645H41V54.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,54.661H41V55.661H42V54.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,54.677H42V55.677H43V54.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,54.694H43V55.694H44V54.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M45,54.71H44V55.71H45V54.71Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M46,54.726H45V55.726H46V54.726Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M17,55.258H16V56.258H17V55.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,55.274H17V56.274H18V55.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,55.29H18V56.29H19V55.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,55.306H19V56.306H20V55.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,55.323H20V56.323H21V55.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,55.339H21V56.339H22V55.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,55.355H22V56.355H23V55.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,55.371H23V56.371H24V55.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,55.387H24V56.387H25V55.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,55.403H25V56.403H26V55.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,55.419H26V56.419H27V55.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,55.436H27V56.436H28V55.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,55.452H28V56.452H29V55.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,55.516H32V56.516H33V55.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,55.532H33V56.532H34V55.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,55.548H34V56.548H35V55.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,55.564H35V56.564H36V55.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,55.581H36V56.581H37V55.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,55.597H37V56.597H38V55.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,55.613H38V56.613H39V55.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,55.629H39V56.629H40V55.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,55.645H40V56.645H41V55.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,55.661H41V56.661H42V55.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,55.677H42V56.677H43V55.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,55.694H43V56.694H44V55.694Z" />
+            <path
+                android:fillAlpha="0.941176"
+                android:fillColor="#ffffff"
+                android:pathData="M45,55.71H44V56.71H45V55.71Z" />
+            <path
+                android:fillAlpha="0.0627451"
+                android:fillColor="#ffffff"
+                android:pathData="M46,55.726H45V56.726H46V55.726Z" />
+            <path
+                android:fillAlpha="0.12549"
+                android:fillColor="#ffffff"
+                android:pathData="M17,56.258H16V57.258H17V56.258Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M18,56.274H17V57.274H18V56.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,56.29H18V57.29H19V56.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,56.306H19V57.306H20V56.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,56.323H20V57.323H21V56.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,56.339H21V57.339H22V56.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,56.355H22V57.355H23V56.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,56.371H23V57.371H24V56.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,56.387H24V57.387H25V56.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,56.403H25V57.403H26V56.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,56.419H26V57.419H27V56.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,56.436H27V57.436H28V56.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,56.452H28V57.452H29V56.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,56.516H32V57.516H33V56.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,56.532H33V57.532H34V56.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,56.548H34V57.548H35V56.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,56.564H35V57.564H36V56.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,56.581H36V57.581H37V56.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,56.597H37V57.597H38V56.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,56.613H38V57.613H39V56.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,56.629H39V57.629H40V56.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,56.645H40V57.645H41V56.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,56.661H41V57.661H42V56.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,56.677H42V57.677H43V56.677Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M44,56.694H43V57.694H44V56.694Z" />
+            <path
+                android:fillAlpha="0.376471"
+                android:fillColor="#ffffff"
+                android:pathData="M45,56.71H44V57.71H45V56.71Z" />
+            <path
+                android:fillAlpha="0.564706"
+                android:fillColor="#ffffff"
+                android:pathData="M18,57.274H17V58.274H18V57.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,57.29H18V58.29H19V57.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,57.306H19V58.306H20V57.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,57.323H20V58.323H21V57.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,57.339H21V58.339H22V57.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,57.355H22V58.355H23V57.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,57.371H23V58.371H24V57.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,57.387H24V58.387H25V57.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,57.403H25V58.403H26V57.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,57.419H26V58.419H27V57.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,57.436H27V58.436H28V57.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,57.452H28V58.452H29V57.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,57.516H32V58.516H33V57.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,57.532H33V58.532H34V57.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,57.548H34V58.548H35V57.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,57.564H35V58.564H36V57.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,57.581H36V58.581H37V57.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,57.597H37V58.597H38V57.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,57.613H38V58.613H39V57.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,57.629H39V58.629H40V57.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,57.645H40V58.645H41V57.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,57.661H41V58.661H42V57.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,57.677H42V58.677H43V57.677Z" />
+            <path
+                android:fillAlpha="0.878431"
+                android:fillColor="#ffffff"
+                android:pathData="M44,57.694H43V58.694H44V57.694Z" />
+            <path
+                android:fillAlpha="0.188235"
+                android:fillColor="#ffffff"
+                android:pathData="M18,58.274H17V59.274H18V58.274Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,58.29H18V59.29H19V58.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,58.306H19V59.306H20V58.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,58.323H20V59.323H21V58.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,58.339H21V59.339H22V58.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,58.355H22V59.355H23V58.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,58.371H23V59.371H24V58.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,58.387H24V59.387H25V58.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,58.403H25V59.403H26V58.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,58.419H26V59.419H27V58.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,58.436H27V59.436H28V58.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,58.452H28V59.452H29V58.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,58.516H32V59.516H33V58.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,58.532H33V59.532H34V58.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,58.548H34V59.548H35V58.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,58.564H35V59.564H36V58.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,58.581H36V59.581H37V58.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,58.597H37V59.597H38V58.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,58.613H38V59.613H39V58.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,58.629H39V59.629H40V58.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,58.645H40V59.645H41V58.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,58.661H41V59.661H42V58.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,58.677H42V59.677H43V58.677Z" />
+            <path
+                android:fillAlpha="0.439216"
+                android:fillColor="#ffffff"
+                android:pathData="M44,58.694H43V59.694H44V58.694Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M19,59.29H18V60.29H19V59.29Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M20,59.306H19V60.306H20V59.306Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M21,59.323H20V60.323H21V59.323Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M22,59.339H21V60.339H22V59.339Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M23,59.355H22V60.355H23V59.355Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M24,59.371H23V60.371H24V59.371Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M25,59.387H24V60.387H25V59.387Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M26,59.403H25V60.403H26V59.403Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M27,59.419H26V60.419H27V59.419Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M28,59.436H27V60.436H28V59.436Z" />
+            <path
+                android:fillAlpha="0.752941"
+                android:fillColor="#ffffff"
+                android:pathData="M29,59.452H28V60.452H29V59.452Z" />
+            <path
+                android:fillAlpha="0.501961"
+                android:fillColor="#ffffff"
+                android:pathData="M33,59.516H32V60.516H33V59.516Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M34,59.532H33V60.532H34V59.532Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M35,59.548H34V60.548H35V59.548Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M36,59.564H35V60.564H36V59.564Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M37,59.581H36V60.581H37V59.581Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M38,59.597H37V60.597H38V59.597Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M39,59.613H38V60.613H39V59.613Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M40,59.629H39V60.629H40V59.629Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M41,59.645H40V60.645H41V59.645Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M42,59.661H41V60.661H42V59.661Z" />
+            <path
+                android:fillColor="#ffffff"
+                android:pathData="M43,59.677H42V60.677H43V59.677Z" />
+            <path
+                android:fillAlpha="0.25098"
+                android:fillColor="#ffffff"
+                android:pathData="M44,59.694H43V60.694H44V59.694Z" />
+        </group>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic__mother.xml b/app/src/main/res/drawable/ic__mother.xml
new file mode 100644
index 000000000..991b8ed30
--- /dev/null
+++ b/app/src/main/res/drawable/ic__mother.xml
@@ -0,0 +1,12 @@
+<vector android:alpha="0.96" android:height="28.2dp"
+    android:viewportHeight="47" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff"
+        android:pathData="M19.129,29.611L19.129,29.611C18.422,29.683 17.78,29.258 17.528,28.602L17.528,28.602C17.244,27.864 17.552,27.025 18.247,26.647L18.248,26.647C19.233,26.112 20.654,25.346 22.164,24.549L19.129,29.611ZM19.129,29.611L19.135,29.611C21.683,29.324 23.703,28.271 25.166,27.081C26.619,25.899 27.548,24.561 27.895,23.663L27.429,23.483M19.129,29.611L27.429,23.483M27.429,23.483L27.895,23.663C28.01,23.366 28.063,22.998 28.081,22.61C28.099,22.215 28.083,21.766 28.041,21.288C27.957,20.331 27.769,19.227 27.526,18.154C27.284,17.08 26.984,16.024 26.674,15.164C26.52,14.735 26.36,14.347 26.201,14.026C26.046,13.717 25.873,13.43 25.679,13.238L25.329,12.891L24.977,13.237L24.966,13.248L24.966,13.248L24.957,13.257C24.493,13.738 24.122,14.227 23.904,14.948C23.692,15.65 23.637,16.532 23.713,17.783L27.429,23.483ZM23.913,19.514L23.913,19.514L23.91,19.494C23.833,18.956 23.75,18.376 23.713,17.783L23.913,19.514ZM23.913,19.514C24.063,20.561 24.194,21.509 24.004,22.362M23.913,19.514L24.004,22.362M15.847,22.42L15.847,22.42C15.895,22.396 15.94,22.337 15.938,22.249L15.847,22.42ZM15.847,22.42L15.843,22.422M15.847,22.42L15.843,22.422M15.843,22.422C15.672,22.508 11.864,24.473 11.864,29.056C11.864,30.957 13.077,32.53 13.533,33.059L13.683,33.233H13.912H26.421H27.027L26.912,32.638C26.725,31.67 26.398,29.909 26.055,27.77L25.921,26.933L25.253,27.455C23.681,28.686 21.608,29.698 19.175,29.972L19.175,29.972C19.107,29.98 19.038,29.984 18.969,29.984C18.201,29.984 17.482,29.497 17.188,28.733C16.84,27.826 17.221,26.791 18.074,26.328L18.074,26.328C19.06,25.792 20.483,25.024 21.995,24.227L21.995,24.227C22.928,23.735 23.452,23.139 23.646,22.307C23.824,21.543 23.706,20.628 23.553,19.566C23.47,18.989 23.388,18.414 23.35,17.805L23.35,17.805C23.283,16.712 23.323,15.906 23.451,15.266L23.632,14.365L22.778,14.702C22.14,14.953 21.481,15.087 20.812,15.087C19.643,15.087 18.485,14.689 17.437,13.912L17.174,13.717M15.843,22.422L17.174,13.717M17.174,13.717L16.89,13.88M17.174,13.717L16.89,13.88M16.89,13.88C15.959,14.416 15.237,15.184 14.799,16.126C14.465,16.84 14.298,17.554 14.298,18.301C14.298,19.749 14.607,20.671 14.965,21.251C15.325,21.833 15.715,22.037 15.819,22.083M16.89,13.88L15.819,22.083M24.004,22.362C23.825,23.167 23.349,23.924 22.165,24.549L24.004,22.362ZM15.819,22.083C15.892,22.115 15.936,22.189 15.938,22.249L15.819,22.083ZM13.483,33.543L13.483,33.543C13.456,33.517 12.954,33.011 12.46,32.193C11.965,31.373 11.5,30.275 11.5,29.056C11.5,25.535 13.639,23.49 14.878,22.599L15.326,22.277L14.962,21.863C14.497,21.332 13.934,20.288 13.934,18.301C13.934,17.518 14.112,16.735 14.469,15.972L14.469,15.971C15,14.832 15.917,13.92 17.137,13.341L17.137,13.341C17.2,13.31 17.277,13.32 17.332,13.366C18.387,14.253 19.56,14.723 20.812,14.723C22.207,14.723 23.538,14.122 24.661,13.038C24.712,12.992 24.745,12.957 24.77,12.932C24.772,12.929 24.774,12.927 24.776,12.925C24.777,12.924 24.777,12.924 24.777,12.924C24.777,12.924 24.777,12.924 24.777,12.924C24.795,12.905 24.811,12.887 24.821,12.877L24.823,12.874C24.834,12.862 24.838,12.858 24.84,12.856L24.841,12.856C25.082,12.614 25.381,12.581 25.675,12.773L25.675,12.773C25.816,12.865 25.996,13.056 26.2,13.377C26.4,13.691 26.601,14.095 26.797,14.57C27.189,15.519 27.544,16.712 27.82,17.942C28.095,19.172 28.289,20.424 28.365,21.488C28.444,22.581 28.39,23.391 28.235,23.794C27.941,24.554 27.322,25.492 26.415,26.416L26.239,26.595L26.278,26.842C26.847,30.535 27.418,33.319 27.429,33.376L27.43,33.377L27.43,33.377C27.441,33.431 27.427,33.487 27.393,33.529C27.358,33.572 27.306,33.597 27.251,33.597H13.611C13.563,33.597 13.517,33.577 13.483,33.543Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M26.067,5.301L25.63,5.334L25.605,5.772C25.512,7.438 24.751,9.177 23.672,10.5C22.582,11.837 21.253,12.651 20.075,12.651C19.351,12.651 18.559,12.386 17.921,11.41C17.259,10.396 16.741,8.582 16.741,5.43C16.741,3.277 17.335,2.076 18.08,1.403C18.835,0.722 19.836,0.5 20.813,0.5C21.927,0.5 22.869,0.774 23.613,1.252L23.945,1.467L24.23,1.192C24.67,0.768 25.258,0.526 25.892,0.526C27.214,0.526 28.29,1.602 28.29,2.924C28.29,4.181 27.31,5.209 26.067,5.301ZM25.556,4.502L25.624,4.991L26.114,4.928C27.09,4.804 27.926,3.991 27.926,2.924C27.926,1.802 27.014,0.89 25.892,0.89C25.4,0.89 24.951,1.072 24.597,1.365L24.212,1.685L24.533,2.07C25.06,2.702 25.417,3.52 25.556,4.502ZM25.26,5.43C25.26,3.449 24.503,2.266 23.509,1.604C22.55,0.967 21.446,0.864 20.813,0.864C20.03,0.864 19.067,0.981 18.31,1.677C17.549,2.378 17.105,3.561 17.105,5.43C17.105,6.396 17.165,8.035 17.519,9.447C17.695,10.15 17.955,10.839 18.349,11.363C18.753,11.9 19.322,12.287 20.075,12.287C20.743,12.287 21.402,12.02 21.994,11.616C22.589,11.209 23.147,10.645 23.625,9.997C24.574,8.708 25.26,7.017 25.26,5.43Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+    <path android:fillColor="#ffffff" android:pathData="M39.878,25.122C39.79,25.024 39.666,24.966 39.534,24.963C39.524,24.963 39.513,24.963 39.503,24.963C38.656,24.963 37.837,25.86 37.394,26.627C36.764,27.715 36,30.938 35.905,31.344C35.893,31.369 35.877,31.406 35.863,31.451C35.845,31.515 35.839,31.581 35.848,31.647C35.855,31.706 35.87,31.754 35.879,31.783L35.879,31.784C35.919,32.198 35.747,32.741 35.366,33.399C34.723,34.515 33.458,35.973 31.61,37.729C31.592,37.746 31.573,37.749 31.56,37.749C31.541,37.749 31.525,37.743 31.516,37.734C31.492,37.708 31.486,37.664 31.514,37.636C34.409,34.896 35.871,32.875 35.745,31.791C35.72,31.512 35.579,31.298 35.331,31.157C35.157,31.056 34.964,31.005 34.758,31.005C34.004,31.005 33.097,31.685 31.628,33.351C30.946,34.12 30.246,34.599 29.628,35.022L29.616,35.03C28.879,35.528 28.243,35.958 27.781,36.757C27.344,37.515 27.056,38.296 26.882,38.857C26.725,38.764 26.544,38.713 26.361,38.713C26.066,38.713 25.786,38.839 25.59,39.06L23.052,41.951C22.957,42.059 22.916,42.203 22.939,42.345C22.962,42.486 23.048,42.61 23.172,42.681L29.65,46.422C29.725,46.466 29.808,46.486 29.889,46.486C30.054,46.486 30.215,46.401 30.303,46.248L31.735,43.772C31.967,43.367 31.891,42.853 31.565,42.532C33.086,41.464 37.367,38.364 38.381,36.604C39.365,34.896 39.693,29.974 39.89,27.032C39.928,26.453 39.963,25.906 39.998,25.481C40.009,25.35 39.965,25.22 39.878,25.122ZM30.906,43.295L29.714,45.354L24.155,42.144L26.308,39.693C26.326,39.672 26.351,39.67 26.361,39.67C26.376,39.67 26.389,39.674 26.399,39.683L27.443,40.502L30.468,42.881C30.476,42.888 30.485,42.892 30.494,42.898L30.89,43.209C30.91,43.225 30.922,43.267 30.906,43.295ZM38.935,26.969C38.757,29.64 38.425,34.611 37.552,36.126C36.764,37.493 33.182,40.254 30.785,41.91L27.967,39.697L27.696,39.484C27.829,38.992 28.114,38.095 28.609,37.236C28.961,36.628 29.486,36.272 30.154,35.821L30.168,35.812C30.832,35.358 31.584,34.843 32.344,33.984C33.818,32.313 34.471,31.962 34.758,31.962C34.771,31.962 34.783,31.963 34.794,31.965C34.768,32.254 34.43,33.558 30.855,36.943C30.452,37.328 30.434,37.975 30.82,38.39C31.015,38.594 31.278,38.706 31.56,38.706C31.821,38.706 32.071,38.608 32.265,38.426C34.211,36.577 35.496,35.089 36.195,33.878C36.693,33.017 36.9,32.29 36.827,31.656C36.826,31.644 36.825,31.632 36.823,31.621C36.825,31.614 36.826,31.606 36.828,31.599C37.133,30.266 37.781,27.867 38.222,27.106C38.456,26.701 38.735,26.382 38.987,26.176C38.97,26.427 38.953,26.695 38.935,26.969Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.409,39.059C14.214,38.839 13.934,38.713 13.64,38.713C13.456,38.713 13.274,38.765 13.12,38.858C12.941,38.283 12.653,37.506 12.224,36.756C11.768,35.969 11.133,35.537 10.397,35.036L10.376,35.021C9.758,34.599 9.057,34.119 8.373,33.352C6.903,31.685 5.997,31.005 5.244,31.005C5.041,31.005 4.851,31.056 4.679,31.155C4.431,31.292 4.288,31.504 4.256,31.785C4.129,32.87 5.592,34.894 8.484,37.635C8.512,37.662 8.514,37.702 8.484,37.733C8.48,37.737 8.469,37.749 8.445,37.749C8.432,37.749 8.413,37.746 8.399,37.732C6.55,35.977 5.284,34.518 4.633,33.399C4.253,32.742 4.083,32.196 4.127,31.771C4.129,31.766 4.13,31.761 4.132,31.755C4.137,31.737 4.142,31.719 4.147,31.701C4.172,31.599 4.163,31.493 4.122,31.397C4.113,31.376 4.103,31.356 4.093,31.338C3.993,30.91 3.235,27.715 2.611,26.628C2.167,25.86 1.347,24.963 0.497,24.963C0.487,24.963 0.476,24.963 0.466,24.963C0.334,24.966 0.21,25.024 0.122,25.122C0.034,25.22 -0.009,25.35 0.002,25.481C0.024,25.744 0.045,26.049 0.07,26.403C0.084,26.602 0.099,26.814 0.115,27.033L0.116,27.049C0.382,31.025 0.717,35.038 1.624,36.604C2.642,38.37 6.919,41.468 8.437,42.533C8.106,42.857 8.031,43.371 8.27,43.773L9.696,46.247C9.76,46.356 9.864,46.437 9.987,46.47C10.028,46.481 10.069,46.486 10.111,46.486C10.194,46.486 10.276,46.464 10.35,46.422L16.833,42.681C16.957,42.61 17.042,42.486 17.066,42.345C17.089,42.203 17.047,42.058 16.953,41.951L14.409,39.059ZM2.452,36.126C1.581,34.62 1.249,29.653 1.071,26.985L1.07,26.966C1.054,26.745 1.039,26.534 1.025,26.335C1.021,26.279 1.017,26.224 1.013,26.17C1.265,26.373 1.544,26.693 1.782,27.105C2.221,27.87 2.867,30.267 3.172,31.599C3.173,31.607 3.175,31.615 3.178,31.622C3.179,31.626 3.18,31.629 3.181,31.632C3.179,31.64 3.178,31.648 3.178,31.656C3.104,32.294 3.31,33.021 3.806,33.878C4.512,35.095 5.799,36.582 7.743,38.429C7.934,38.608 8.183,38.706 8.445,38.706C8.724,38.706 8.994,38.59 9.18,38.39C9.569,37.982 9.553,37.333 9.143,36.942C5.593,33.576 5.233,32.286 5.207,31.965C5.218,31.963 5.23,31.962 5.244,31.962C5.531,31.962 6.181,32.313 7.657,33.986C8.421,34.843 9.173,35.357 9.836,35.811L9.859,35.827C10.55,36.297 11.049,36.637 11.395,37.234C11.875,38.073 12.162,38.959 12.307,39.486L9.217,41.912C6.823,40.258 3.243,37.498 2.452,36.126ZM10.286,45.354L9.096,43.29C9.082,43.265 9.088,43.23 9.115,43.21L13.609,39.68C13.612,39.678 13.622,39.67 13.64,39.67C13.648,39.67 13.673,39.672 13.691,39.692L15.849,42.145L10.286,45.354Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic__pwr.xml b/app/src/main/res/drawable/ic__pwr.xml
new file mode 100644
index 000000000..de089d4b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic__pwr.xml
@@ -0,0 +1,18 @@
+<vector android:alpha="0.96" android:height="24dp"
+    android:viewportHeight="40" android:viewportWidth="40"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M11.66,0.05C10.917,0.236 10.263,0.785 9.932,1.471C9.762,1.81 9.73,2.036 9.698,2.859L9.666,3.844L8.148,3.868C6.485,3.893 6.412,3.917 6.017,4.45C5.847,4.668 5.847,4.692 5.823,17.035L5.807,29.403L3.191,32.027C0.349,34.884 0.236,35.03 0.051,36.095C-0.458,39.058 2.965,41.125 5.403,39.333C5.629,39.163 5.823,39.042 5.831,39.058C5.847,39.074 5.904,39.195 5.968,39.325C6.033,39.454 6.21,39.647 6.364,39.769L6.638,39.978H19.377H32.116L32.334,39.809C32.851,39.429 32.891,39.308 32.931,37.936L32.972,36.677L35.757,36.168C37.283,35.894 38.647,35.619 38.784,35.563C39.398,35.304 39.931,34.586 40.003,33.9C40.044,33.528 36.427,2.423 36.241,1.543C36.08,0.76 35.394,0.115 34.619,0.01C34.377,-0.023 31.454,0.349 25.424,1.18C20.564,1.85 16.487,2.415 16.374,2.431C16.18,2.472 16.148,2.44 16.1,2.173C15.954,1.35 15.422,0.639 14.663,0.244C14.267,0.034 14.17,0.018 13.072,0.002C12.427,-0.007 11.797,0.018 11.66,0.05ZM14.251,1.479C14.735,1.834 14.808,2.02 14.832,2.972L14.865,3.852H14.211H13.557V3.206V2.561H12.911H12.265V3.206V3.852H11.619H10.973V3.093C10.973,2.27 11.046,1.987 11.321,1.681C11.651,1.326 11.902,1.269 13.008,1.285C13.896,1.309 14.057,1.334 14.251,1.479ZM34.732,1.43C34.837,1.519 34.95,1.673 34.974,1.77C34.998,1.874 35.862,9.108 36.887,17.851C38.647,32.753 38.752,33.762 38.639,34.005C38.575,34.142 38.413,34.303 38.284,34.352C38.074,34.44 33.279,35.336 33.036,35.336C32.956,35.336 32.931,32.414 32.915,20.006L32.891,4.668L32.722,4.45C32.633,4.329 32.455,4.151 32.334,4.062C32.116,3.893 32.035,3.893 24.108,3.852C19.7,3.828 16.14,3.796 16.18,3.788C16.35,3.739 34.037,1.285 34.272,1.277C34.409,1.269 34.619,1.342 34.732,1.43ZM9.682,6.242C9.682,6.872 9.722,7.485 9.779,7.679C9.908,8.123 10.578,8.793 11.022,8.922C11.781,9.148 12.386,8.987 12.951,8.413C13.484,7.889 13.557,7.614 13.557,6.242V5.144H14.203H14.848V6.436V7.727H15.494H16.14V6.436V5.144H23.89H31.64V21.935V38.727H19.369H7.098V38.227V37.718L10.933,33.883L14.768,30.049L15.68,27.304L16.6,24.559L23.47,24.535L30.348,24.519V23.873V23.227H23.18H16.019L12.992,24.236L9.964,25.245L8.535,26.674L7.098,28.111V16.624V5.144H8.39H9.682V6.242ZM12.265,6.234C12.265,7.291 12.257,7.34 12.063,7.525C11.942,7.655 11.773,7.727 11.619,7.727C11.466,7.727 11.296,7.655 11.175,7.525C10.981,7.34 10.973,7.291 10.973,6.234V5.144H11.619H12.265V6.234ZM15.066,25.019C15.05,25.076 14.961,25.334 14.881,25.593L14.735,26.053L14.348,25.673L13.952,25.286L14.461,25.108C15.066,24.898 15.123,24.89 15.066,25.019ZM14.097,27.958L13.928,28.483L12.733,27.288L11.538,26.093L12.039,25.924L12.548,25.746L13.403,26.594L14.259,27.441L14.097,27.958ZM11.821,28.232L13.274,29.685L9.859,33.1L6.453,36.507L4.983,35.03L3.506,33.561L6.897,30.17C8.761,28.305 10.303,26.779 10.328,26.779C10.352,26.779 11.022,27.433 11.821,28.232ZM4.071,35.982L5.524,37.435L5.08,37.888C4.442,38.533 4.128,38.687 3.385,38.687C2.925,38.687 2.707,38.646 2.456,38.509C2.077,38.307 1.69,37.912 1.48,37.516C1.27,37.129 1.27,36.136 1.48,35.74C1.617,35.482 2.473,34.529 2.578,34.529C2.602,34.529 3.272,35.183 4.071,35.982Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,10.957V11.602H12.265H16.14V10.957V10.311H12.265H8.39V10.957Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,13.54V14.186H12.265H16.14V13.54V12.894H12.265H8.39V13.54Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,16.123V16.769H12.265H16.14V16.123V15.477H12.265H8.39V16.123Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,18.706V19.352H12.265H16.14V18.706V18.061H12.265H8.39V18.706Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.39,21.29V21.935H19.369H30.348V21.29V20.644H19.369H8.39V21.29Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M21.307,34.852V37.436H25.827H30.348V34.852V32.269H25.827H21.307V34.852ZM29.057,34.852V36.144H25.827H22.598V34.852V33.561H25.827H29.057V34.852Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,34.206V34.852H17.432H20.015V34.206V33.56H17.432H14.849V34.206Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M14.849,36.79V37.436H17.432H20.015V36.79V36.144H17.432H14.849V36.79Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M24.942,6.158C25.289,6.239 25.556,6.385 25.774,6.616C25.992,6.855 26.049,6.96 26.17,7.337C26.336,7.875 26.32,9.107 26.13,9.905C25.806,11.258 24.901,11.712 23.859,11.035C23.127,10.561 22.505,9.544 22.392,8.641C22.367,8.438 22.351,8.41 22.27,8.41C22.222,8.41 22.068,8.353 21.931,8.285C21.523,8.078 21.309,7.713 21.313,7.227C21.325,6.348 22.319,5.826 23.075,6.304L23.264,6.425L23.414,6.348C23.822,6.142 24.497,6.057 24.942,6.158ZM23.741,6.798C23.277,7.013 23.026,7.357 22.933,7.9C22.84,8.443 22.978,9.062 23.313,9.662C23.519,10.03 24.008,10.537 24.291,10.679C24.566,10.812 24.893,10.833 25.063,10.723C25.443,10.488 25.657,9.856 25.722,8.803C25.786,7.786 25.669,7.252 25.317,6.936C25.067,6.709 24.921,6.668 24.392,6.68C24.032,6.689 23.931,6.709 23.741,6.798Z"/>
+    <path android:fillColor="#ffffff" android:pathData="M23.232,11.205C23.555,11.554 23.636,11.785 23.656,12.42C23.664,12.749 23.648,13.089 23.608,13.384C23.519,14 23.527,14.219 23.628,14.434C23.733,14.652 23.781,14.685 24.662,15.155C25.446,15.576 25.648,15.742 25.725,16.026C25.814,16.35 25.669,16.714 25.369,16.917C25.006,17.168 24.012,16.953 23.171,16.443C22.589,16.09 21.979,15.446 21.761,14.952C21.454,14.255 21.991,11.671 22.565,11.096C22.67,10.991 22.73,10.962 22.852,10.962C22.993,10.962 23.034,10.991 23.232,11.205Z"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M25.941,11.779L25.941,11.779C25.932,11.775 25.924,11.771 25.916,11.767C25.881,11.79 25.843,11.814 25.805,11.84L25.801,11.842L25.801,11.842C25.588,11.981 25.392,12.092 25.175,12.161C25.017,12.212 24.865,12.236 24.705,12.246C24.708,12.377 24.707,12.517 24.703,12.653C24.694,12.975 24.67,13.334 24.633,13.622L24.632,13.629L24.632,13.629C24.614,13.753 24.603,13.852 24.597,13.927C24.707,13.995 24.878,14.091 25.135,14.227L25.941,11.779ZM25.941,11.779L25.949,11.783M25.941,11.779L25.949,11.783M25.949,11.783C26.281,11.947 26.647,12.367 26.813,12.838C26.885,13.042 26.913,13.38 26.875,13.741C26.837,14.109 26.741,14.388 26.657,14.506C26.657,14.507 26.656,14.507 26.656,14.507L26.54,14.667L26.302,14.997M25.949,11.783L26.302,14.997M26.302,14.997C26.053,14.737 25.696,14.524 25.135,14.227L26.302,14.997ZM26.607,15.438C26.574,15.37 26.539,15.307 26.5,15.248L26.639,15.355L26.837,15.509L26.837,15.509L26.841,15.512C27.145,15.743 27.512,16.236 27.676,16.654L27.676,16.654L27.677,16.655C27.877,17.161 27.911,17.823 27.79,18.204L27.789,18.208C27.698,18.506 27.635,18.635 27.402,18.976C27.362,19.034 27.326,19.091 27.302,19.13C27.296,19.14 27.29,19.149 27.286,19.157C27.283,19.162 27.28,19.166 27.277,19.17C27.264,19.173 27.246,19.176 27.222,19.18C27.084,19.199 26.852,19.209 26.425,19.212C26.166,19.214 25.849,19.213 25.455,19.213C25.211,19.212 24.937,19.212 24.63,19.212H22.168L22.318,17.965L22.318,17.964C22.351,17.687 22.382,17.425 22.41,17.196C22.819,17.472 23.281,17.694 23.728,17.844C24.336,18.049 25.028,18.159 25.554,17.982L25.554,17.982C25.789,17.902 26.011,17.743 26.183,17.584C26.356,17.423 26.528,17.216 26.629,16.995L26.629,16.995L26.63,16.992C26.74,16.748 26.781,16.467 26.778,16.21C26.774,15.954 26.724,15.676 26.607,15.438Z"
+        android:strokeColor="#ffffff" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_doc_upload.xml b/app/src/main/res/drawable/ic_doc_upload.xml
new file mode 100644
index 000000000..e4b486988
--- /dev/null
+++ b/app/src/main/res/drawable/ic_doc_upload.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16"
+    android:tint="@android:color/holo_blue_dark">
+  <path
+      android:pathData="M9,1v3.5A1.5,1.5 0,0 0,10.5 6L14,6v7.5a1.5,1.5 0,0 1,-1.5 1.5L8.663,15A5.5,5.5 0,0 0,4 5.207L4,2.5A1.5,1.5 0,0 1,5.5 1zM10,1.25L10,4.5a0.5,0.5 0,0 0,0.5 0.5h3.25zM10,10.5a4.5,4.5 0,1 1,-9 0a4.5,4.5 0,0 1,9 0m-4,-2a0.5,0.5 0,0 0,-1 0L5,10L3.5,10a0.5,0.5 0,0 0,0 1L5,11v1.5a0.5,0.5 0,0 0,1 0L6,11h1.5a0.5,0.5 0,0 0,0 -1L6,10z"
+      android:fillColor="#ffffffff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_edit_white.xml b/app/src/main/res/drawable/ic_edit_white.xml
new file mode 100644
index 000000000..14db4ba44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_icon_language.xml b/app/src/main/res/drawable/ic_icon_language.xml
new file mode 100644
index 000000000..2087f40fd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_icon_language.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.056,12h-2a1,1 0,0 0,0 2v2L17.87,16a3,3 0,0 0,0.185 -1a3,3 0,0 0,-5.598 -1.5a1,1 0,1 0,1.732 1a1,1 0,0 1,0.866 -0.5a1,1 0,0 1,0 2a1,1 0,0 0,0 2a1,1 0,1 1,0 2a1,1 0,0 1,-0.866 -0.5a1,1 0,1 0,-1.732 1a3,3 0,0 0,5.598 -1.5a3,3 0,0 0,-0.185 -1h1.185v3a1,1 0,0 0,2 0v-7a1,1 0,1 0,0 -2m-11.97,-0.757a1,1 0,1 0,1.94 -0.486l-1.757,-7.03a2.28,2.28 0,0 0,-4.425 0l-1.758,7.03a1,1 0,1 0,1.94 0.486L5.585,9h2.94ZM6.086,7l0.697,-2.787a0.292,0.292 0,0 1,0.546 0L8.026,7ZM14.056,7h1a1,1 0,0 1,1 1v1a1,1 0,0 0,2 0L18.056,8a3.003,3.003 0,0 0,-3 -3h-1a1,1 0,0 0,0 2m-4,9h-1a1,1 0,0 1,-1 -1v-1a1,1 0,0 0,-2 0v1a3.003,3.003 0,0 0,3 3h1a1,1 0,0 0,0 -2"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/drawable/prescription_document.xml b/app/src/main/res/drawable/prescription_document.xml
new file mode 100644
index 000000000..ad5279e5b
--- /dev/null
+++ b/app/src/main/res/drawable/prescription_document.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="68dp"
+    android:height="68dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M10,4C9.448,4 9,4.448 9,5V43C9,43.552 9.448,44 10,44H38C38.552,44 39,43.552 39,43V15C39,14.735 38.895,14.48 38.707,14.293L28.707,4.293C28.52,4.105 28.265,4 28,4H10ZM11,42V6H27V15C27,15.552 27.448,16 28,16H37V42H11ZM35.586,14L29,7.414V14H35.586ZM17,33H19V26H20.586L25.586,31L22.293,34.293L23.707,35.707L27,32.414L30.293,35.707L31.707,34.293L28.414,31L31.707,27.707L30.293,26.293L27,29.586L23.395,25.981C25.419,25.782 27,24.076 27,22C27,19.791 25.209,18 23,18H18C17.448,18 17,18.448 17,19V33ZM23,24H19V20H23C24.105,20 25,20.895 25,22C25,23.105 24.105,24 23,24Z"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_abortion_list.xml b/app/src/main/res/layout/activity_abortion_list.xml
new file mode 100644
index 000000000..ec0533342
--- /dev/null
+++ b/app/src/main/res/layout/activity_abortion_list.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+    <!-- Toolbar -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:background="@color/white"
+        android:orientation="horizontal">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/default_button"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark"
+                app:titleTextColor="@color/white" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <!-- Search Bar -->
+        <LinearLayout
+            android:id="@+id/searchLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/default_button"
+            android:orientation="horizontal"
+            android:padding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+
+            <EditText
+                android:id="@+id/searchView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/edit_text"
+                android:hint="@string/search"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:minHeight="48dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:textColor="@color/black"
+                android:textColorHint="@color/grey" />
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/search"
+                android:padding="12dp"
+                android:src="@drawable/ic_mic"
+                app:tint="@color/white" />
+
+        </LinearLayout>
+
+        <!-- Count Text -->
+        <TextView
+            android:id="@+id/tvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/searchLayout"
+            tools:text="42 Results" />
+
+        <!-- RecyclerView for Abortion List -->
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAbortionList"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:clipToPadding="false"
+            android:paddingBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCount"
+            tools:itemCount="5"
+            tools:listitem="@layout/rv_item_abortion" />
+
+        <!-- Empty State -->
+        <FrameLayout
+            android:id="@+id/flEmpty"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCount"
+            tools:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:alpha="0.3"
+                    android:contentDescription="@string/no_data"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/grey" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/no_abortion_records_found"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                    android:textColor="@color/grey" />
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_anc_visits.xml b/app/src/main/res/layout/activity_anc_visits.xml
new file mode 100644
index 000000000..b580a66f5
--- /dev/null
+++ b/app/src/main/res/layout/activity_anc_visits.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+    <!-- Toolbar -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:background="@color/white">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/default_button"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark"
+                app:titleTextColor="@color/white" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <!-- Search Bar -->
+        <LinearLayout
+            android:id="@+id/searchLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/default_button"
+            android:orientation="horizontal"
+            android:padding="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+
+            <EditText
+                android:id="@+id/searchView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:drawable/edit_text"
+                android:hint="@string/search"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:minHeight="48dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:textColor="@color/black"
+                android:textColorHint="@color/grey" />
+
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/search"
+                android:padding="12dp"
+                android:src="@drawable/ic_mic"
+                app:tint="@color/white" />
+
+        </LinearLayout>
+
+        <!-- Count Text -->
+        <TextView
+            android:id="@+id/tvCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/searchLayout"
+            tools:text="42 Results" />
+
+        <!-- RecyclerView for ANC Visits List -->
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvAncVisits"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:clipToPadding="false"
+            android:paddingBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCount"
+            tools:itemCount="5"
+            tools:listitem="@layout/rv_item_anc_visit" />
+
+        <!-- Empty State -->
+        <FrameLayout
+            android:id="@+id/flEmpty"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvCount"
+            tools:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:alpha="0.3"
+                    android:contentDescription="@string/no_data"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/grey" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/no_anc_eligible_women_found"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                    android:textColor="@color/grey" />
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_edit_patient_details.xml b/app/src/main/res/layout/activity_edit_patient_details.xml
index d1662f7df..7575b4033 100644
--- a/app/src/main/res/layout/activity_edit_patient_details.xml
+++ b/app/src/main/res/layout/activity_edit_patient_details.xml
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="@+id/bottom_navigation"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/nav_edit_patient"
@@ -56,7 +56,7 @@
         android:layout_height="0dp"
         android:visibility="gone"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="@+id/bottom_navigation"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintVertical_bias="0.0"
         tools:layout_editor_absoluteX="0dp" />
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 2372e0613..ace252814 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -11,7 +11,6 @@
         android:id="@+id/first"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
         tools:background="@color/white"
         android:orientation="horizontal">
 
@@ -19,7 +18,6 @@
             android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@+id/view_pager"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -40,6 +38,7 @@
                     android:layout_marginRight="10dp"
                     android:contentDescription="Refresh"
                     android:src="@drawable/share_icon"
+                    android:visibility="gone"
                     android:background="?attr/colorPrimary"/>
 
                 <ImageButton
@@ -49,7 +48,7 @@
                     android:layout_gravity="end"
                     android:layout_marginRight="15dp"
                     android:contentDescription="Translate"
-                    android:src="@drawable/ic_translate"
+                    android:src="@drawable/ic_icon_language"
                     android:background="@color/default_button"/>
 
                 <ImageButton
@@ -70,6 +69,7 @@
                     android:layout_marginRight="10dp"
                     android:contentDescription="Refresh"
                     android:src="@drawable/baseline_refresh_icon"
+                    android:visibility="gone"
                     android:background="@color/default_button"/>
 
             </androidx.appcompat.widget.Toolbar>
@@ -102,6 +102,19 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fragment_container"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            android:background="@color/white"
+            app:defaultNavHost="false"
+            app:navGraph="@navigation/register_nav"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -125,4 +138,4 @@
             android:textAppearance="@style/TextAppearance.Material3.TitleSmall" />
 
     </com.google.android.material.navigation.NavigationView>
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_register_patient.xml b/app/src/main/res/layout/activity_register_patient.xml
index eb3f56d57..5b7b20c2d 100644
--- a/app/src/main/res/layout/activity_register_patient.xml
+++ b/app/src/main/res/layout/activity_register_patient.xml
@@ -38,70 +38,46 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-<!--    <TextView-->
-<!--        android:id="@+id/header_text_register_patient"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:background="@drawable/rounded_corner_view"-->
-<!--        android:outlineProvider="none"-->
-<!--        android:layout_marginHorizontal="@dimen/margin_big"-->
-<!--        android:layout_marginVertical="@dimen/margin_big"-->
-<!--        android:text="@string/personal_details"-->
-<!--        android:textAlignment="center"-->
-<!--        android:textAppearance="@style/TextAppearance.AppCompat.Large"-->
-<!--        android:textColor="@color/white"-->
-<!--        android:textSize="32sp"-->
-<!--        android:textStyle="bold"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        tools:layout_editor_absoluteX="0dp" />-->
-
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/patient_registration"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="@+id/bottom_navigation"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintVertical_bias="1.0"
         app:navGraph="@navigation/register_nav"
         tools:layout_editor_absoluteX="0dp" />
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
+    <LinearLayout
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_nav_height"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:paddingStart="@dimen/padding_normal"
+        android:paddingEnd="@dimen/padding_normal"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <LinearLayout
-            android:id="@+id/linear_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal">
-
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_marginEnd="@dimen/padding_normal"
-                android:layout_weight="1"
-                android:backgroundTint="@color/default_button"
-                android:text="@string/cancel" />
-
-            <Button
-                android:id="@+id/btnSubmit"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_weight="1"
-                android:backgroundTint="@color/default_button"
-                android:text="@string/submit_btn_text" />
-
-        </LinearLayout>
-
-    </com.google.android.material.bottomnavigation.BottomNavigationView>
+        <Button
+            android:id="@+id/btnCancel"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/btn_height"
+            android:layout_marginEnd="@dimen/padding_normal"
+            android:layout_weight="1"
+            android:backgroundTint="@color/default_button"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/btnSubmit"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/btn_height"
+            android:layout_weight="1"
+            android:backgroundTint="@color/default_button"
+            android:text="@string/submit_btn_text" />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout >
 
diff --git a/app/src/main/res/layout/activity_sub_module.xml b/app/src/main/res/layout/activity_sub_module.xml
new file mode 100644
index 000000000..95a00c052
--- /dev/null
+++ b/app/src/main/res/layout/activity_sub_module.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+    <!-- Toolbar -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:background="@color/white">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark"
+                app:titleTextColor="@color/white"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/default_button" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_web_view.xml b/app/src/main/res/layout/activity_web_view.xml
deleted file mode 100644
index c965d3e83..000000000
--- a/app/src/main/res/layout/activity_web_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.web_view_activity.WebViewActivity">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/web_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_anc.xml b/app/src/main/res/layout/bottom_sheet_anc.xml
index 07161f2ba..10e75f9b5 100644
--- a/app/src/main/res/layout/bottom_sheet_anc.xml
+++ b/app/src/main/res/layout/bottom_sheet_anc.xml
@@ -1,19 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_anc"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:itemCount="4"
-        tools:listitem="@layout/rv_item_pregnancy_anc"/>
+        android:paddingBottom="16dp">
 
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="@color/colorAccent"
+            android:padding="16dp"
+            android:text="@string/anc_visits"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/btn_close"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:contentDescription="@string/close"
+            android:src="@drawable/ic_close"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_title"
+            app:tint="@color/white" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_anc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            tools:itemCount="3"
+            tools:listitem="@layout/rv_item_pregnancy_anc" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/bottom_sheet_anc_visits.xml b/app/src/main/res/layout/bottom_sheet_anc_visits.xml
new file mode 100644
index 000000000..5a145a170
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_anc_visits.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="ANC Visits"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+        android:textColor="@color/primary"
+        android:gravity="center"
+        android:paddingBottom="12dp"/>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_anc_visits"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_default="wrap"
+            app:layout_constraintHeight_max="400dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:itemCount="4"
+            tools:listitem="@layout/rv_item_anc_visit_simple"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_ec_visit_history.xml b/app/src/main/res/layout/bottom_sheet_ec_visit_history.xml
new file mode 100644
index 000000000..57521e5de
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_ec_visit_history.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white">
+
+    <!-- Header Section with Patient Info -->
+    <LinearLayout
+        android:id="@+id/ll_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@color/seed"
+        android:padding="@dimen/padding_normal"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <!-- Title -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/visit_history_title"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:paddingBottom="8dp"
+            android:textAppearance="@style/TextAppearance.Material3.TitleLarge" />
+
+        <!-- Patient Name -->
+        <TextView
+            android:id="@+id/tv_patient_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:text="Patient Name" />
+
+        <!-- Patient Age & Gender -->
+        <TextView
+            android:id="@+id/tv_patient_age_gender"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:alpha="0.9"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            tools:text="25 Years | Female" />
+
+    </LinearLayout>
+
+    <!-- Visit Count Section -->
+    <LinearLayout
+        android:id="@+id/ll_count_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="@dimen/padding_normal"
+        android:background="@color/gray_light"
+        app:layout_constraintTop_toBottomOf="@id/ll_header">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_calendar"
+            android:contentDescription="@string/visit_count_icon"
+            app:tint="?attr/colorPrimary" />
+
+        <TextView
+            android:id="@+id/tv_count"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="8dp"
+            android:gravity="center_vertical"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:text="3 Visits" />
+
+    </LinearLayout>
+
+    <!-- Progress Bar -->
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_marginTop="32dp"
+        android:layout_marginBottom="32dp"
+        app:layout_constraintTop_toBottomOf="@id/ll_count_section"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Empty State -->
+    <TextView
+        android:id="@+id/tv_empty_state"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:padding="32dp"
+        android:gravity="center"
+        android:text="@string/no_visits_found"
+        android:textColor="@color/text_secondary"
+        android:textSize="16sp"
+        android:drawableTop="@drawable/ic_info"
+        android:drawableTint="@color/text_secondary"
+        android:drawablePadding="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        app:layout_constraintTop_toBottomOf="@id/ll_count_section"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <!-- Visit History List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_visit_history"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="200dp"
+        android:maxHeight="500dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="16dp"
+        android:clipToPadding="false"
+        app:layout_constraintTop_toBottomOf="@id/ll_count_section"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:listitem="@layout/rv_item_ec_track" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_eligible_couple_visit_history.xml b/app/src/main/res/layout/bottom_sheet_eligible_couple_visit_history.xml
new file mode 100644
index 000000000..aa4a1fe34
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_eligible_couple_visit_history.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:maxHeight="600dp"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/visit_history"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_visit_history"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:nestedScrollingEnabled="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_title"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_ec_track" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_pnc_visits.xml b/app/src/main/res/layout/bottom_sheet_pnc_visits.xml
new file mode 100644
index 000000000..e8f461e60
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_pnc_visits.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/pnc_visits"
+        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+        android:textColor="@color/primary"
+        android:gravity="center"
+        android:paddingBottom="12dp"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_pnc_visits"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxHeight="400dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="4"
+        tools:listitem="@layout/rv_item_pnc_bottomsheet"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/case_record_custom_layout.xml b/app/src/main/res/layout/case_record_custom_layout.xml
index 40eb40f1a..53d4ab079 100644
--- a/app/src/main/res/layout/case_record_custom_layout.xml
+++ b/app/src/main/res/layout/case_record_custom_layout.xml
@@ -64,6 +64,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/chiefComplaintHeading" />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShowCphcDetails"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="@dimen/_10sdp"
+                    android:layout_marginTop="@dimen/_4sdp"
+                    android:layout_marginEnd="@dimen/_10sdp"
+                    android:text="@string/show_cphc_details"
+                    android:textAllCaps="false"
+                    android:textSize="13sp" />
+
                 <TextView
                     android:id="@+id/vitalsExtra"
                     android:layout_width="match_parent"
@@ -1102,4 +1114,4 @@
             app:layout_constraintTop_toBottomOf="@+id/investigationCard" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/cho_list_item_view.xml b/app/src/main/res/layout/cho_list_item_view.xml
index e0223b724..e5fc629d2 100644
--- a/app/src/main/res/layout/cho_list_item_view.xml
+++ b/app/src/main/res/layout/cho_list_item_view.xml
@@ -36,7 +36,7 @@
                 android:id="@+id/visit_number_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Visit No: "
+                android:text="@string/ben_visit_num"
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
@@ -59,7 +59,7 @@
                 android:id="@+id/visit_date_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Visit Date: "
+                android:text="@string/ben_visit_date"
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/cutom_number_picker.xml b/app/src/main/res/layout/cutom_number_picker.xml
index 09995d292..cb08fc57e 100644
--- a/app/src/main/res/layout/cutom_number_picker.xml
+++ b/app/src/main/res/layout/cutom_number_picker.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/duration"
-        android:layout_width="110dp"
+        android:layout_width="100dp"
         android:layout_height="match_parent"
         app:hintAnimationEnabled="false"
         app:hintEnabled="false"
@@ -33,36 +33,38 @@
             android:textColorHint="@color/black"
             android:gravity="center"
             android:inputType="number"
-            android:textSize="18sp" />
+            android:textSize="16sp" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
+    <!--    app:icon="@drawable/baseline_remove_icon"-->
+
     <TextView
         android:id="@+id/subtractButton"
-        android:layout_width="@dimen/_50sdp"
+        android:layout_width="@dimen/_45sdp"
         android:layout_height="0dp"
         android:background="@color/default_button"
-        android:gravity="center|center_vertical"
+        android:gravity="center"
         android:text="-"
         android:textColor="@color/white"
         android:textSize="@dimen/_30sdp"
+        android:includeFontPadding="false"
         app:layout_constraintBottom_toBottomOf="@+id/duration"
         app:layout_constraintEnd_toStartOf="@+id/duration"
-        app:layout_constraintTop_toTopOf="@+id/duration"
-        app:layout_constraintVertical_bias="1.0" />
-    <!--    app:icon="@drawable/baseline_remove_icon"-->
+        app:layout_constraintTop_toTopOf="@+id/duration"/>
 
     <TextView
         android:id="@+id/addButton"
-        android:layout_width="@dimen/_50sdp"
+        android:layout_width="@dimen/_45sdp"
         android:layout_height="0dp"
         android:background="@color/default_button"
         android:gravity="center"
         android:text="+"
         android:textColor="@color/white"
-        android:textSize="@dimen/_25sdp"
+        android:textSize="@dimen/_30sdp"
+        android:includeFontPadding="false"
         app:layout_constraintBottom_toBottomOf="@+id/duration"
         app:layout_constraintStart_toEndOf="@+id/duration"
-        app:layout_constraintTop_toTopOf="@+id/duration" />
+        app:layout_constraintTop_toTopOf="@+id/duration"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_radio_btns.xml b/app/src/main/res/layout/dialog_radio_btns.xml
index e243b902e..bf0a3da61 100644
--- a/app/src/main/res/layout/dialog_radio_btns.xml
+++ b/app/src/main/res/layout/dialog_radio_btns.xml
@@ -23,7 +23,18 @@
         <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/rb_kannada_dialog"
             style="@style/radio_item_lang"
+            android:visibility="gone"
             android:text="@string/kannada_lang" />
 
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/rb_hindi_dialog"
+            style="@style/radio_item_lang"
+            android:text="@string/hindi_lang" />
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/rb_assam_dialog"
+            style="@style/radio_item_lang"
+            android:text="@string/assamese" />
+
     </RadioGroup>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_abortion_action.xml b/app/src/main/res/layout/fragment_abortion_action.xml
new file mode 100644
index 000000000..3101bf048
--- /dev/null
+++ b/app/src/main/res/layout/fragment_abortion_action.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tvInfo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/fragment_abortion_list.xml b/app/src/main/res/layout/fragment_abortion_list.xml
new file mode 100644
index 000000000..62669cdfd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_abortion_list.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.home.rmncha.maternal_health.AbortionListFragment">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvAbortionList"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_abortion" />
+
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_abortion_records_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_adolescent_list.xml b/app/src/main/res/layout/fragment_adolescent_list.xml
new file mode 100644
index 000000000..b696c9ca1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_adolescent_list.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Adolescent List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvAdolescentList"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_adolescent_list" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_person"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_adolescents_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_anc_visits.xml b/app/src/main/res/layout/fragment_anc_visits.xml
new file mode 100644
index 000000000..fb0a00b4e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_anc_visits.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.home.rmncha.maternal_health.ANCVisitsFragment">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvAncVisits"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_anc_visit" />
+
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_anc_eligible_women_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_cbac.xml b/app/src/main/res/layout/fragment_cbac.xml
index 5581c9ba1..b73c2831b 100644
--- a/app/src/main/res/layout/fragment_cbac.xml
+++ b/app/src/main/res/layout/fragment_cbac.xml
@@ -190,7 +190,8 @@
                                 android:id="@+id/cbac_tv_smoke"
                                 style="@style/cbac_tv_hint_risk_assessment"
                                 android:layout_toStartOf="@+id/dd_smoke_score"
-                                android:text="@string/cbac_hint_smoke" />
+                                app:asteriskRequired="@{true}"
+                                app:hintText="@{@string/cbac_hint_smoke}" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/til_smoke_dropdown"
@@ -240,7 +241,8 @@
                                 android:id="@+id/cbac_tv_alcohol"
                                 style="@style/cbac_tv_hint_risk_assessment"
                                 android:layout_toStartOf="@+id/dd_alcohol_score"
-                                android:text="@string/cbac_hint_alcohol" />
+                                app:asteriskRequired="@{true}"
+                                app:hintText="@{@string/cbac_hint_alcohol}" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/til_alcohol_dropdown"
@@ -289,7 +291,8 @@
                                 android:id="@+id/cbac_tv_waist"
                                 style="@style/cbac_tv_hint_risk_assessment"
                                 android:layout_toStartOf="@+id/dd_waist_score"
-                                android:text="@string/cbac_hint_waist" />
+                                app:asteriskRequired="@{true}"
+                                app:hintText="@{@string/cbac_hint_waist}" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/til_waist_dropdown"
@@ -338,7 +341,8 @@
                                 android:id="@+id/cbac_tv_pa"
                                 style="@style/cbac_tv_hint_risk_assessment"
                                 android:layout_toStartOf="@+id/dd_pa_score"
-                                android:text="@string/cbac_hint_pa" />
+                                app:asteriskRequired="@{true}"
+                                app:hintText="@{@string/cbac_hint_pa}" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/til_pa_dropdown"
@@ -387,7 +391,8 @@
                                 android:id="@+id/cbac_tv_fh"
                                 style="@style/cbac_tv_hint_risk_assessment"
                                 android:layout_toStartOf="@+id/dd_fh_score"
-                                android:text="@string/cbac_hint_fh" />
+                                app:asteriskRequired="@{true}"
+                                app:hintText="@{@string/cbac_hint_fh}" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/til_fh_dropdown"
@@ -557,222 +562,222 @@
                                 android:id="@+id/cbac_recurrent_ulceration"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_ulceration}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_tingling"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_tingling}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_cloudy"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_cloudy}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_diffculty_reading"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_diffculty_reading}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_pain_eyes"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_pain_eyes}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_redness_eyes"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_redness_eyes}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_recurrent_diff_hearing"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_recurrent_diff_hearing}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
 
                             <include
                                 android:id="@+id/cbac_breath"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_breath}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_hifits"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_hifits}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_difmouth"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_difmouth}"
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_heald"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_heald}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_voice"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_voice}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Any_Growth"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Any_Growth}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Any_white"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Any_white}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Pain_while_chewing"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Pain_while_chewing}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Any_hyper_pigmented"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Any_hyper_pigmented}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_any_thickend_skin"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_any_thickend_skin}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_any_nodules_skin"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_any_nodules_skin}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Recurrent_numbness"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Recurrent_numbness}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Clawing_of_fingers"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Clawing_of_fingers}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Tingling_or_Numbness"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Tingling_or_Numbness}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Inability_close_eyelid"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Inability_close_eyelid}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_diff_holding_objects"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_diff_holding_objects}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <include
                                 android:id="@+id/cbac_Weekness_in_feet"
                                 layout="@layout/fragment_cbac_element_radio"
                                 app:fieldName="@{@string/cbac_Weekness_in_feet}"
 
-                                app:numAsterisk="@{0}" />
+                                app:numAsterisk="@{1}" />
 
                             <LinearLayout
                                 android:id="@+id/cbac_ll_ed_women"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical">
+
                                 <TextView
                                     android:id="@+id/cbac_tv_ed_2"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/cbac_early_detection_2"
                                     android:padding="@dimen/padding_normal"
+                                    android:text="@string/cbac_early_detection_2"
                                     android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
 
-
                                 <include
                                     android:id="@+id/cbac_lumpbrest"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_lumpbrest}"
 
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_nipple"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_nipple}"
 
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_breast"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_breast}"
 
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_blperiods"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_blperiods}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_blmenopause"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_blmenopause}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_blintercorse"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_blintercorse}"
 
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_fouldis"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_fouldis}"
 
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
                             </LinearLayout>
 
                             <LinearLayout
@@ -790,30 +795,29 @@
                                     android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
 
-
                                 <include
                                     android:id="@+id/cbac_unsteady"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_unsteady}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_pd_rm"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_pd_rm}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_nhop"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_nhop}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
                                 <include
                                     android:id="@+id/cbac_forget_names"
                                     layout="@layout/fragment_cbac_element_radio"
                                     app:fieldName="@{@string/cbac_forget_names}"
-                                    app:numAsterisk="@{0}" />
+                                    app:numAsterisk="@{1}" />
 
 
                             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_child_reg_list.xml b/app/src/main/res/layout/fragment_child_reg_list.xml
new file mode 100644
index 000000000..21c5bda54
--- /dev/null
+++ b/app/src/main/res/layout/fragment_child_reg_list.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="0 Results" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvChildRegList"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_child_reg" />
+
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_child"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_children_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 157ac9d64..0cfdf9eb8 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -3,24 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <androidx.core.widget.NestedScrollView
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
+        android:layout_height="match_parent">
         <LinearLayout
             android:id="@+id/dashboard_id"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            tools:background="@color/white">
+            tools:background="@color/white"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/menu_row"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                tools:background="@color/white">
+                tools:background="@color/white"
+                android:orientation="horizontal">
+
 
                 <com.google.android.material.textfield.TextInputLayout
                     style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -32,555 +31,596 @@
 
                     <AutoCompleteTextView
                         android:id="@+id/select_period"
+                        android:hint="@string/select_menu"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:hint="@string/select_menu"
-                        android:inputType="none" />
+                        android:inputType="none"
+                        />
 
                 </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:minHeight="@dimen/_100sdp">
 
-                <ImageView
-                    android:id="@+id/ivDashboard"
-                    android:layout_width="280dp"
-                    android:layout_height="300dp"
-                    android:layout_marginTop="@dimen/_100sdp"
-                    android:fitsSystemWindows="true"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/dashboard_with_icons"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+            </LinearLayout>
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clEsanjivani"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:visibility="invisible"
-                    android:layout_marginBottom="@dimen/_10sdp"
-                    app:layout_constraintBottom_toTopOf="@+id/ivDashboard"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
+            <LinearLayout
+                android:id="@+id/first_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:background="@color/white"
+                android:orientation="horizontal">
 
-                    <TextView
-                        android:id="@+id/tvLableEsanjivani"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="eSanjeevani\nCount:"
-                        android:gravity="center"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvEsValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:fontFamily="@font/roboto_medium"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableEsanjivani"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clNcd"
-                    android:layout_width="wrap_content"
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_opd"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_15sdp"
-                    android:visibility="visible"
-                    android:layout_marginBottom="-70dp"
-                    app:layout_constraintBottom_toTopOf="@+id/ivDashboard"
-                    app:layout_constraintStart_toStartOf="parent">
-
-                    <TextView
-                        android:id="@+id/tvLableNcd"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:lines="1"
-                        android:text="@string/opd_count"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/opdMaleText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_regular"
-                        android:lines="1"
-                        android:text="@string/male_opd"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_10sdp"
-                        app:layout_constraintStart_toStartOf="@+id/tvLableNcd"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableNcd" />
-
-                    <TextView
-                        android:id="@+id/opdMaleValue"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_10sdp"
-                        android:fontFamily="@font/roboto_regular"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintBottom_toBottomOf="@+id/opdMaleText"
-                        app:layout_constraintStart_toEndOf="@+id/opdMaleText"
-                        app:layout_constraintTop_toTopOf="@+id/opdMaleText" />
-
-                    <TextView
-                        android:id="@+id/opdFemaleText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_regular"
-                        android:lines="1"
-                        android:text="@string/female_opd"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_10sdp"
-                        app:layout_constraintStart_toStartOf="@+id/tvLableNcd"
-                        app:layout_constraintTop_toBottomOf="@+id/opdMaleText" />
-
-                    <TextView
-                        android:id="@+id/opdFemaleValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_10sdp"
-                        android:fontFamily="@font/roboto_regular"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintStart_toEndOf="@+id/opdFemaleText"
-                        app:layout_constraintTop_toTopOf="@+id/opdFemaleText" />
-
-                    <TextView
-                        android:id="@+id/opdOtherText"
+                        android:layout_height="match_parent"
+                        android:padding="17dp"
+
+                        >
+
+                        <TextView
+                            android:id="@+id/opdText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/opd_count"
+
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/opdMaleText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/male_opd"
+                            android:textStyle="bold"
+                            android:textSize="14dp"
+                            android:layout_below="@id/opdText"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/opdMaleValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/opdText"
+                            app:layout_constraintStart_toStartOf="parent" />
+                        <TextView
+                            android:id="@+id/opdFemaleText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/female_opd"
+                            android:textSize="14dp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/opdMaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/opdFemaleValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/opdMaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
+                        <TextView
+                            android:id="@+id/opdOtherText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/others_opd"
+                            android:textSize="14dp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/opdFemaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/opdOtherValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/opdFemaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
+
+                        <TextView
+                            android:id="@+id/opdTotalValue"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/opdOtherValue"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_esanjeevani"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    android:visibility="gone"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_regular"
-                        android:lines="1"
-                        android:text="@string/others_opd"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_10sdp"
-                        app:layout_constraintStart_toStartOf="@+id/tvLableNcd"
-                        app:layout_constraintTop_toBottomOf="@+id/opdFemaleText" />
-
-                    <TextView
-                        android:id="@+id/opdOtherValue"
+                        android:layout_height="match_parent"
+                        android:paddingTop="24dp"
+                        android:paddingBottom="24dp"
+                        android:paddingStart="15dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/tv_eSanjeevni"
+                            android:lines="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/esanjeevni"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/tv_es_count"
+                            android:lines="2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_eSanjeevni"
+
+                            android:text="Count:"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/tv_es_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_es_count"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
+                            android:text="0" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_ncd"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/_10sdp"
-                        android:fontFamily="@font/roboto_regular"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintBottom_toBottomOf="@+id/opdOtherText"
-                        app:layout_constraintStart_toEndOf="@+id/opdOtherText"
-                        app:layout_constraintTop_toTopOf="@+id/opdOtherText" />
-
-                    <TextView
-                        android:id="@+id/opdTotalValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="@+id/tvLableNcd"
-                        app:layout_constraintStart_toStartOf="@+id/tvLableNcd"
-                        app:layout_constraintTop_toBottomOf="@+id/opdOtherText" />
+                        android:layout_height="match_parent"
+                        android:padding="17dp"
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        >
 
+                        <TextView
+                            android:id="@+id/ncdText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/ncd_count"
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clHbyc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_10sdp"
-                    android:layout_marginTop="@dimen/_40sdp"
-                    android:layout_marginEnd="@dimen/_10sdp"
-                    app:layout_constraintEnd_toStartOf="@+id/ivDashboard"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/clNcd">
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/ncdMaleText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/male_opd"
+                            android:textStyle="bold"
+                            android:textSize="14dp"
+                            android:layout_below="@id/ncdText"
+                            app:layout_constraintStart_toStartOf="parent" />
 
-                    <TextView
-                        android:id="@+id/tvLableHbyc"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="@string/hbyc_count"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvHbycValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableHbyc" />
+                        <TextView
+                            android:id="@+id/ncdMaleValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/ncdText"
+                            app:layout_constraintStart_toStartOf="parent" />
+                        <TextView
+                            android:id="@+id/ncdFemaleText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/female_opd"
+                            android:textSize="14dp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/ncdMaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        <TextView
+                            android:id="@+id/ncdFemaleValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/ncdMaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
+                        <TextView
+                            android:id="@+id/ncdOtherText"
+                            android:lines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/others_opd"
+                            android:textSize="14dp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/ncdFemaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
 
+                        <TextView
+                            android:id="@+id/ncdOtherValue"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="0"
+                            android:layout_marginLeft="50dp"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            android:layout_below="@id/ncdFemaleValue"
+                            app:layout_constraintStart_toStartOf="parent" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clHbnc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/_40sdp"
-                    android:layout_marginTop="@dimen/_40sdp"
-                    app:layout_constraintEnd_toStartOf="@+id/ivDashboard"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/clHbyc">
+                        <TextView
+                            android:id="@+id/ncdTotalValue"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/ncdOtherValue"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/tvLableHbnc"
+            <LinearLayout
+                android:id="@+id/second_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:visibility="gone"
+                tools:background="@color/white"
+                android:orientation="horizontal">
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_anc"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="@string/hbnc_count"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvHbncValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableHbnc" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clImm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/ivDashboard">
+                        android:padding="@dimen/padding_wide">
 
-                    <TextView
-                        android:id="@+id/tvLableImm"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:gravity="center"
-                        android:text="@string/immunization_tv"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvImmValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableImm" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clFamily"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-50dp"
-                    android:layout_marginEnd="@dimen/_40sdp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/ivDashboard">
+                        <TextView
+                            android:id="@+id/tv_anc"
+                            android:lines="3"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/anc_count"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
-                    <TextView
-                        android:id="@+id/tvLableFamily"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:gravity="center"
-                        android:text="@string/family_count"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvFamValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableFamily" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clAnc"
-                    android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/tv_anc_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_anc"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
+                            android:text="0" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_pnc"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/_50sdp"
-                    app:layout_constraintBottom_toTopOf="@+id/clFamily"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/ivDashboard">
-
-                    <TextView
-                        android:id="@+id/tvLableAnc"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:gravity="center"
-                        android:text="@string/anc_count"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvAncValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="@font/roboto_medium"
-                        android:text="0"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLableAnc" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clPnc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/_50sdp"
-                    android:layout_marginEnd="@dimen/_20sdp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toTopOf="@+id/clAnc">
+                        android:layout_height="match_parent"
+                        android:padding="@dimen/padding_wide"
+                        android:textColor="?attr/colorOnPrimary">
 
-                    <TextView
-                        android:id="@+id/tvPnc"
+                        <TextView
+                            android:id="@+id/tv_pnc"
+                            android:lines="3"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/pnc_count"
+
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+
+                        <TextView
+                            android:id="@+id/tv_pnc_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_pnc"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal"
+                    android:visibility="gone">
+
+                    <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/pnc_count"
-                        android:fontFamily="@font/roboto_medium"
-                        android:gravity="center"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_12sdp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tvPncValue"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:fontFamily="@font/roboto_medium"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/_14sdp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvPnc"
-                        app:layout_constraintEnd_toEndOf="parent"/>
+                        android:padding="@dimen/padding_wide">
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                        <TextView
+                            android:id="@+id/tv_family"
+                            android:lines="3"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/family_count"
 
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
+                        <TextView
+                            android:id="@+id/tv_fam_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_family"
+                            android:layout_alignParentEnd="false"
+
+                            android:layout_centerHorizontal="true"
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/third_row"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:background="@color/white"
+                android:visibility="gone"
+                android:orientation="horizontal">
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_imm"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:paddingTop="24dp"
+                        android:paddingBottom="24dp"
+                        android:paddingStart="15dp"
+                        >
 
+                        <TextView
+                            android:id="@+id/tv_imm"
+                            android:lines="1"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/immunization_tv"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/tv_imm_count"
+                            android:lines="2"
 
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_imm"
 
+                            android:text="@string/count_imm"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
+                        <TextView
+                            android:id="@+id/tv_imm_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_imm_count"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
+                            android:text="0" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cv_hbnc"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:padding="@dimen/padding_wide"
+                        android:textColor="?attr/colorOnPrimary">
 
+                        <TextView
+                            android:id="@+id/tv_hbnc"
+                            android:lines="3"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/hbnc_count"
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/opdLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible"
-                    android:padding="@dimen/_15sdp"
-                    android:layout_margin="@dimen/_20sdp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/clOpd"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:minHeight="@dimen/_90sdp"
-                        android:minWidth="@dimen/_150sdp"
-                        android:layout_marginStart="-20dp"
-                        android:background="@drawable/ic_rectangle_round_corner"
-                        app:layout_constraintStart_toEndOf="@+id/cvTotalOpdCount"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintBottom_toBottomOf="parent">
-
-                        <TextView
-                            android:id="@+id/tvTitleMale"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="Male"
-                            android:layout_marginTop="@dimen/_20sdp"
-                            android:layout_marginStart="@dimen/_20sdp"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toStartOf="@+id/tvMaleCount"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/tvMaleCount"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text=": 0"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/tvTitleMale"
-                            app:layout_constraintTop_toTopOf="@+id/tvTitleMale"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvTitleMale"/>
-
-                        <TextView
-                            android:id="@+id/tvTitleFemale"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="Female"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toStartOf="@+id/tvFemaleCount"
-                            app:layout_constraintStart_toStartOf="@+id/tvTitleMale"
-                            app:layout_constraintTop_toBottomOf="@+id/tvTitleMale" />
-
-                        <TextView
-                            android:id="@+id/tvFemaleCount"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text=": 0"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/tvTitleFemale"
-                            app:layout_constraintTop_toTopOf="@+id/tvTitleFemale"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvTitleFemale"/>
-
-                        <TextView
-                            android:id="@+id/tvTitleOther"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="Other"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toStartOf="@+id/tvOtherCount"
-                            app:layout_constraintStart_toStartOf="@+id/tvTitleFemale"
-                            app:layout_constraintTop_toBottomOf="@+id/tvTitleFemale" />
-
-                        <TextView
-                            android:id="@+id/tvOtherCount"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text=": 0"
-                            android:fontFamily="@font/roboto_regular"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/_12sdp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toEndOf="@+id/tvTitleOther"
-                            app:layout_constraintTop_toTopOf="@+id/tvTitleOther"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvTitleOther"/>
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <com.google.android.material.card.MaterialCardView
-                        android:id="@+id/cvTotalOpdCount"
-                        android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/tv_hbnc_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_hbnc"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="@dimen/margin_small"
+                    android:layout_weight="1"
+                    android:backgroundTint="@android:color/holo_orange_light"
+                    android:elevation="@dimen/padding_normal"
+                    app:cardCornerRadius="@dimen/padding_normal"
+                    app:cardElevation="@dimen/padding_normal">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:minWidth="@dimen/_90sdp"
-                        android:minHeight="@dimen/_90sdp"
-                        app:cardCornerRadius="@dimen/_50sdp"
-                        app:strokeColor="@color/background_primary"
-                        app:cardBackgroundColor="@color/background_secondary"
-                        app:strokeWidth="1dp"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
+                        android:padding="@dimen/padding_wide">
+
+                        <TextView
+                            android:id="@+id/tv_hbyc"
+                            android:lines="3"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="center">
-
-                            <TextView
-                                android:id="@+id/tvOpdCountLabel"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="OPD Count:"
-                                android:fontFamily="@font/roboto_regular"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/_12sdp"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:id="@+id/tvOpdCount"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="0"
-                                android:fontFamily="@font/roboto_medium"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/_15sdp"
-                                app:layout_constraintStart_toStartOf="@+id/tvOpdCountLabel"
-                                app:layout_constraintEnd_toEndOf="@+id/tvOpdCountLabel"
-                                app:layout_constraintTop_toBottomOf="@+id/tvOpdCountLabel"/>
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </com.google.android.material.card.MaterialCardView>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                            android:layout_height="wrap_content"
+                            android:text="@string/hbyc_count"
+                            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
+                        <TextView
+                            android:id="@+id/tv_hbyc_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/tv_hbyc"
+                            android:layout_alignParentEnd="false"
+                            android:layout_centerHorizontal="true"
+                            android:text="0"
+                            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall" />
+                    </RelativeLayout>
+                </androidx.cardview.widget.CardView>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/button_row"
+                android:layout_width="match_parent"
+                android:layout_height="117dp"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:orientation="horizontal"
+                tools:background="@color/white">
+
+                <Button
+                    android:id="@+id/button"
+                    android:visibility="gone"
+                    android:layout_width="200dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Assessment Indicators" />
+
+            </LinearLayout>
+
+            <ProgressBar
+                android:id="@+id/pb_loading_aadhar_id"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:indeterminateTint="?attr/colorPrimary"
+                android:visibility="gone" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_error"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/iv_offline"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:src="@drawable/ic_offline"
+                    app:layout_constraintBottom_toTopOf="@+id/textView5"
+                    app:layout_constraintDimensionRatio="1:1"
+                    app:layout_constraintEnd_toEndOf="@+id/textView5"
+                    app:layout_constraintStart_toStartOf="@+id/textView5" />
+
+                <TextView
+                    android:id="@+id/textView5"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:padding="@dimen/padding_normal"
+                    android:text="Something went wrong !\nUnable to connect to server !\nTry again later!"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.7" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    </ScrollView>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_delivery_outcome.xml b/app/src/main/res/layout/fragment_delivery_outcome.xml
new file mode 100644
index 000000000..0502bbe0d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_delivery_outcome.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Delivery Outcome List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvDeliveryOutcome"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_delivery_outcome" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_delivered_women_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_e_pmsma_list.xml b/app/src/main/res/layout/fragment_e_pmsma_list.xml
new file mode 100644
index 000000000..0c1230104
--- /dev/null
+++ b/app/src/main/res/layout/fragment_e_pmsma_list.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.home.rmncha.maternal_health.EPmsmaListFragment">
+
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvEPmsma"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_pmsma" />
+
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_e_pmsma_women_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_ear_diagnosis_form.xml b/app/src/main/res/layout/fragment_ear_diagnosis_form.xml
new file mode 100644
index 000000000..c7175042e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_ear_diagnosis_form.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_ear_diagnosis_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_ear_diagnosis"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_elderly_health_assessment_form.xml b/app/src/main/res/layout/fragment_elderly_health_assessment_form.xml
new file mode 100644
index 000000000..ec991d084
--- /dev/null
+++ b/app/src/main/res/layout/fragment_elderly_health_assessment_form.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_elderly_health_assessment_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- ================= PATIENT INFO CARD ================= -->
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Elderly Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- ================= FORM TITLE ================= -->
+
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_elderly_health_assessment"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+        <!-- ================= FORM CONTENT ================= -->
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+        <!-- ================= BOTTOM ACTIONS ================= -->
+
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/submit"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- ================= PROGRESS ================= -->
+
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_eligible_couple_tracking.xml b/app/src/main/res/layout/fragment_eligible_couple_tracking.xml
new file mode 100644
index 000000000..1d43bd5ba
--- /dev/null
+++ b/app/src/main/res/layout/fragment_eligible_couple_tracking.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.home.rmncha.eligible_couple.EligibleCoupleTrackingFragment">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Eligible Couples Tracking List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvEligibleCouples"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_patient_ec_with_form" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_registered_couples_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 531b6918a..b28b98101 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,27 +7,37 @@
     android:layout_marginTop="50dp"
     tools:context=".ui.home_activity.HomeActivity">
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/rl_saving"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/padding_normal"
         android:visibility="gone">
 
         <ProgressBar
             android:id="@+id/pb_saving"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
+            android:layout_marginTop="@dimen/padding_normal"
+            android:text="@string/initial_setup_title"
+            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+            android:textStyle="bold" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/pb_saving"
-            android:layout_centerHorizontal="true"
-            android:padding="@dimen/padding_normal"
-            android:text="@string/loading"
-            android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
-    </RelativeLayout>
+            android:layout_marginTop="@dimen/padding_tiny"
+            android:gravity="center"
+            android:text="@string/initial_setup_subtitle"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
+
+    </LinearLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/patient_list_fragment"
@@ -62,7 +72,8 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:indeterminate="true" />
+            android:indeterminate="false"
+            android:max="100" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_infant_list.xml b/app/src/main/res/layout/fragment_infant_list.xml
new file mode 100644
index 000000000..0402a02a0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_infant_list.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <!-- Search Bar -->
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Infant List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvInfantList"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_infant_list" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_infant"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_infants_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_maternal_health_nav_host.xml b/app/src/main/res/layout/fragment_maternal_health_nav_host.xml
new file mode 100644
index 000000000..c4ae51c94
--- /dev/null
+++ b/app/src/main/res/layout/fragment_maternal_health_nav_host.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment_maternal_health"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:navGraph="@navigation/nav_maternal_health"
+        app:defaultNavHost="false" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_mental_health_screening_form.xml b/app/src/main/res/layout/fragment_mental_health_screening_form.xml
new file mode 100644
index 000000000..6dd6aca8f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_mental_health_screening_form.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_mental_health_screening_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Info Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_mental_health_screening"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            android:textSize="20sp"
+            tools:visibility="visible" />
+
+        <!-- Dynamic Form -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+
+        <!-- Bottom Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Progress -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_neonatal_outcome.xml b/app/src/main/res/layout/fragment_neonatal_outcome.xml
new file mode 100644
index 000000000..ddf24097e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_neonatal_outcome.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvForm"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="16dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@id/btnSave"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/list_item_form_input" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <Button
+        android:id="@+id/btnCancel"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:text="@string/cancel_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/btnSave"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/btnSave"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:text="@string/save_btn"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/btnCancel" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_neonatal_outcome_list.xml b/app/src/main/res/layout/fragment_neonatal_outcome_list.xml
new file mode 100644
index 000000000..d216959e3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_neonatal_outcome_list.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <!-- Search Bar -->
+    <LinearLayout
+        android:id="@+id/searchLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/default_button"
+        android:orientation="horizontal"
+        android:padding="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/searchView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@android:drawable/edit_text"
+            android:hint="@string/search"
+            android:importantForAutofill="no"
+            android:inputType="text"
+            android:minHeight="48dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textColor="@color/black"
+            android:textColorHint="@color/grey" />
+
+    </LinearLayout>
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchLayout"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Neonatal Outcome List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvNeonatalOutcome"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_neonatal_outcome" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_delivered_women_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_new_form.xml b/app/src/main/res/layout/fragment_new_form.xml
index 58966dcd1..27a8f8ac2 100644
--- a/app/src/main/res/layout/fragment_new_form.xml
+++ b/app/src/main/res/layout/fragment_new_form.xml
@@ -21,71 +21,204 @@
             android:id="@+id/cv_patient_information"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/margin_small"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
             android:backgroundTint="?attr/colorPrimary"
             android:elevation="@dimen/padding_normal"
             app:cardCornerRadius="@dimen/padding_normal"
-            app:cardElevation="@dimen/padding_normal"
-            app:layout_constraintTop_toTopOf="parent">
+            app:cardElevation="@dimen/padding_normal">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:id="@+id/tv_ben_name"
-                    android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <!-- Row 1: Name and Age/Gender -->
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="start|center_vertical"
+                        android:paddingEnd="@dimen/padding_small"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end|center_vertical"
+                        android:paddingStart="@dimen/padding_small"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <!-- Row 2: Case ID -->
+                <LinearLayout
+                    android:id="@+id/ll_case_id_row"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:padding="@dimen/padding_normal"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                    android:textColor="@android:color/white"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
+                    android:layout_marginTop="@dimen/padding_small"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/do_case_id"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@android:color/white" />
+                    <TextView
+                        android:id="@+id/tv_case_id"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="4dp"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@android:color/white"
+                        tools:text="patient-uuid-here" />
+                </LinearLayout>
+
+                <!-- Row 3: View ANC History -->
                 <TextView
-                    android:id="@+id/tv_age_gender"
+                    android:id="@+id/tv_view_anc_history"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:padding="@dimen/padding_normal"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/padding_small"
+                    android:visibility="gone"
+                    android:text="@string/do_view_anc_history"
                     android:textColor="@android:color/white"
-                    app:layout_constraintEnd_toEndOf="parent" />
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    tools:visibility="visible" />
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
         </androidx.cardview.widget.CardView>
 
-        <FrameLayout
+        <TextView
+            android:id="@+id/tv_form_title"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:visibility="gone"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:text="Delivery Outcome"
+            tools:visibility="visible" />
 
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fillViewport="true">
 
-            <include
-                android:id="@+id/form"
-                layout="@layout/rv_input_form"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/fab_edit"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
-                android:layout_marginEnd="@dimen/padding_wide"
-                android:layout_marginBottom="@dimen/padding_wide"
-                android:contentDescription="@string/edit"
-                android:visibility="gone"
-                app:srcCompat="@drawable/ic_edit"
-                tools:visibility="visible" />
-
-        </FrameLayout>
+                android:orientation="vertical">
+
+                <include
+                    android:id="@+id/form"
+                    layout="@layout/rv_input_form"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <!-- ANTRA Injection Details Section (visible only in view mode with ANTRA history) -->
+                <LinearLayout
+                    android:id="@+id/ll_antra_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:padding="@dimen/padding_normal">
+
+                    <!-- ANTRA Injection Details Table -->
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="ANTRA Injection Details"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="?attr/colorOnSurface"
+                        android:layout_marginBottom="@dimen/margin_small" />
+
+                    <HorizontalScrollView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <TableLayout
+                            android:id="@+id/table_antra_history"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:stretchColumns="*"
+                            android:background="@android:color/white"
+                            android:padding="8dp">
+
+                            <!-- Table Header -->
+                            <TableRow
+                                android:background="?attr/colorPrimary"
+                                android:padding="8dp">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:text="Dose"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold"
+                                    android:padding="8dp"
+                                    android:gravity="center" />
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:text="Injection Date"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold"
+                                    android:padding="8dp"
+                                    android:gravity="center" />
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:text="Next Due Date"
+                                    android:textColor="@android:color/white"
+                                    android:textStyle="bold"
+                                    android:padding="8dp"
+                                    android:gravity="center" />
+
+                            </TableRow>
+                        </TableLayout>
+
+                    </HorizontalScrollView>
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/fab_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="@dimen/padding_wide"
+            android:layout_marginBottom="@dimen/padding_wide"
+            android:contentDescription="@string/edit"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_edit"
+            tools:visibility="visible" />
 
         <Space
             android:layout_width="397dp"
@@ -100,6 +233,7 @@
             android:layout_gravity="center_horizontal|bottom"
             android:layout_margin="@dimen/margin_small"
             android:text="@string/btn_submit"
+            android:visibility="gone"
             android:textColor="@android:color/white" />
 
 
diff --git a/app/src/main/res/layout/fragment_nose_diagnosis_form.xml b/app/src/main/res/layout/fragment_nose_diagnosis_form.xml
new file mode 100644
index 000000000..b27f94a3f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_nose_diagnosis_form.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_nose_diagnosis_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Information Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_nose_diagnosis"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+        <!-- Dynamic Form -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+        <!-- Bottom Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Loader -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_ophthalmic_screening.xml b/app/src/main/res/layout/fragment_ophthalmic_screening.xml
new file mode 100644
index 000000000..f763d0f29
--- /dev/null
+++ b/app/src/main/res/layout/fragment_ophthalmic_screening.xml
@@ -0,0 +1,800 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="org.piramalswasthya.cho.ui.ophthalmic_screening.OphthalmicScreeningViewModel" />
+        <import type="android.view.View"/>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:fillViewport="true"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/ll_bottom_navigation"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/cv_patient_information"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/margin_normal"
+                android:backgroundTint="?attr/colorPrimary"
+                android:elevation="@dimen/padding_normal"
+                app:cardCornerRadius="@dimen/padding_normal"
+                app:cardElevation="@dimen/padding_normal"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="@dimen/padding_normal"
+                        android:text="@{viewModel.benName}"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:padding="@dimen/padding_normal"
+                        android:text="@{viewModel.benAgeGender}"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        tools:text="36 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <LinearLayout
+                android:id="@+id/ll_screening_module"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ophthalmic_is_diabetic"
+                    android:textColor="@color/black"
+                    android:layout_marginBottom="8dp"/>
+
+                <RadioGroup
+                    android:id="@+id/rg_is_diabetic"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="16dp">
+
+                    <RadioButton
+                        android:id="@+id/rb_diabetic_yes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/yes"
+                        android:onClick="@{() -> viewModel.setDiabeticStatus(true)}"
+                        android:layout_marginEnd="16dp"/>
+
+                    <RadioButton
+                        android:id="@+id/rb_diabetic_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/no"
+                        android:onClick="@{() -> viewModel.setDiabeticStatus(false)}"/>
+                </RadioGroup>
+
+                <LinearLayout
+                    android:id="@+id/ll_screening_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_screening_performed"
+                        android:textColor="@color/black"
+                        android:layout_marginBottom="8dp"/>
+
+                    <RadioGroup
+                        android:id="@+id/rg_screening_performed"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="16dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_screening_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:onClick="@{() -> viewModel.setScreeningPerformed(true)}"
+                            android:layout_marginEnd="16dp"/>
+
+                        <RadioButton
+                            android:id="@+id/rb_screening_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no"
+                            android:onClick="@{() -> viewModel.setScreeningPerformed(false)}"/>
+                    </RadioGroup>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_chart_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_chart_used"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_chart_used"
+                            android:inputType="none"
+                            android:text="@{viewModel.chartUsed}"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_dist_va_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_dist_va_right"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_dist_va_right"
+                            android:inputType="none"
+                            android:text="@{viewModel.distVARight}"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_dist_va_left"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_dist_va_left"
+                            android:inputType="none"
+                            android:text="@{viewModel.distVALeft}"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_near_va_section"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_near_va"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_near_va"
+                            android:inputType="none"
+                            android:text="@{viewModel.nearVA}"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_visual_impairment_alert"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/ophthalmic_visual_impairment_alert"
+                android:textColor="@color/color_error_text"
+                android:textStyle="bold"
+                android:padding="8dp"
+                android:background="@color/color_error_bg"
+                android:visibility="@{viewModel.showVisualImpairmentAlert ? View.VISIBLE : View.GONE}"
+                android:layout_marginBottom="16dp"/>
+
+            <LinearLayout
+                android:id="@+id/ll_case_id_module"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="@{viewModel.showCaseIdSection ? View.VISIBLE : View.GONE}">
+
+                <TextView
+                    android:id="@+id/tv_case_id_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.isCaseIdMandatory ? @string/ophthalmic_case_id_conditions_mandatory : @string/ophthalmic_case_id_conditions}"
+                    android:textColor="@color/black"
+                    android:layout_marginBottom="8dp"/>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/tv_case_id_selection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/select_conditions"
+                        android:inputType="none"
+                        android:focusable="true"
+                        android:clickable="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+            </LinearLayout>
+
+            <!-- Condition sub-fields — shown/hidden by Fragment observers -->
+            <LinearLayout
+                android:id="@+id/ll_condition_subfields"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="@{viewModel.showCaseIdSection ? View.VISIBLE : View.GONE}">
+
+                <!-- Cataract -->
+                <LinearLayout
+                    android:id="@+id/ll_cataract_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_cataract_symptoms"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_cataract_symptoms"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_cataract_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_cataract_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_cataract_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Glaucoma -->
+                <LinearLayout
+                    android:id="@+id/ll_glaucoma_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_glaucoma_symptoms"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_glaucoma_symptoms"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_glaucoma_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_glaucoma_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_glaucoma_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Diabetic retinopathy -->
+                <LinearLayout
+                    android:id="@+id/ll_dr_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_dr_symptoms"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_dr_symptoms"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_dr_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_dr_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_dr_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Presbyopia -->
+                <LinearLayout
+                    android:id="@+id/ll_presbyopia_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_presbyopia_symptoms"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_presbyopia_symptoms"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_presbyopia_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_presbyopia_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_presbyopia_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_presbyopia_management"
+                        android:textColor="@color/color_info_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_info_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Trachoma -->
+                <LinearLayout
+                    android:id="@+id/ll_trachoma_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_trachoma_status"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_trachoma_status"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_select_trachoma_status"
+                            android:inputType="none" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <TextView
+                        android:id="@+id/tv_trachoma_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Corneal disease -->
+                <LinearLayout
+                    android:id="@+id/ll_corneal_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_corneal_disease_type"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_corneal_disease_type"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_select_corneal_disease_type"
+                            android:inputType="none" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <TextView
+                        android:id="@+id/tv_corneal_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <!-- Dry eye / Vitamin A -->
+                <LinearLayout
+                    android:id="@+id/ll_vitamin_a_subfield"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_vitamin_a_deficiency_label"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_vitamin_a_deficiency"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_vitamin_a_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_vitamin_a_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_vitamin_a_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_vitamin_a"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+
+            <LinearLayout
+                android:id="@+id/ll_injury_trauma_module"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ophthalmic_injury_trauma_title"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:layout_marginBottom="16dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/ophthalmic_injury_type_label"
+                    android:textColor="@color/black"
+                    android:layout_marginBottom="8dp"/>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/tv_injury_type_selection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/ophthalmic_select_injury_type"
+                        android:inputType="none"
+                        android:focusable="true"
+                        android:clickable="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_foreign_body_removal_field"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/actv_foreign_body_removal"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/ophthalmic_foreign_body_removal_attempted"
+                            android:inputType="none" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <TextView
+                        android:id="@+id/tv_foreign_body_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_chemical_exposure_field"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_chemical_exposure_wash_performed"
+                        android:textColor="@color/black"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginBottom="4dp" />
+
+                    <RadioGroup
+                        android:id="@+id/rg_chemical_exposure"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="4dp">
+
+                        <RadioButton
+                            android:id="@+id/rb_chemical_exposure_yes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/yes"
+                            android:layout_marginEnd="16dp" />
+
+                        <RadioButton
+                            android:id="@+id/rb_chemical_exposure_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/no" />
+                    </RadioGroup>
+
+                    <TextView
+                        android:id="@+id/tv_chemical_exposure_alert"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/ophthalmic_alert_ophthalmologist_referral"
+                        android:textColor="@color/color_error_text"
+                        android:textStyle="bold"
+                        android:padding="8dp"
+                        android:background="@color/color_error_bg"
+                        android:visibility="gone"
+                        android:layout_marginBottom="8dp" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+        </ScrollView>
+
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/color_error_text"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_next"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/layout/fragment_oral_health_form.xml b/app/src/main/res/layout/fragment_oral_health_form.xml
new file mode 100644
index 000000000..7a3cd600e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_oral_health_form.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_oral_health_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/button_danger"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminateTint="?attr/colorPrimary"
+        android:visibility="gone" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_pain_symptom_assessment_form.xml b/app/src/main/res/layout/fragment_pain_symptom_assessment_form.xml
new file mode 100644
index 000000000..99876153e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pain_symptom_assessment_form.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_pain_symptom_assessment_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Info Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_pain_symptom_assessment"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+        <!-- Dynamic Form -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+        <!-- Bottom Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Progress -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_patient_details.xml b/app/src/main/res/layout/fragment_patient_details.xml
index bbecd0fdc..5d5a59a07 100644
--- a/app/src/main/res/layout/fragment_patient_details.xml
+++ b/app/src/main/res/layout/fragment_patient_details.xml
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:scrollbars="none"
     tools:context=".ui.register_patient_activity.patient_details.PatientDetailsFragment">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_margin="8dp"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_margin="8dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_ri"
             android:layout_width="match_parent"
@@ -101,12 +104,10 @@
                 android:id="@+id/first_name"
                 android:layout_width="match_parent"
                 android:textSize="18sp"
-                android:inputType="textCapCharacters"
-                android:capitalize="characters"
+                android:inputType="textCapWords"
                 android:imeOptions="actionDone"
                 android:drawableEnd="@null"
-                android:layout_height="wrap_content"
-                android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZ" />
+                android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -117,7 +118,6 @@
             android:textSize="18sp"
             app:endIconMode="custom"
             app:endIconDrawable="@drawable/ic_mic"
-            android:textColorHint="#888888"
             android:hint="@string/last_name_surname">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -126,10 +126,8 @@
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
                 android:imeOptions="actionDone"
-                android:drawableEnd="@null"
-                android:capitalize="characters"
-                android:inputType="textCapCharacters"
-                android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
+                android:inputType="textCapWords"
+                android:drawableEnd="@null" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -142,11 +140,13 @@
             android:hint="@string/gender"
             android:layout_height="wrap_content">
 
-            <AutoCompleteTextView
+            <com.google.android.material.textfield.MaterialAutoCompleteTextView
                 android:id="@+id/gender_dropdown"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="none"
+                android:layout_height="match_parent"
+                android:focusable="true"
+                android:cursorVisible="false"
+                android:inputType="text"
                 android:textSize="18sp"
                 android:textColorHint="#888888"/>
         </com.google.android.material.textfield.TextInputLayout>
@@ -158,6 +158,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_normal"
             android:textSize="18sp"
+            app:endIconMode="custom"
+            app:endIconDrawable="@drawable/ic_calendar"
             android:textColorHint="#888888"
             android:hint="@string/date_of_birth">
 
@@ -167,8 +169,7 @@
                 android:inputType="text"
                 android:focusable="false"
                 android:textSize="18sp"
-                android:layout_height="wrap_content"
-                android:drawableEnd="@drawable/ic_calendar"/>
+                android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/age_text"
@@ -176,7 +177,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_normal"
             android:textSize="18sp"
-            android:textColorHint="#888888"
             android:hint="@string/age">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -221,9 +221,6 @@
             android:textSize="18sp"
             app:endIconMode="custom"
             app:endIconDrawable="@drawable/ic_mic"
-            android:maxLength="2"
-            android:inputType="number"
-            android:textColorHint="#888888"
             android:hint="@string/phone_number">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -248,11 +245,13 @@
             android:hint="@string/marital_status"
             android:layout_height="wrap_content">
 
-            <AutoCompleteTextView
+            <com.google.android.material.textfield.MaterialAutoCompleteTextView
                 android:id="@+id/marital_status_dropdown"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:inputType="none"
+                android:focusable="true"
+                android:cursorVisible="false"
+                android:inputType="text"
                 android:textSize="18sp"
                 android:textColorHint="#888888"/>
         </com.google.android.material.textfield.TextInputLayout>
@@ -305,6 +304,27 @@
                 android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
 
+        <!-- Status of Woman Dropdown -->
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/status_of_woman_text"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            android:layout_width="match_parent"
+            android:layout_marginTop="@dimen/margin_normal"
+            android:textSize="18sp"
+            android:visibility="gone"
+            android:hint="@string/status_of_woman"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                android:id="@+id/status_of_woman_dropdown"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:focusable="true"
+                android:cursorVisible="false"
+                android:inputType="text"
+                android:textSize="18sp"
+                android:textColorHint="#888888"/>
+        </com.google.android.material.textfield.TextInputLayout>
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/father_name_text"
             android:layout_width="match_parent"
@@ -322,11 +342,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
+                android:inputType="textCapWords"
                 android:imeOptions="actionDone"
-                android:capitalize="characters"
-                android:drawableEnd="@null"
-                android:inputType="textCapCharacters"
-                android:digits="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
+                android:drawableEnd="@null" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
@@ -353,5 +371,17 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/bottom_space_height" />
 
-    </LinearLayout>
-</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_edit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_edit"
+        android:contentDescription="Edit" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_pharmacist_form.xml b/app/src/main/res/layout/fragment_pharmacist_form.xml
index 71e75e39c..544a50a7c 100644
--- a/app/src/main/res/layout/fragment_pharmacist_form.xml
+++ b/app/src/main/res/layout/fragment_pharmacist_form.xml
@@ -67,7 +67,7 @@
                     android:lines="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/visit_code"
+                    android:text="@string/patient_details_label"
                     android:textColor="@color/white"
                     android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/fragment_pnc_mother_list.xml b/app/src/main/res/layout/fragment_pnc_mother_list.xml
new file mode 100644
index 000000000..b7ddbbe50
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pnc_mother_list.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ui.home.rmncha.maternal_health.PNCMotherListFragment">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for PNC Mothers List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvPncMothers"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_pnc_mother" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_pnc_mothers_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_pregnancy_registration_form.xml b/app/src/main/res/layout/fragment_pregnancy_registration_form.xml
new file mode 100644
index 000000000..5ed931e3b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pregnancy_registration_form.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_pregnancy_registration_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:orientation="vertical"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Information Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:backgroundTint="?attr/colorPrimary"
+            android:elevation="@dimen/padding_normal"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <!-- Row 1: Name and Age/Gender -->
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="start|center_vertical"
+                        android:paddingEnd="@dimen/padding_small"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end|center_vertical"
+                        android:paddingStart="@dimen/padding_small"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:text="25 Years | Female" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <!-- Row 2: Case ID -->
+                <LinearLayout
+                    android:id="@+id/ll_case_id_row"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/padding_small"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/do_case_id"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@android:color/white" />
+                    <TextView
+                        android:id="@+id/tv_case_id"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="4dp"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@android:color/white"
+                        tools:text="patient-uuid-here" />
+                </LinearLayout>
+
+                <!-- Row 3: View ANC History -->
+                <TextView
+                    android:id="@+id/tv_view_anc_history"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/padding_small"
+                    android:visibility="gone"
+                    android:text="@string/do_view_anc_history"
+                    android:textColor="@android:color/white"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/pwr"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:visibility="gone"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:text="Pregnancy Registration"
+            tools:visibility="visible" />
+
+        <!-- Form Content -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <!-- Edit FAB -->
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/fab_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:layout_marginEnd="@dimen/padding_wide"
+                android:layout_marginBottom="@dimen/padding_wide"
+                android:contentDescription="@string/edit"
+                android:visibility="gone"
+                app:srcCompat="@drawable/ic_edit"
+                tools:visibility="visible" />
+
+        </FrameLayout>
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/bottom_space_height"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/form" />
+
+        <!-- Bottom Navigation with Cancel and Next Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_margin="@dimen/margin_small"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/padding_normal"
+            android:paddingEnd="@dimen/padding_normal">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:layout_weight="1"
+                android:backgroundTint="@color/button_danger"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/green"
+                android:text="@string/submit"
+                android:visibility="visible"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Progress Bar -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminateTint="?attr/colorPrimary"
+        android:visibility="gone" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_pregnant_women_registration.xml b/app/src/main/res/layout/fragment_pregnant_women_registration.xml
new file mode 100644
index 000000000..5f61ef776
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pregnant_women_registration.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <!-- Reusable Search Bar with Voice + Camera -->
+    <include
+        android:id="@+id/searchBarInclude"
+        layout="@layout/include_search_bar_with_camera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!-- Count Text -->
+    <TextView
+        android:id="@+id/tvCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/searchBarInclude"
+        tools:text="42 Results" />
+
+    <!-- RecyclerView for Pregnant Women List -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvPregnantWomen"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:itemCount="5"
+        tools:listitem="@layout/rv_item_pregnant_woman" />
+
+    <!-- Empty State -->
+    <FrameLayout
+        android:id="@+id/flEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvCount"
+        tools:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:alpha="0.3"
+                android:contentDescription="@string/no_data"
+                android:src="@drawable/ic_female"
+                app:tint="@color/grey" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/no_pregnant_women_found"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/grey" />
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_psychosocial_caregiver_support_form.xml b/app/src/main/res/layout/fragment_psychosocial_caregiver_support_form.xml
new file mode 100644
index 000000000..a77f54572
--- /dev/null
+++ b/app/src/main/res/layout/fragment_psychosocial_caregiver_support_form.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_psychosocial_caregiver_support_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Info Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_psychosocial_caregiver_support"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+        <!-- Dynamic Form -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+        <!-- Bottom Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/submit"
+                android:textColor="@android:color/white" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Progress -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register_patient.xml b/app/src/main/res/layout/fragment_register_patient.xml
index 48c0e8f13..a301d5b01 100644
--- a/app/src/main/res/layout/fragment_register_patient.xml
+++ b/app/src/main/res/layout/fragment_register_patient.xml
@@ -29,42 +29,35 @@
         app:navGraph="@navigation/register_nav"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="@+id/bottom_navigation"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintTop_toBottomOf="@+id/header_text_register_patient" />
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
+    <LinearLayout
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottom_nav_height"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:paddingStart="@dimen/padding_normal"
+        android:paddingEnd="@dimen/padding_normal"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <LinearLayout
-            android:id="@+id/linear_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal">
-
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_marginEnd="@dimen/padding_normal"
-                android:layout_weight="1"
-                android:backgroundTint="@color/default_button"
-                android:text="@string/cancel" />
-
-            <Button
-                android:id="@+id/btnSubmit"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_weight="1"
-                android:backgroundTint="@color/default_button"
-                android:text="Next" />
-
-        </LinearLayout>
-
-    </com.google.android.material.bottomnavigation.BottomNavigationView>
+        <Button
+            android:id="@+id/btnCancel"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/btn_height"
+            android:layout_marginEnd="@dimen/padding_normal"
+            android:layout_weight="1"
+            android:backgroundTint="@color/default_button"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/btnSubmit"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/btn_height"
+            android:layout_weight="1"
+            android:backgroundTint="@color/default_button"
+            android:text="Next" />
+
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout >
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_throat_diagnosis_form.xml b/app/src/main/res/layout/fragment_throat_diagnosis_form.xml
new file mode 100644
index 000000000..4086b993e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_throat_diagnosis_form.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment_throat_diagnosis_form"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/ll_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="?attr/colorOnSecondary"
+        android:backgroundTint="?attr/colorOnSecondary"
+        android:padding="@dimen/padding_normal">
+
+        <!-- Patient Information Card -->
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_patient_information"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_big"
+            android:layout_marginBottom="@dimen/margin_small"
+            android:backgroundTint="?attr/colorPrimary"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="@dimen/padding_normal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/padding_normal">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/tv_ben_name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/tv_age_gender"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="Patient Name" />
+
+                    <TextView
+                        android:id="@+id/tv_age_gender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="@android:color/white"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        tools:text="65 Years | Male" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- Form Title -->
+        <TextView
+            android:id="@+id/tv_form_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:text="@string/title_throat_diagnosis"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            tools:visibility="visible" />
+
+        <!-- Dynamic Form -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <include
+                android:id="@+id/form"
+                layout="@layout/rv_input_form"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+        <!-- Bottom Buttons -->
+        <LinearLayout
+            android:id="@+id/ll_bottom_navigation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_small"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:layout_marginEnd="@dimen/padding_normal"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/cancel"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/btn_submit"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/btn_height"
+                android:layout_weight="1"
+                android:backgroundTint="@color/default_button"
+                android:text="@string/next"
+                android:textColor="@android:color/white" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!-- Loader -->
+    <ProgressBar
+        android:id="@+id/pb_form"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateTint="?attr/colorPrimary" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_username.xml b/app/src/main/res/layout/fragment_username.xml
index 2f080c561..b9c3897fe 100644
--- a/app/src/main/res/layout/fragment_username.xml
+++ b/app/src/main/res/layout/fragment_username.xml
@@ -95,7 +95,17 @@
                     <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/rb_kannada"
                         style="@style/radio_item_lang"
+                        android:text="@string/kannada_lang" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/rb_hindi"
+                        style="@style/radio_item_lang"
                         android:text="@string/hindi_lang" />
+
+                    <com.google.android.material.radiobutton.MaterialRadioButton
+                        android:id="@+id/rb_assam"
+                        style="@style/radio_item_lang"
+                        android:text="@string/assamese" />
 <!--                    android:text="@string/kannada_lang"-->
                 </RadioGroup>
 
@@ -180,6 +190,8 @@
                     android:textAppearance="@style/TextAppearance.Material3.LabelMedium"
                     android:textColor="@color/black"
                     android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textAlignment="center"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_vitals_custom.xml b/app/src/main/res/layout/fragment_vitals_custom.xml
index f70722f52..e1557a4b2 100644
--- a/app/src/main/res/layout/fragment_vitals_custom.xml
+++ b/app/src/main/res/layout/fragment_vitals_custom.xml
@@ -318,7 +318,7 @@
                 app:helperText="@string/required"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/respiratoryEditTxt">
+                app:layout_constraintTop_toBottomOf="@+id/barrier_resp_spo2">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/inputRBS"
@@ -503,6 +503,14 @@
                 app:layout_constraintTop_toTopOf="@+id/ivBmiBg" />
 
 
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier_resp_spo2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="respiratoryEditTxt,spo2EditTxt" />
+
+
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/verticalGuideline"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_web_view.xml b/app/src/main/res/layout/fragment_web_view.xml
deleted file mode 100644
index 80b2291a3..000000000
--- a/app/src/main/res/layout/fragment_web_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="4dp">
-
-<!--        <TextView-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:layout_alignParentEnd="true"-->
-<!--            android:background="@color/purple"-->
-<!--            android:padding="16dp"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/app_title"-->
-<!--            android:textColor="#FFFFFF"-->
-<!--            app:layout_constraintBottom_toBottomOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent" />-->
-
-        <WebView
-            android:id="@+id/webview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-<!--        <Button-->
-<!--            android:id="@+id/back_btn"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_margin="4dp"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            android:text="Back To Previous Screen"-->
-<!--            app:layout_constraintTop_toBottomOf="@id/webview"/>-->
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_search_bar_with_camera.xml b/app/src/main/res/layout/include_search_bar_with_camera.xml
new file mode 100644
index 000000000..f7653aac0
--- /dev/null
+++ b/app/src/main/res/layout/include_search_bar_with_camera.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Reusable search bar with voice (mic) and camera (face search) icons.
+     Use via <include layout="@layout/include_search_bar_with_camera" /> -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/searchLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:layout_marginTop="10dp"
+    android:padding="@dimen/_8sdp"
+    android:gravity="center_vertical">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/search_til"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        app:endIconMode="custom"
+        app:boxCornerRadiusTopStart="20dp"
+        app:boxCornerRadiusTopEnd="20dp"
+        app:boxCornerRadiusBottomStart="20dp"
+        app:boxCornerRadiusBottomEnd="20dp"
+        app:boxStrokeWidth="2dp"
+        app:endIconDrawable="@drawable/ic_mic"
+        android:textColorHint="#888888"
+        android:hint="@string/query_hint_patient_search">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/search"
+            android:layout_width="match_parent"
+            android:inputType="text"
+            android:drawableStart="@drawable/ic_search"
+            android:imeOptions="actionDone"
+            android:singleLine="true"
+            android:layout_height="wrap_content" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <ImageButton
+        android:id="@+id/camera_icon"
+        android:layout_width="30dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginLeft="10dp"
+        android:layout_height="30dp"
+        android:contentDescription="@string/cd_camera_search"
+        android:background="@drawable/camera_icon_grey" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_api_search_patient.xml b/app/src/main/res/layout/item_api_search_patient.xml
index 484f22d59..1d7a7f1e8 100644
--- a/app/src/main/res/layout/item_api_search_patient.xml
+++ b/app/src/main/res/layout/item_api_search_patient.xml
@@ -28,14 +28,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:weightSum="2">
+            android:weightSum="3">
 
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_weight="1">
+                android:layout_weight="1.7">
                 <!-- Beneficiary ID -->
                 <TextView
                     android:id="@+id/tvBenId"
@@ -61,7 +61,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_weight="1">
+                android:layout_weight="1.3">
                 <!-- Age -->
                 <TextView
                     android:id="@+id/tvAge"
@@ -78,7 +78,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
-                    android:text="Mobile No."
+                    android:text="Mo No."
                     android:textColor="@android:color/darker_gray"
                     android:textSize="14sp" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/layout_batch.xml b/app/src/main/res/layout/layout_batch.xml
index 653943be1..07fadbea9 100644
--- a/app/src/main/res/layout/layout_batch.xml
+++ b/app/src/main/res/layout/layout_batch.xml
@@ -26,7 +26,7 @@
         <TextView
             android:id="@+id/tv_batch_no"
             android:layout_width="wrap_content"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:text="Batch No: 2345"
             android:textStyle="bold"
             android:textSize="14sp" />
@@ -34,7 +34,7 @@
         <TextView
             android:id="@+id/tv_quantity_in_hand"
             android:layout_width="wrap_content"
-            android:layout_height="24dp"
+            android:layout_height="wrap_content"
             android:text="In Hand: 999"
             android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/layout_media_options.xml b/app/src/main/res/layout/layout_media_options.xml
new file mode 100644
index 000000000..542d724ab
--- /dev/null
+++ b/app/src/main/res/layout/layout_media_options.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_corner_view"
+    android:backgroundTint="@color/white"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp"
+        android:text="@string/select_image_source"
+        android:textColor="@android:color/black"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/btnGallery"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/gallery" />
+
+    <Button
+        android:id="@+id/btnCamera"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/camera" />
+
+    <Button
+        android:id="@+id/btnPdf"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/pick_pdf" />
+
+    <Button
+        android:id="@+id/btnCancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_upload_form.xml b/app/src/main/res/layout/layout_upload_form.xml
new file mode 100644
index 000000000..b130d55d9
--- /dev/null
+++ b/app/src/main/res/layout/layout_upload_form.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="form"
+            type="org.piramalswasthya.cho.model.FormElement" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.FormInputAdapter.SelectUploadImageClickListener" />
+        <variable
+            name="documentclickListener"
+            type="org.piramalswasthya.cho.adapter.FormInputAdapter.ViewDocumentOnClick" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_ri"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/padding_wide">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="@dimen/_150sdp"
+            android:layout_height="wrap_content"
+            android:text="@{form.title}"
+            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            android:ellipsize="end"
+
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:maxLines="3"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Upload File" />
+
+
+        <ImageView
+            android:id="@+id/add_file"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/ic_doc_upload"
+            android:contentDescription="@string/add_file"
+            android:onClick="@{()->clickListener.onSelectImageClick(form)}"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_view"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginEnd="10dp"
+            android:layout_marginStart="10dp"
+            android:text="@string/view"
+            android:visibility="gone"
+            android:onClick="@{()->documentclickListener.onViewDocumentClick(form)}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/add_file"
+
+            app:layout_constraintTop_toTopOf="parent"
+            android:textColor="@android:color/white" />
+
+        <ImageView
+            android:id="@+id/iv"
+            benImage="@{form.value}"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:visibility="gone"
+            android:background="@drawable/bg_circular"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_title"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header_home.xml b/app/src/main/res/layout/nav_header_home.xml
index fc2d3594a..353da5ddf 100644
--- a/app/src/main/res/layout/nav_header_home.xml
+++ b/app/src/main/res/layout/nav_header_home.xml
@@ -16,6 +16,7 @@
         android:layout_centerVertical="true"
         android:background="@drawable/bg_circular"
         android:padding="@dimen/padding_tiny"
+        android:visibility="gone"
         android:contentDescription="@string/nav_header_desc"
         app:srcCompat="@drawable/ic_person" />
 
@@ -32,14 +33,35 @@
             android:id="@+id/tv_nav_name"
             style="@style/nav_header_item_tv"
             />
+        <TextView
+            android:id="@+id/tv_nav_facilityName"
+            style="@style/nav_header_item_tv"
+            />
+        <TextView
+            android:id="@+id/tv_nav_employeeId"
+            style="@style/nav_header_item_tv"
+            />
+        <TextView
+            android:id="@+id/tv_nav_facilityId"
+            style="@style/nav_header_item_tv"
+            />
+        <TextView
+            android:id="@+id/tv_nav_location_type"
+            style="@style/nav_header_item_tv"
+            />
 
         <TextView
             android:id="@+id/tv_nav_role"
+            android:visibility="gone"
             style="@style/nav_header_item_tv" />
 
         <TextView
             android:id="@+id/tv_nav_id"
             style="@style/nav_header_item_tv" />
 
+        <TextView
+            android:id="@+id/tv_nav_contact_no"
+            style="@style/nav_header_item_tv" />
+
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/patient_card_skeleton_item.xml b/app/src/main/res/layout/patient_card_skeleton_item.xml
new file mode 100644
index 000000000..d6319607b
--- /dev/null
+++ b/app/src/main/res/layout/patient_card_skeleton_item.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_normal"
+        android:layout_marginHorizontal="@dimen/margin_big"
+        android:layout_marginVertical="@dimen/custom_ui_margin"
+        android:elevation="@dimen/padding_normal"
+        app:cardCornerRadius="@dimen/padding_normal"
+        app:cardElevation="@dimen/padding_normal">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl_skeleton_sync"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:padding="@dimen/_5sdp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <LinearLayout
+                    android:id="@+id/skeleton_name_wrapper"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toStartOf="@+id/skeleton_sync_icon"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <View
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:background="@drawable/bg_skeleton_header_circle" />
+
+                    <View
+                        android:layout_width="120dp"
+                        android:layout_height="@dimen/_14sdp"
+                        android:layout_gravity="center"
+                        android:layout_marginStart="@dimen/_5sdp"
+                        android:background="@drawable/bg_skeleton_header_block" />
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/skeleton_sync_icon"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:background="@drawable/bg_skeleton_header_circle"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/skeleton_body"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="@dimen/padding_big"
+                android:paddingTop="@dimen/_5sdp"
+                android:paddingEnd="@dimen/padding_big"
+                android:paddingBottom="@dimen/padding_big"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cl_skeleton_sync">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_age"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintEnd_toStartOf="@+id/ll_skeleton_gender"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="2"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="48dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="82dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_gender"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/ll_skeleton_age"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="3"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="58dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="78dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_ben_id"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="12dp"
+                        app:layout_constraintEnd_toStartOf="@+id/ll_skeleton_phone"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/ll_skeleton_age">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="3"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="90dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="120dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_phone"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="12dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/ll_skeleton_ben_id"
+                        app:layout_constraintTop_toTopOf="@+id/ll_skeleton_ben_id">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="3"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="72dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="92dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_village"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="12dp"
+                        app:layout_constraintEnd_toStartOf="@+id/ll_skeleton_visit_date"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/ll_skeleton_phone">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="3"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="90dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="132dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_skeleton_visit_date"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:paddingTop="12dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/ll_skeleton_village"
+                        app:layout_constraintTop_toTopOf="@+id/ll_skeleton_village">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="3"
+                            android:orientation="vertical">
+
+                            <View
+                                android:layout_width="72dp"
+                                android:layout_height="15sp"
+                                android:background="@drawable/bg_skeleton_block" />
+
+                            <View
+                                android:layout_width="100dp"
+                                android:layout_height="17sp"
+                                android:layout_marginTop="6dp"
+                                android:background="@drawable/bg_skeleton_block" />
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_skeleton_actions"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:paddingTop="12dp"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="88dp"
+                        android:layout_height="36dp"
+                        android:background="@drawable/bg_skeleton_action_success" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <View
+                        android:layout_width="130dp"
+                        android:layout_height="36dp"
+                        android:background="@drawable/bg_skeleton_action_primary" />
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/patient_list_item_view.xml b/app/src/main/res/layout/patient_list_item_view.xml
index 0536158b5..f432384bb 100644
--- a/app/src/main/res/layout/patient_list_item_view.xml
+++ b/app/src/main/res/layout/patient_list_item_view.xml
@@ -20,6 +20,10 @@
             name="hasAbha"
             type="Boolean" />
 
+        <variable
+            name="showEditButton"
+            type="Boolean" />
+
     </data>
 
     <RelativeLayout
@@ -108,15 +112,15 @@
 
 
                     <!--                                        <ImageButton-->
-<!--                        android:id="@+id/iv_sync_state"-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:background="@color/default_button"-->
-<!--                        android:onClick="@{() -> clickListener.onClickSync(benVisitInfo)}"-->
-<!--                        android:src="@drawable/ic_synced"-->
-<!--                        app:layout_constraintEnd_toEndOf="parent"-->
-<!--                        app:layout_constraintTop_toTopOf="parent"-->
-<!--                        app:layout_constraintVertical_bias="0" />-->
+                    <!--                        android:id="@+id/iv_sync_state"-->
+                    <!--                        android:layout_width="wrap_content"-->
+                    <!--                        android:layout_height="wrap_content"-->
+                    <!--                        android:background="@color/default_button"-->
+                    <!--                        android:onClick="@{() -> clickListener.onClickSync(benVisitInfo)}"-->
+                    <!--                        android:src="@drawable/ic_synced"-->
+                    <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+                    <!--                        app:layout_constraintTop_toTopOf="parent"-->
+                    <!--                        app:layout_constraintVertical_bias="0" />-->
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -345,7 +349,7 @@
                                     android:id="@+id/visit_date_label"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="Visit Date:"
+                                    android:text="@string/ben_visit_date"
                                     android:textColor="@color/black"
                                     android:textSize="13sp"
                                     android:textStyle="normal" />
@@ -383,7 +387,7 @@
                                     android:id="@+id/refer_date_label"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="Refer Date:"
+                                    android:text="@string/refer_date"
                                     android:textColor="@color/colorAccent"
                                     android:textStyle="bold" />
 
@@ -422,7 +426,7 @@
                                     android:id="@+id/refer_from_label"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="Referred From:"
+                                    android:text="@string/referred_from"
                                     android:textColor="@color/colorAccent"
                                     android:textStyle="bold" />
 
@@ -461,7 +465,7 @@
                                     android:id="@+id/refer_to_label"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="Referred To:"
+                                    android:text="@string/referred_to"
                                     android:textColor="@color/colorAccent"
                                     android:textStyle="bold" />
 
@@ -499,7 +503,7 @@
                                     android:id="@+id/abha_number_label"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/abha_no"
+                                    android:text="@string/abha_id_label"
                                     android:textColor="@color/black"
                                     android:textSize="13sp"
                                     android:textStyle="normal" />
@@ -517,19 +521,19 @@
                         </LinearLayout>
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <LinearLayout
                         android:id="@+id/ll_row_5"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:baselineAligned="false"
-                        android:weightSum="3">
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
 
                         <LinearLayout
+                            android:id="@+id/ll_abha_button"
                             showLayout="@{showAbha? !hasAbha : showAbha}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            tools:ignore="MissingConstraints">
+                            android:orientation="vertical">
 
                             <com.google.android.material.button.MaterialButton
                                 android:id="@+id/btn_abha"
@@ -543,51 +547,68 @@
                                 android:text="@string/abha"
                                 android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                 android:textColor="@color/white"
-                                app:cornerRadius="@dimen/padding_normal"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintStart_toStartOf="parent" />
+                                app:cornerRadius="@dimen/padding_normal" />
                         </LinearLayout>
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/btn_eSanjeevani"
-                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        <View
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_weight="1" />
+
+                        <LinearLayout
+                            android:id="@+id/ll_actions_right"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:backgroundTint="@color/green"
-                            android:onClick="@{()-> clickListener.onClickEsanjeevani(benVisitInfo)}"
-                            android:text="@string/esanjeevni"
-                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-                            android:textColor="@color/white"
-                            android:visibility="gone"
-                            app:cornerRadius="@dimen/padding_normal"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/ll_row_6"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:baselineAligned="false"
-                        android:weightSum="3">
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/prescription_download_btn"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="8dp"
+                                android:backgroundTint="@color/default_button"
+                                android:onClick="@{()-> clickListener.onClickPrescription(benVisitInfo)}"
+                                android:padding="10dp"
+                                android:text="@string/Prescription"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                                android:textColor="@color/white"
+                                android:visibility="visible"
+                                app:cornerRadius="@dimen/padding_normal"
+                                app:icon="@drawable/prescription_document" />
 
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/prescription_download_btn"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:onClick="@{()-> clickListener.onClickPrescription(benVisitInfo)}"
-                            android:padding="10dp"
-                            android:text="@string/Prescription"
-                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-                            android:textColor="@color/white"
-                            android:visibility="gone"
-                            app:cornerRadius="@dimen/padding_normal"
-                            app:icon="@drawable/downlaod_icon"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                            <com.google.android.material.button.MaterialButton
+                                android:id="@+id/btn_eSanjeevani"
+                                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:backgroundTint="@color/green"
+                                android:onClick="@{()-> clickListener.onClickEsanjeevani(benVisitInfo)}"
+                                android:text="@string/esanjeevni"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                                android:textColor="@color/white"
+                                android:visibility="gone"
+                                app:cornerRadius="@dimen/padding_normal" />
+                        </LinearLayout>
+                    </LinearLayout>
                 </LinearLayout>
 
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
+                    android:id="@+id/fab_edit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    app:backgroundTint="@color/default_button"
+                    android:contentDescription="Edit"
+                    android:onClick="@{() -> clickListener.onClickEdit(benVisitInfo)}"
+                    android:visibility="gone"
+                    showLayout="@{showEditButton}"
+                    app:fabSize="mini"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cl_ben_sync"
+                    app:tint="@color/white"
+                    app:srcCompat="@drawable/ic_edit_white" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/patient_list_view.xml b/app/src/main/res/layout/patient_list_view.xml
index afc9b71fd..9a3543d5d 100644
--- a/app/src/main/res/layout/patient_list_view.xml
+++ b/app/src/main/res/layout/patient_list_view.xml
@@ -18,12 +18,29 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/patient_list"
-        android:layout_below="@+id/patient_count"
         android:name="com.google.fhirengine.example.PatientListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_below="@+id/patient_count"
+        android:layout_marginTop="0dp"
         android:scrollbars="vertical"
         app:layoutManager="LinearLayoutManager"
         tools:context=".PatientListActivity"
-        tools:listitem="@layout/patient_list_item_view"/>
-</RelativeLayout>
\ No newline at end of file
+        tools:listitem="@layout/patient_list_item_view" />
+
+    <LinearLayout
+        android:id="@+id/skeleton_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/patient_count"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <include layout="@layout/patient_card_skeleton_item" />
+
+        <include layout="@layout/patient_card_skeleton_item" />
+
+        <include layout="@layout/patient_card_skeleton_item" />
+
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/pharmacist_list_item_view.xml b/app/src/main/res/layout/pharmacist_list_item_view.xml
index f4a0fc123..f6e711bb5 100644
--- a/app/src/main/res/layout/pharmacist_list_item_view.xml
+++ b/app/src/main/res/layout/pharmacist_list_item_view.xml
@@ -49,18 +49,18 @@
           android:paddingTop="10dp"
           android:orientation="vertical">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:id="@+id/card_first_row"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:paddingTop="@dimen/padding_big">
+
           <LinearLayout
               android:layout_width="0dp"
               android:layout_height="wrap_content"
               android:layout_weight="2"
-              app:layout_constraintTop_toTopOf="parent"
-              app:layout_constraintStart_toStartOf="parent"
+              android:visibility="gone"
               android:orientation="horizontal">
 
             <TextView
@@ -80,69 +80,92 @@
           </LinearLayout>
 
           <LinearLayout
+              android:id="@+id/frequency_ll"
               android:layout_width="0dp"
-              app:layout_constraintEnd_toEndOf="parent"
-              app:layout_constraintTop_toTopOf="parent"
               android:layout_height="wrap_content"
-              android:layout_weight="2"
+              android:layout_weight="1"
               android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/duration_label"
+                android:id="@+id/frequency_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/duration2"
+                android:text="@string/frequency2"
+                android:breakStrategy="simple"
+                android:ellipsize="none"
+                android:scrollHorizontally="false"
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/duration_value"
+                android:id="@+id/frequency_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
                 android:layout_marginStart="8dp" />
 
           </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/card_second_row"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/padding_big">
+
           <LinearLayout
+              android:id="@+id/duration_ll"
               android:layout_width="0dp"
               android:layout_height="wrap_content"
-              android:layout_weight="2"
-              app:layout_constraintTop_toTopOf="parent"
-              app:layout_constraintStart_toStartOf="parent"
+              android:layout_weight="1"
               android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/frequency_label"
+                android:id="@+id/duration_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/frequency2"
-                android:breakStrategy="simple"
-                android:ellipsize="none"
-                android:scrollHorizontally="false"
+                android:text="@string/duration2"
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/frequency_value"
+                android:id="@+id/duration_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=""
                 android:layout_marginStart="8dp" />
 
           </LinearLayout>
+        </LinearLayout>
 
           <LinearLayout
-              android:layout_width="0dp"
-              app:layout_constraintEnd_toEndOf="parent"
-              app:layout_constraintTop_toTopOf="parent"
-              android:layout_height="wrap_content"
-              android:layout_weight="2"
-              android:orientation="horizontal">
+            android:id="@+id/card_second_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/padding_big">
+
+            <LinearLayout
+                android:id="@+id/quantity_ll"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/quantity_lable"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/available_quantity"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/quantity_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:layout_marginStart="8dp" />
+
+            </LinearLayout>
+
+              <LinearLayout
+                  android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="2"
+                  android:visibility="gone"
+                  android:orientation="horizontal"
+                  android:gravity="end">
 
             <TextView
                 android:id="@+id/dose_label"
@@ -159,7 +182,7 @@
                 android:layout_marginStart="8dp" />
 
           </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
+          </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/card_third_row"
@@ -197,6 +220,7 @@
               app:layout_constraintTop_toTopOf="parent"
               android:layout_height="wrap_content"
               android:layout_weight="2"
+              android:visibility="gone"
               android:orientation="horizontal">
 
             <TextView
@@ -291,14 +315,14 @@
               style="@style/Widget.MaterialComponents.Button.OutlinedButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginStart="70dp"
               android:backgroundTint="@color/default_button"
               android:text="@string/view_batch"
               android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
               android:textColor="@color/white"
               app:cornerRadius="@dimen/padding_normal"
               app:layout_constraintBottom_toBottomOf="parent"
-              app:layout_constraintStart_toStartOf="parent" />
+              app:layout_constraintStart_toStartOf="parent"
+              app:layout_constraintEnd_toEndOf="parent"/>
 
 
 
diff --git a/app/src/main/res/layout/pharmacist_list_view.xml b/app/src/main/res/layout/pharmacist_list_view.xml
index 36c87140b..0761e9892 100644
--- a/app/src/main/res/layout/pharmacist_list_view.xml
+++ b/app/src/main/res/layout/pharmacist_list_view.xml
@@ -13,6 +13,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/prescription_count"
         android:text=""
+        android:visibility="gone"
         tools:text="text"
         android:layout_centerHorizontal="true"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/prescription_custome_layout.xml b/app/src/main/res/layout/prescription_custome_layout.xml
index 0eb4cdcc3..eb57921a0 100644
--- a/app/src/main/res/layout/prescription_custome_layout.xml
+++ b/app/src/main/res/layout/prescription_custome_layout.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/textPrescriptionHeading"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="4dp"
         android:layout_marginTop="10dp"
@@ -17,6 +17,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/textStock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="4dp"
+        android:text=""
+        android:textSize="16sp"
+        android:textStyle="normal|bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/dosagesDropDown"
         style="@style/TextInputLayoutStyle.ExposedDropdownMenu"
@@ -26,6 +38,7 @@
         android:layout_marginRight="4dp"
         android:hint="@string/form_medicine_dosage"
         android:textSize="18sp"
+        app:endIconMode="clear_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textPrescriptionHeading"> <!-- Set text color hint to black -->
 
@@ -48,6 +61,7 @@
         android:layout_marginTop="@dimen/_3sdp"
         android:hint="@string/Frequency"
         android:textSize="18sp"
+        app:endIconMode="dropdown_menu"
         app:layout_constraintTop_toBottomOf="@+id/dosagesDropDown">
 
         <AutoCompleteTextView
@@ -127,6 +141,7 @@
         android:hint="@string/Unit"
         android:layout_marginTop="@dimen/_3sdp"
         android:textSize="18sp"
+        app:endIconMode="dropdown_menu"
         app:layout_constraintTop_toBottomOf="@+id/duration"> <!-- Set text color hint to black -->
 
         <AutoCompleteTextView
@@ -149,6 +164,7 @@
         android:paddingBottom="10dp"
         android:layout_marginTop="@dimen/_3sdp"
         android:textSize="18sp"
+        app:endIconMode="dropdown_menu"
         app:layout_constraintTop_toBottomOf="@+id/unitDropDown">
 
         <AutoCompleteTextView
@@ -156,7 +172,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:inputType="text"
+            android:inputType="none"
             android:textSize="18sp" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/rv_icon_grid.xml b/app/src/main/res/layout/rv_icon_grid.xml
new file mode 100644
index 000000000..85387a2dd
--- /dev/null
+++ b/app/src/main/res/layout/rv_icon_grid.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rv_icon_grid"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:splitMotionEvents="false"
+    android:background="?attr/colorOnSecondary"
+    android:padding="@dimen/padding_small"
+    android:clipToPadding="false"
+    tools:itemCount="1"
+    tools:listitem="@layout/rv_item_icon_grid" />
diff --git a/app/src/main/res/layout/rv_input_form.xml b/app/src/main/res/layout/rv_input_form.xml
index 23f88252b..9e82d79e7 100644
--- a/app/src/main/res/layout/rv_input_form.xml
+++ b/app/src/main/res/layout/rv_input_form.xml
@@ -5,10 +5,11 @@
 
     android:id="@+id/rv_input_form"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="@dimen/padding_normal"
     android:focusableInTouchMode="true"
     android:animateLayoutChanges="false"
+    android:nestedScrollingEnabled="false"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     tools:listitem="@layout/rv_item_form_edit_text"
 
diff --git a/app/src/main/res/layout/rv_item_abortion.xml b/app/src/main/res/layout/rv_item_abortion.xml
new file mode 100644
index 000000000..264a52c81
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_abortion.xml
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="org.piramalswasthya.cho.R" />
+
+        <variable
+            name="item"
+            type="org.piramalswasthya.cho.model.AbortionDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.AbortionListAdapter.ClickListener" />
+
+        <variable
+            name="context"
+            type="android.content.Context" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_abortion_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_abortion_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{item.patient.firstName + ` ` + (item.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="SINA DD" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:tint="@android:color/holo_green_dark"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_abortion_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_abortion_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="AN" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.beneficiaryID != null ? String.valueOf(item.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="219097846526" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="9957027233" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.pwr != null &amp;&amp; item.pwr.rchId != null ? String.valueOf(item.pwr.rchId) : context.getString(R.string.not_available)}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Weeks of Pregnancy, LMP, EDD -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/weeks_of_pregnancy"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getWeeksOfPregnancyString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="15" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lmp_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getFormattedLMPDate()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="08-10-2025" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/edd"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getFormattedEDD()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="15-07-2026" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: Abortion Date -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/abortion_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getFormattedAbortionDate()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="20-11-2025" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 5: VIEW/ADD Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_action"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> item.isAbortionFormFilled ? clickListener.onClickView(item) : clickListener.onClickAdd(item)}"
+                        android:textColor="@color/white"
+                        app:abortionActionText="@{item}"
+                        tools:text="@string/view" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_adolescent_list.xml b/app/src/main/res/layout/rv_item_adolescent_list.xml
new file mode 100644
index 000000000..723503042
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_adolescent_list.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="patient"
+            type="org.piramalswasthya.cho.model.PatientDisplay" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.AdolescentListAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_adolescent_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Adolescent Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_adolescent_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_person"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_adolescent_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="Adolescent Name" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patient.patient.syncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_adolescent_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_adolescent_bar">
+
+                <!-- Row 1: Parent Name, Age & Gender -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/father_s_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_parent_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Parent Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="12 Years" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/gender"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_gender"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Male" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, Gender -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_beneficiary_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_phone_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                </LinearLayout>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_anc_visit.xml b/app/src/main/res/layout/rv_item_anc_visit.xml
new file mode 100644
index 000000000..27c956bc1
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_anc_visit.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="patientWithPwr"
+            type="org.piramalswasthya.cho.model.PatientWithPwrDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.ANCVisitsAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_anc_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_anc_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithPwr.patient.firstName + ` ` + (patientWithPwr.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="First and Last name" />
+
+                <ImageView
+                    android:id="@+id/iv_call"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/call"
+                    android:src="@android:drawable/ic_menu_call"
+                    app:tint="@android:color/holo_green_dark" />
+
+                <ImageView
+                    android:id="@+id/iv_alert"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/alert"
+                    android:src="@android:drawable/ic_dialog_alert"
+                    android:visibility="gone"
+                    app:tint="@android:color/holo_red_dark"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patientWithPwr.syncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_anc_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_anc_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            app:ageFromDate="@{patientWithPwr.patient.dob}"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.beneficiaryID != null ? String.valueOf(patientWithPwr.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.pwr != null &amp;&amp; patientWithPwr.pwr.rchId != null &amp;&amp; patientWithPwr.pwr.rchId != 0L ? String.valueOf(patientWithPwr.pwr.rchId) : `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Weeks of Pregnancy, LMP, EDD -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/weeks_of_pregnancy"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_weeks_pregnancy"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="28" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lmp_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_lmp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="19-12-2024" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/edd"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_edd"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="25-09-2025" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: Last Visit Date -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:padding="4dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/last_visit_date"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_last_visit"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@color/black"
+                        tools:text="24-01-2025" />
+                </LinearLayout>
+
+                <!-- Row 5: Action Buttons -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_add_anc"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickAddANC(patientWithPwr)}"
+                        android:text="@string/add_visit"
+                        android:textColor="@color/white" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_anc_visits"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickANCVisits(patientWithPwr)}"
+                        android:text="@string/view_visits"
+                        android:textColor="@color/white"
+                        app:strokeColor="@color/primary" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_anc_visit_simple.xml b/app/src/main/res/layout/rv_item_anc_visit_simple.xml
new file mode 100644
index 000000000..0c4f494e4
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_anc_visit_simple.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="2dp"
+    android:clickable="true"
+    android:focusable="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="16dp"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/iv_visit_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:src="@drawable/ic__anc_visit"
+            app:tint="@color/primary"/>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginStart="16dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_visit_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textColor="@color/primary"
+                android:textStyle="bold"
+                tools:text="ANC Visit 1"/>
+
+            <TextView
+                android:id="@+id/tv_visit_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                android:textColor="@android:color/darker_gray"
+                tools:text="Completed: 15-01-2025"/>
+
+            <TextView
+                android:id="@+id/tv_visit_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                android:textColor="@android:color/holo_green_dark"
+                tools:text="✓ Completed"/>
+
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@android:drawable/ic_menu_more"
+            app:tint="@color/primary"/>
+
+    </LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/rv_item_child_reg.xml b/app/src/main/res/layout/rv_item_child_reg.xml
new file mode 100644
index 000000000..fe12f2fbf
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_child_reg.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="item"
+            type="org.piramalswasthya.cho.model.ChildRegDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.ChildRegistrationAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_child_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Baby Info -->
+            <LinearLayout
+                android:id="@+id/ll_title_child_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_new_born_baby"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_baby_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{item.customName}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="baby 0 of Mother" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{item.displaySyncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_child_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_child_bar">
+
+                <!-- Row 1: Mother's Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/mother_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getMotherFullName()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Mother Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Mother Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.beneficiaryID != null ? String.valueOf(item.motherPatient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="218505996213" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="9957027233" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Husband Name -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="STOCK" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: REGISTER/VIEW Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_action"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickForm(item)}"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_delivery_outcome.xml b/app/src/main/res/layout/rv_item_delivery_outcome.xml
new file mode 100644
index 000000000..447c20f63
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_delivery_outcome.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="patientWithPwr"
+            type="org.piramalswasthya.cho.model.PatientWithPwrDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.DeliveryOutcomeAdapter.ClickListener" />
+
+        <import type="android.view.View" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_delivery_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_delivery_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithPwr.patient.firstName + ` ` + (patientWithPwr.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="First and Last name" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patientWithPwr.deliveryOutcomeSyncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_delivery_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_delivery_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.beneficiaryID != null ? String.valueOf(patientWithPwr.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: LMP & EDD -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lmp_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_lmp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.getFormattedLMPDate()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="19-12-2024" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/edd"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_edd"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.getFormattedEDD()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="25-09-2025" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: VIEW Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_register_delivery"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@android:color/holo_red_dark"
+                        android:onClick="@{() -> clickListener.onClickView(patientWithPwr)}"
+                        android:text="@string/register"
+                        android:textColor="@color/white"
+                        android:visibility="@{patientWithPwr.isDeliveryOutcomeFilled ? View.GONE : View.VISIBLE}" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_delivery"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickView(patientWithPwr)}"
+                        android:text="@string/view"
+                        android:textColor="@color/white"
+                        android:visibility="@{patientWithPwr.isDeliveryOutcomeFilled ? View.VISIBLE : View.GONE}" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_ec_track.xml b/app/src/main/res/layout/rv_item_ec_track.xml
index 35afa062c..9ee58349d 100644
--- a/app/src/main/res/layout/rv_item_ec_track.xml
+++ b/app/src/main/res/layout/rv_item_ec_track.xml
@@ -20,59 +20,229 @@
     </data>
 
     <androidx.cardview.widget.CardView
-        android:id="@+id/cardView"
+        android:id="@+id/cv_ec_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
         app:cardCornerRadius="8dp"
-        app:cardElevation="4dp"
-        app:cardUseCompatPadding="true"
-        app:cardBackgroundColor="@android:color/white"
-        android:layout_margin="8dp">
+        app:cardElevation="4dp">
 
-        <LinearLayout
-            android:id="@+id/linearLayout2"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="@dimen/padding_normal"
-            android:gravity="center"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="250dp"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/padding_normal"
-                android:layout_weight="2"
-                android:text="@{filledOnString}"
-                android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                tools:text="EC Track" />
-
-            <com.google.android.material.button.MaterialButton
-                android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Visit Date -->
+            <LinearLayout
+                android:id="@+id/ll_title_ec_bar"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:backgroundTint="?attr/colorPrimary"
-                android:layout_weight="1"
-                android:text="@string/view"
-                android:textColor="?attr/colorOnPrimary"
-                android:onClick="@{()-> clickListener.onClickedVisit(visit)}" />
-
-            <ImageView
-                android:id="@+id/iv_sync_state"
-                android:layout_width="24dp"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_visit_date"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{filledOnString}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="Visited on Mon, Feb 23 2026" />
+
+                <ImageView
+                    android:id="@+id/iv_sync_state"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/iv_sync_state_tv"
+                    app:syncState="@{visit.syncState}"
+                    tools:src="@drawable/ic_synced" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_ec_Layout"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|end"
-                android:layout_weight="1"
-                android:layout_marginHorizontal="@dimen/padding_small"
-                android:contentDescription="@string/iv_sync_state_tv"
-                app:syncState="@{visit.syncState}"
-                tools:src="@drawable/ic_synced" />
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_ec_bar">
 
-        </LinearLayout>
+                <!-- Row 1: Pregnancy Test & Result -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
 
-    </androidx.cardview.widget.CardView>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/is_pregnancy_test_done"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{visit.isPregnancyTestDone ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Yes" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/is_woman_pregnant"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{visit.isPregnant ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="No" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Contraception Method -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
 
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/method_of_contraception_label"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{visit.methodOfContraception ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Condom" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Visit Month"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{visit.visitMonth ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="February" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2a: ANTRA Due Date -->
+                <LinearLayout
+                    android:id="@+id/ll_antra_details"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:paddingHorizontal="4dp"
+                    android:layout_marginTop="8dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="ANTRA Next Due Date"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_antra_due_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{visit.getAntraDueDateString()}"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@color/black"
+                        tools:text="01-01-2025 to 15-02-2025" />
+                </LinearLayout>
+
+                <!-- Row 3: View Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_ec"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{()-> clickListener.onClickedVisit(visit)}"
+                        android:text="@string/view"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rv_item_icon_grid.xml b/app/src/main/res/layout/rv_item_icon_grid.xml
new file mode 100644
index 000000000..f917763ae
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_icon_grid.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="homeIcon"
+            type="org.piramalswasthya.cho.model.Icon" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.IconGridAdapter.GridIconClickListener" />
+
+    </data>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cv_icon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/padding_small"
+            android:clickable="true"
+            android:focusable="true"
+            android:onClick="@{()-> clickListener.onClicked(homeIcon)}"
+            app:cardCornerRadius="@dimen/padding_normal"
+            app:cardElevation="16dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="@dimen/padding_small">
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="72dp"
+                    android:layout_height="72dp"
+                    android:layout_marginHorizontal="@dimen/margin_normal"
+                    android:background="@{homeIcon.colorPrimary ? @drawable/bg_circular_1 : @drawable/bg_circular_2 }"
+                    android:contentDescription="@string/cd_icon_grid_icon"
+                    android:padding="@dimen/padding_normal"
+                    android:layout_marginTop="@dimen/padding_normal"
+                    android:scaleType="centerCrop"
+                    app:imageResource="@{homeIcon.icon}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:tint="?attr/colorOnPrimary"
+                    tools:background="@drawable/bg_circular_1"
+                    tools:src="@drawable/ic_sync" />
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:labelFor="@id/imageView2"
+                    android:text="@{homeIcon.title}"
+                    android:lines="2"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    app:autoSizeMaxTextSize="16sp"
+                    app:autoSizeTextType="uniform"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/imageView2"
+                    android:layout_marginTop="@dimen/padding_normal"
+                    android:layout_marginBottom="@dimen/padding_tiny"
+                    tools:text="Dummy Text" />
+
+                <TextView
+                    android:id="@+id/tv_count"
+                    app:recordCount="@{homeIcon.count}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginRight="@dimen/padding_tiny"
+                    android:gravity="center"
+                    android:paddingEnd="@dimen/padding_tiny"
+                    android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.916"
+                    app:layout_constraintStart_toEndOf="@+id/imageView2"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="2" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.cardview.widget.CardView>
+
+
+</layout>
diff --git a/app/src/main/res/layout/rv_item_infant_list.xml b/app/src/main/res/layout/rv_item_infant_list.xml
new file mode 100644
index 000000000..dcdcf046a
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_infant_list.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="patient"
+            type="org.piramalswasthya.cho.model.PatientDisplay" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.InfantListAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_infant_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Infant Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_infant_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_infant"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_infant_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="Baby Name" />
+
+                <ImageView
+                    android:id="@+id/due_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_overdue"
+                    android:visibility="gone"
+                    app:tint="@android:color/holo_red_dark"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:tint="@android:color/holo_green_dark"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_infant_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_infant_bar">
+
+                <!-- Row 1: Mother Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/mother_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Mother Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="45 Days" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, Gender -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_beneficiary_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_phone_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/gender"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_gender"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Male" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Date of Birth & Parent Name -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/date_of_birth"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_dob"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="19-12-2024" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/father_s_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_parent_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Father Name" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: VIEW Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_infant"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickView(patient)}"
+                        android:text="@string/view"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_infant_reg.xml b/app/src/main/res/layout/rv_item_infant_reg.xml
new file mode 100644
index 000000000..3c30e197b
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_infant_reg.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="item"
+            type="org.piramalswasthya.cho.model.InfantRegDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.InfantRegistrationAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_infant_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Baby Info -->
+            <LinearLayout
+                android:id="@+id/ll_title_infant_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_new_born_baby"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_baby_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{item.customName}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="1st baby of Mother" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{item.syncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_infant_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_infant_bar">
+
+                <!-- Row 1: Mother's Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/mother_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getMotherFullName()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Mother name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getMotherAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.beneficiaryID != null ? String.valueOf(item.motherPatient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Husband Name -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.motherPatient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: REGISTER/VIEW Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_action"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickForm(item)}"
+                        android:textColor="@color/white"
+                        app:infantRegActionText="@{item}"
+                        tools:text="@string/view" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_neonatal_outcome.xml b/app/src/main/res/layout/rv_item_neonatal_outcome.xml
new file mode 100644
index 000000000..df0bc8535
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_neonatal_outcome.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="patientWithPwr"
+            type="org.piramalswasthya.cho.model.PatientWithPwrDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.NeonatalOutcomeAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_neonatal_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:backgroundTint="@color/primary"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_neonatal_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/primary" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithPwr.patient.firstName + ` ` + (patientWithPwr.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/primary"
+                    android:textStyle="bold"
+                    tools:text="First and Last name" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_neonatal_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_neonatal_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/white" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/white"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/white" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/white"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/white" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.beneficiaryID != null ? String.valueOf(patientWithPwr.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/white"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/white" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/white"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Action Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_record_neonatal"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@android:color/holo_green_dark"
+                        android:onClick="@{() -> clickListener.onClick(patientWithPwr)}"
+                        android:text="@string/view"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_patient_ec_with_form.xml b/app/src/main/res/layout/rv_item_patient_ec_with_form.xml
new file mode 100644
index 000000000..031b1bd08
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_patient_ec_with_form.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="patientWithEcr"
+            type="org.piramalswasthya.cho.model.PatientWithEcrDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.ECRegistrationAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_ec_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_ec_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithEcr.patient.firstName + ` ` + (patientWithEcr.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="SINA DD" />
+
+                <ImageView
+                    android:id="@+id/iv_miss_state"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_female"
+                    android:visibility="gone"
+                    app:tint="@android:color/holo_red_dark"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/iv_sync_state"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/iv_sync_state_tv"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patientWithEcr.syncState}"
+                    tools:visibility="visible" />
+
+                <ImageView
+                    android:id="@+id/iv_call"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:contentDescription="@string/call"
+                    android:src="@android:drawable/ic_menu_call"
+                    app:tint="@color/primary" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_ec_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_ec_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.patient.spouseName ?? ``}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="AN" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.patient.beneficiaryID != null ? String.valueOf(patientWithEcr.patient.beneficiaryID) : ``}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="219097846526" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.patient.phoneNo != null &amp;&amp; !patientWithEcr.patient.phoneNo.empty ? patientWithEcr.patient.phoneNo : @string/not_available}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="9957027233" />
+                    </LinearLayout>
+
+
+
+                </LinearLayout>
+
+                <!-- Row 3: LMP Date, Status, Last Visit Date -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:id="@+id/llLmpDate"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lmp_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/benLmpDate"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.getFormattedLMPDate()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="01-01-2025" />
+                    </LinearLayout>
+
+
+
+                    <LinearLayout
+                        android:id="@+id/llLastVisitDate"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/last_visit_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tvLastVisitDate"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithEcr.getLastVisitDateString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="29-01-2026" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: ANTRA Next Due Date -->
+                <LinearLayout
+                    android:id="@+id/ll_antra_details"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:paddingHorizontal="4dp"
+                    android:layout_marginTop="8dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/antra_next_due_date"
+                        android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                        android:textColor="@color/black" />
+
+                    <TextView
+                        android:id="@+id/tv_antra_due_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{patientWithEcr.getAntraDueDateString()}"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        android:textColor="@color/black"
+                        tools:text="01-01-2025" />
+                </LinearLayout>
+
+                <!-- Row 5: Action Buttons -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center"
+                    android:layout_marginTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_add_visit"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginEnd="4dp"
+                        android:onClick="@{() -> clickListener.onAddVisit(patientWithEcr)}"
+                        android:text="@string/add_visit"
+                        android:textColor="@color/white"
+                        android:backgroundTint="@color/green" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_visit"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginStart="4dp"
+                        android:onClick="@{() -> clickListener.onViewVisit(patientWithEcr)}"
+                        android:text="@string/view_visit"
+                        android:textColor="@color/white"
+                        android:backgroundTint="@color/green" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_pmsma.xml b/app/src/main/res/layout/rv_item_pmsma.xml
new file mode 100644
index 000000000..8f4be7b24
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_pmsma.xml
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="item"
+            type="org.piramalswasthya.cho.model.PmsmaDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.PmsmaListAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_pmsma_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_pmsma_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{item.patient.firstName + ` ` + (item.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="SINA DD" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_pmsma_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_pmsma_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="AN" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.beneficiaryID != null ? String.valueOf(item.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="219097846526" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="9957027233" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Weeks of Pregnancy, LMP, EDD -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/weeks_of_pregnancy"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getWeeksOfPregnancyString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="15" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/lmp_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getFormattedLMPDate()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="08-10-2025" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/edd"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{item.getFormattedEDD()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="15-07-2026" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: Add e-PMSMA Visit + View e-PMSMA Buttons -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_add"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickAdd(item)}"
+                        android:text="@string/add_e_pmsma_visit"
+                        android:textColor="@color/white" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickView(item)}"
+                        android:text="@string/view_e_pmsma"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_pnc_mother.xml b/app/src/main/res/layout/rv_item_pnc_mother.xml
new file mode 100644
index 000000000..a0224e419
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_pnc_mother.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="patientWithPnc"
+            type="org.piramalswasthya.cho.model.PatientWithPncDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.PNCMotherAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_pnc_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_pnc_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithPnc.patient.firstName + ` ` + (patientWithPnc.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="First and Last name" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="4dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patientWithPnc.syncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_pnc_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_pnc_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPnc.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPnc.patient.beneficiaryID != null ? String.valueOf(patientWithPnc.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPnc.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: Delivery Date & Days Since Delivery -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/delivery_date"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_delivery_date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="19-12-2024" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/days_since_delivery"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_days_since_delivery"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="15 days" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 4: Action Buttons -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_add_visit"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.clickAddVisit(patientWithPnc)}"
+                        android:text="@string/add_visit"
+                        android:textColor="@color/white" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_visits"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.clickViewVisits(patientWithPnc)}"
+                        android:text="@string/view_visits"
+                        android:textColor="@color/white"
+                        app:strokeColor="@color/primary" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/rv_item_pregnant_woman.xml b/app/src/main/res/layout/rv_item_pregnant_woman.xml
new file mode 100644
index 000000000..4f36a12a3
--- /dev/null
+++ b/app/src/main/res/layout/rv_item_pregnant_woman.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="patientWithPwr"
+            type="org.piramalswasthya.cho.model.PatientWithPwrDomain" />
+
+        <variable
+            name="clickListener"
+            type="org.piramalswasthya.cho.adapter.PregnantWomenAdapter.ClickListener" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cv_pwr_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:elevation="4dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <!-- Title Bar with Patient Name -->
+            <LinearLayout
+                android:id="@+id/ll_title_pwr_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/default_button"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingHorizontal="8dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    android:src="@drawable/ic_female"
+                    app:tint="@color/white" />
+
+                <TextView
+                    android:id="@+id/tv_patient_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="8dp"
+                    android:text="@{patientWithPwr.patient.firstName + ` ` + (patientWithPwr.patient.lastName ?? ``)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                    android:textColor="@color/white"
+                    android:textStyle="bold"
+                    tools:text="First and Last name" />
+
+                <ImageView
+                    android:id="@+id/iv_sync"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:contentDescription="@string/status"
+                    android:src="@drawable/ic_synced"
+                    android:visibility="gone"
+                    app:syncState="@{patientWithPwr.syncState}"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+
+            <!-- Details Section -->
+            <LinearLayout
+                android:id="@+id/linear_pwr_Layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp"
+                app:layout_constraintTop_toBottomOf="@id/ll_title_pwr_bar">
+
+                <!-- Row 1: Husband Name & Age -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/husband_name"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.spouseName ?? `Not Available`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Husband/Wife Name" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/age_ben"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:id="@+id/tv_age"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.getAgeString()}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Age" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 2: Beneficiary ID, Mobile Number, RCH ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/beneficiary_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.beneficiaryID != null ? String.valueOf(patientWithPwr.patient.beneficiaryID) : `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="234287380101" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_mob_no_ph"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{patientWithPwr.patient.phoneNo ?? `NA`}"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="8526843128" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="4dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/tv_rch_id"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelSmall"
+                            android:textColor="@color/black" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="Not Available"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textColor="@color/black"
+                            tools:text="Not Available" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <!-- Row 3: VIEW Button -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:orientation="horizontal"
+                    android:paddingTop="8dp">
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/btn_view_pwr"
+                        style="@style/Widget.MaterialComponents.Button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@color/green"
+                        android:onClick="@{() -> clickListener.onClickView(patientWithPwr)}"
+                        android:text="@string/view"
+                        android:textColor="@color/white"
+                        tools:backgroundTint="@color/green" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+</layout>
diff --git a/app/src/main/res/layout/visit_details_info.xml b/app/src/main/res/layout/visit_details_info.xml
index a0b8afb7c..0faf180db 100644
--- a/app/src/main/res/layout/visit_details_info.xml
+++ b/app/src/main/res/layout/visit_details_info.xml
@@ -5,41 +5,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_navigation"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_nav_height"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <LinearLayout
-            android:id="@+id/linear_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingStart="@dimen/padding_normal"
-            android:paddingEnd="@dimen/padding_normal">
-
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_marginEnd="@dimen/padding_normal"
-                android:layout_weight="1"
-                android:backgroundTint="@color/button_danger"
-                android:text="@string/cancel" />
-
-            <Button
-                android:id="@+id/btnSubmit"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/btn_height"
-                android:layout_weight="1"
-                android:backgroundTint="@color/green"
-                android:text="@string/next" />
-
-        </LinearLayout>
-
-    </com.google.android.material.bottomnavigation.BottomNavigationView>
 
 
 
@@ -172,7 +137,7 @@
             android:layout_marginEnd="@dimen/_10sdp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/radioGroup2">
+            app:layout_constraintTop_toBottomOf="@+id/layyy">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/subCatDropDown"
@@ -307,7 +272,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layyy"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:paddingBottom="6dp"
             app:layout_constraintTop_toBottomOf="@+id/radioGroup2">
 
@@ -329,7 +294,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:paddingTop="2dp"
                     android:paddingBottom="10dp"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/menu/activity_home_drawer.xml b/app/src/main/res/menu/activity_home_drawer.xml
index 0c771a4bc..a9759c45b 100644
--- a/app/src/main/res/menu/activity_home_drawer.xml
+++ b/app/src/main/res/menu/activity_home_drawer.xml
@@ -30,11 +30,11 @@
             android:icon="@drawable/ic_completed_tasks"
             android:title="Create ABHA Number" />
 
-        <item
-            android:id="@+id/outreach_activity"
-            android:checkable="false"
-            android:icon="@drawable/ic_completed_tasks"
-            android:title="Outreach Activity" />
+<!--        <item-->
+<!--            android:id="@+id/outreach_activity"-->
+<!--            android:checkable="false"-->
+<!--            android:icon="@drawable/ic_completed_tasks"-->
+<!--            android:title="Outreach Activity" />-->
 
 <!--        <item-->
 <!--            android:id="@+id/roles_list"-->
@@ -79,15 +79,15 @@
 <!--            android:title="Help" />-->
 
     </group>
-    <group
-        android:id="@+id/menu_group_middle"
-        android:checkableBehavior="single">
-        <item
-            android:id="@+id/menu_help"
-            android:icon="@drawable/help"
-            android:checkable="false"
-            android:title="Help" />
-    </group>
+<!--    <group-->
+<!--        android:id="@+id/menu_group_middle"-->
+<!--        android:checkableBehavior="single">-->
+<!--        <item-->
+<!--            android:id="@+id/menu_help"-->
+<!--            android:icon="@drawable/help"-->
+<!--            android:checkable="false"-->
+<!--            android:title="Help" />-->
+<!--    </group>-->
     <group
         android:id="@+id/menu_group_bottom"
         android:checkableBehavior="single">
diff --git a/app/src/main/res/menu/bottom_menu_nav.xml b/app/src/main/res/menu/bottom_menu_nav.xml
index f3520f034..408cd70f3 100644
--- a/app/src/main/res/menu/bottom_menu_nav.xml
+++ b/app/src/main/res/menu/bottom_menu_nav.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:icon="@drawable/ic_nurse"
         android:contentDescription="Navigate to Nurse section"
-        android:title="Nurse" />
+        android:title="@string/nurse_role" />
 <!--    android:icon="@drawable/nurse"-->
     <item
         android:id="@+id/nav_doctor"
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"
         android:icon="@drawable/ic_doctor"
         android:contentDescription="Navigate to Doctor section"
-        android:title="Doctor" />
+        android:title="@string/doctor_role" />
 <!--    android:icon="@drawable/doctor"-->
 
     <item
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:icon="@drawable/ic_lab_tech"
         android:contentDescription="Navigate to Lab Technician section"
-        android:title="Lab Technician" />
+        android:title="@string/lab_technician_role" />
 <!--    android:icon="@drawable/lab"-->
     <item
         android:id="@+id/nav_pharmacist"
@@ -39,6 +39,6 @@
         android:layout_height="wrap_content"
         android:icon="@drawable/ic_pharmacist"
         android:contentDescription="Navigate to Pharmacist section"
-        android:title="Pharmacist" />
+        android:title="@string/pharmacist_role" />
 <!--    android:icon="@drawable/pharma"-->
 </menu>
diff --git a/app/src/main/res/navigation-v26/register_nav.xml b/app/src/main/res/navigation-v26/register_nav.xml
new file mode 100644
index 000000000..22fd16398
--- /dev/null
+++ b/app/src/main/res/navigation-v26/register_nav.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/register_nav"
+    app:startDestination="@id/patientDetailsFragment">
+
+    <fragment
+        android:id="@+id/fragmentLocation"
+        android:name="org.piramalswasthya.cho.ui.register_patient_activity.location_details.LocationFragment"
+        android:label="fragment_location"
+        tools:layout="@layout/fragment_location" >
+<!--        <action-->
+<!--            android:id="@+id/action_fhirAddPatientFragment_to_fhirLocationFragment"-->
+<!--            app:destination="@id/fhirLocationFragment" />-->
+        <!--            <argument-->
+        <!--                android:name="patientDetails"-->
+        <!--                android:defaultValue="null" />-->
+        <!--        </action>-->
+        <action
+            android:id="@+id/action_fragmentLocation_to_otherInformationsFragment"
+            app:destination="@id/otherInformationsFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/otherInformationsFragment"
+        android:name="org.piramalswasthya.cho.ui.register_patient_activity.other_informations.OtherInformationsFragment"
+        android:label="fragment_other_informations"
+        tools:layout="@layout/fragment_other_informations" >
+        <action
+            android:id="@+id/action_otherInformationsFragment_to_fragmentLocation"
+            app:destination="@id/fragmentLocation" />
+    </fragment>
+    <fragment
+        android:id="@+id/patientDetailsFragment"
+        android:name="org.piramalswasthya.cho.ui.register_patient_activity.patient_details.PatientDetailsFragment"
+        android:label="fragment_patient_details"
+        tools:layout="@layout/fragment_patient_details" >
+        <action
+            android:id="@+id/action_patientDetailsFragment_to_fragmentLocation"
+            app:destination="@id/fragmentLocation" />
+        <action
+            android:id="@+id/action_patientDetailsFragment_to_beneficiaryCardFragment"
+            app:destination="@id/beneficiaryCardFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/beneficiaryCardFragment"
+        android:name="org.piramalswasthya.cho.ui.beneficiary_card.BeneficiaryCardFragment"
+        android:label="BeneficiaryCardFragment"
+        tools:layout="@layout/fragment_beneficiary_card">
+        <argument
+            android:name="patientInfo"
+            app:argType="org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo" />
+        <action
+            android:id="@+id/action_beneficiaryCardFragment_to_editBeneficiaryDetailsFragment"
+            app:destination="@id/editBeneficiaryDetailsFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/editBeneficiaryDetailsFragment"
+        android:name="org.piramalswasthya.cho.ui.beneficiary_card.edit.EditBeneficiaryDetailsFragment"
+        android:label="EditBeneficiaryDetailsFragment"
+        tools:layout="@layout/fragment_edit_beneficiary_details">
+        <argument
+            android:name="patientInfo"
+            app:argType="org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo" />
+    </fragment>
+</navigation>
diff --git a/app/src/main/res/navigation/nav_edit_patient.xml b/app/src/main/res/navigation/nav_edit_patient.xml
index 6a50a4ae5..a52e3a509 100644
--- a/app/src/main/res/navigation/nav_edit_patient.xml
+++ b/app/src/main/res/navigation/nav_edit_patient.xml
@@ -35,6 +35,34 @@
         <action
             android:id="@+id/action_fhirVisitDetailsFragment_to_cbacFragment"
             app:destination="@id/cbacFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_ophthalmicScreeningFragment"
+            app:destination="@id/ophthalmicScreeningFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_earDiagnosisFormFragment"
+            app:destination="@id/earDiagnosisFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_painAndSymptomAssessmentFormFragment"
+            app:destination="@id/painAndSymptomAssessmentFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_psychosocialCaregiverSupportFormFragment"
+            app:destination="@id/psychosocialCaregiverSupportFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_oralHealthFormFragment"
+            app:destination="@id/oralHealthFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_noseDiagnosisFormFragment"
+            app:destination="@id/fragment_nose_diagnosis_form" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_mentalHealthScreeningFormFragment"
+            app:destination="@id/mentalHealthScreeningFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_throatDiagnosisFormFragment"
+            app:destination="@id/throatDiagnosisFormFragment" />
+        <action
+            android:id="@+id/action_fhirVisitDetailsFragment_to_fragment_elderly_health_assessment_form"
+            app:destination="@id/fragment_elderly_health_assessment_form" />
+
     </fragment>
 
     <fragment
@@ -139,6 +167,45 @@
             app:argType="boolean" />
     </fragment>
 
+    <fragment
+        android:id="@+id/deliveryOutcomeFormFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.maternal_health.delivery_outcome.form.DeliveryOutcomeFormFragment"
+        android:label="@string/delivery_outcome">
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="visitNumber"
+            app:argType="integer" />
+        <action
+            android:id="@+id/action_deliveryOutcomeFormFragment_to_neonatalOutcomeFormFragment"
+            app:destination="@id/neonatalOutcomeFormFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/ophthalmicScreeningFragment"
+        android:name="org.piramalswasthya.cho.ui.ophthalmic_screening.OphthalmicScreeningFragment"
+        android:label="Ophthalmic Screening">
+        <argument
+            android:name="patientID"
+            app:argType="string"/>
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+        <argument
+            android:name="benVisitInfo"
+            app:argType="org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo" />
+        <argument
+            android:name="reasonForVisit"
+            app:argType="string"
+            android:defaultValue="Screening" />
+        <action
+            android:id="@+id/action_ophthalmicScreeningFragment_to_fhirVisitDetailsFragment"
+            app:destination="@id/fhirVisitDetailsFragment"
+            app:popUpTo="@id/fhirVisitDetailsFragment"
+            app:popUpToInclusive="true" />
+    </fragment>
+
     <fragment
         android:id="@+id/pncFormFragment"
         android:name="org.piramalswasthya.cho.ui.commons.maternal_health.pnc.form.PncFormFragment"
@@ -172,7 +239,15 @@
         <argument
             android:name="createdDate"
             app:argType="long" />
+        <action
+            android:id="@+id/action_eligibleCoupleTrackingFormFragment_to_maternalHealthNavHostFragment"
+            app:destination="@id/maternalHealthNavHostFragment" />
     </fragment>
+
+    <fragment
+        android:id="@+id/maternalHealthNavHostFragment"
+        android:name="org.piramalswasthya.cho.ui.home.rmncha.maternal_health.MaternalHealthNavHostFragment"
+        android:label="MaternalHealthNavHostFragment" />
     <fragment
         android:id="@+id/cbacFragment"
         android:name="org.piramalswasthya.cho.ui.commons.cbac.CbacFragment"
@@ -192,5 +267,123 @@
         android:name="org.piramalswasthya.cho.ui.commons.pharmacist.SelectBatchFragment"
         android:label="SelectBatchFragment" />
 
+    <!-- Neonatal Outcome Form Fragment -->
+    <fragment
+        android:id="@+id/neonatalOutcomeFormFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form.NeonatalOutcomeFormFragment"
+        android:label="@string/neonatal_outcome"
+        tools:layout="@layout/fragment_neonatal_outcome">
+        <argument
+            android:name="deliveryOutcomeId"
+            app:argType="long" />
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="babyIndex"
+            app:argType="integer" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/earDiagnosisFormFragment"
+        android:name="org.piramalswasthya.cho.ui.ENT.EarDiagnosisFormFragment"
+        android:label="Ear Diagnosis" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer" />
+    </fragment>
+    <fragment
+        android:id="@+id/painAndSymptomAssessmentFormFragment"
+        android:name="org.piramalswasthya.cho.ui.elder_health.PainAndSymptomAssessmentFormFragment"
+        android:label="Pain And Symptom Assessment" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer" />
+    </fragment>
+    <fragment
+        android:id="@+id/psychosocialCaregiverSupportFormFragment"
+        android:name="org.piramalswasthya.cho.ui.elder_health.PsychosocialCaregiverSupportFormFragment"
+        android:label="Psychosocial Caregiver Support" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+    </fragment>
+    <fragment
+        android:id="@+id/oralHealthFormFragment"
+        android:name="org.piramalswasthya.cho.ui.oral_health.OralHealthFormFragment"
+        android:label="@string/title_oral_health">
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer" />
+        <argument
+            android:name="benVisitInfo"
+            app:argType="org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo" />
+        <action
+            android:id="@+id/action_oralHealthFormFragment_to_customVitalsFragment"
+            app:destination="@id/customVitalsFragment"
+            app:popUpTo="@id/fhirVisitDetailsFragment"
+            app:popUpToInclusive="true" />
+    </fragment>
+    <fragment
+        android:id="@+id/fragment_nose_diagnosis_form"
+        android:name="org.piramalswasthya.cho.ui.ENT.NoseDiagnosisFormFragment"
+        android:label="Nose Diagnosis" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+    </fragment>
+    <fragment
+        android:id="@+id/mentalHealthScreeningFormFragment"
+        android:name="org.piramalswasthya.cho.ui.mental_health.MentalHealthScreeningFormFragment"
+        android:label="Mental Health Screening" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+    </fragment>
+    <fragment
+        android:id="@+id/throatDiagnosisFormFragment"
+        android:name="org.piramalswasthya.cho.ui.ENT.ThroatDiagnosisFormFragment"
+        android:label="Throat Diagnosis" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+        <action
+            android:id="@+id/action_throatDiagnosisFormFragment_to_customVitalsFragment"
+            app:destination="@id/customVitalsFragment"
+            app:popUpTo="@id/fhirVisitDetailsFragment"
+            app:popUpToInclusive="false" />
+    </fragment>
+    <fragment
+        android:id="@+id/fragment_elderly_health_assessment_form"
+        android:name="org.piramalswasthya.cho.ui.elder_health.ElderlyHealthAssessmentFormFragment"
+        android:label="Elderly Health Assessment" >
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer"/>
+    </fragment>
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_home.xml b/app/src/main/res/navigation/nav_home.xml
index b55d57733..a5696ff3d 100644
--- a/app/src/main/res/navigation/nav_home.xml
+++ b/app/src/main/res/navigation/nav_home.xml
@@ -20,4 +20,43 @@
             android:id="@+id/action_registerPatientFragment_to_homeFragment"
             app:destination="@id/homeFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/beneficiaryCardFragment"
+        android:name="org.piramalswasthya.cho.ui.beneficiary_card.BeneficiaryCardFragment"
+        android:label="BeneficiaryCardFragment" >
+        <argument
+            android:name="patientInfo"
+            app:argType="org.piramalswasthya.cho.model.PatientDisplayWithVisitInfo" />
+    </fragment>
+    <fragment
+        android:id="@+id/personalDetailsFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.personal_details.PersonalDetailsFragment"
+        android:label="PersonalDetailsFragment">
+
+        <action
+            android:id="@+id/action_personalDetailsFragment_to_patientDetailsFragment"
+            app:destination="@id/patientDetailsFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/patientDetailsFragment"
+        android:name="org.piramalswasthya.cho.ui.register_patient_activity.patient_details.PatientDetailsFragment"
+        android:label="PatientDetailsFragment">
+
+        <argument
+            android:name="IS_EDIT_PATIENT"
+            app:argType="boolean"
+            android:defaultValue="false" />
+
+        <argument
+            android:name="PATIENT_ID"
+            app:argType="string"
+            app:nullable="true" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/pncMotherListFragment"
+        android:name="org.piramalswasthya.cho.ui.home.rmncha.maternal_health.PNCMotherListFragment"
+        android:label="@string/pnc_mother_list" />
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_maternal_health.xml b/app/src/main/res/navigation/nav_maternal_health.xml
new file mode 100644
index 000000000..88c75b425
--- /dev/null
+++ b/app/src/main/res/navigation/nav_maternal_health.xml
@@ -0,0 +1,100 @@
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_maternal_health_graph"
+    app:startDestination="@id/pregnantWomanRegistrationFragment">
+
+    <!-- List Fragment: Shows list of pregnant women -->
+    <fragment
+        android:id="@+id/pregnantWomanRegistrationFragment"
+        android:name="org.piramalswasthya.cho.ui.home.rmncha.maternal_health.PregnantWomenRegistrationFragment"
+        tools:layout="@layout/fragment_pregnant_women_registration">
+        <action
+            android:id="@+id/action_pregnantWomanRegistrationFragment_to_pregnancyRegistrationFormFragment"
+            app:destination="@id/pregnancyRegistrationFormFragment" />
+    </fragment>
+
+    <!-- Form Fragment: Pregnancy registration form -->
+    <fragment
+        android:id="@+id/pregnancyRegistrationFormFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.maternal_health.pregnant_women_registration.form.PregnantWomanRegistrationFragment"
+        tools:layout="@layout/fragment_new_form">
+        <argument
+            android:name="patientID"
+            app:argType="string"
+            app:nullable="true" />
+        <argument
+            android:name="fromECT"
+            app:argType="boolean"
+            android:defaultValue="false" />
+        <action
+            android:id="@+id/action_pregnantWomanRegistrationFragment_to_eligibleCoupleTrackingFormFragment"
+            app:destination="@id/eligibleCoupleTrackingFormFragment" />
+        <action
+            android:id="@+id/action_pregnantWomanRegistrationFragment_to_customVitalsFragment"
+            app:destination="@id/customVitalsFragment" />
+        <action
+            android:id="@+id/action_pregnantWomanRegistrationFragment_to_patientHomeFragment"
+            app:destination="@id/patientHomeFragment"
+            app:popUpTo="@id/patientHomeFragment"
+            app:popUpToInclusive="false" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/eligibleCoupleTrackingFormFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.eligible_couple.tracking.form.EligibleCoupleTrackingFormFragment">
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="createdDate"
+            app:argType="long" />
+        <action
+            android:id="@+id/action_eligibleCoupleTrackingFormFragment_to_pregnancyRegistrationFormFragment"
+            app:destination="@id/pregnancyRegistrationFormFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/customVitalsFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.fhir_patient_vitals.FhirVitalsFragment"
+        android:label="fragment_fhir_vitals"
+        tools:layout="@layout/fragment_vitals_custom" />
+    <fragment
+        android:id="@+id/patientHomeFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.patient_home.PatientHomeFragment"
+        android:label="PatientHomeFragment" />
+
+    <!-- Neonatal Outcome Form Fragment -->
+    <fragment
+        android:id="@+id/neonatalOutcomeFormFragment"
+        android:name="org.piramalswasthya.cho.ui.commons.maternal_health.neonatal_outcome.form.NeonatalOutcomeFormFragment"
+        tools:layout="@layout/fragment_neonatal_outcome">
+        <argument
+            android:name="deliveryOutcomeId"
+            app:argType="long" />
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="babyIndex"
+            app:argType="integer" />
+        <action
+            android:id="@+id/action_neonatalOutcomeFormFragment_to_customVitalsFragment"
+            app:destination="@id/customVitalsFragment" />
+    </fragment>
+    <!-- Mental Health Screening Form Fragment -->
+    <fragment
+        android:id="@+id/mentalHealthScreeningFormFragment"
+        android:name="org.piramalswasthya.cho.ui.mental_health.MentalHealthScreeningFormFragment"
+        android:label="Mental Health Screening"
+        tools:layout="@layout/fragment_mental_health_screening_form">
+        <argument
+            android:name="patientID"
+            app:argType="string" />
+        <argument
+            android:name="benVisitNo"
+            app:argType="integer" />
+    </fragment>
+
+</navigation>
+
diff --git a/app/src/main/res/navigation/register_nav.xml b/app/src/main/res/navigation/register_nav.xml
index cfc5e8e0e..7e3bb3478 100644
--- a/app/src/main/res/navigation/register_nav.xml
+++ b/app/src/main/res/navigation/register_nav.xml
@@ -30,43 +30,5 @@
             android:id="@+id/action_otherInformationsFragment_to_fragmentLocation"
             app:destination="@id/fragmentLocation" />
     </fragment>
-    <fragment
-        android:id="@+id/patientDetailsFragment"
-        android:name="org.piramalswasthya.cho.ui.register_patient_activity.patient_details.PatientDetailsFragment"
-        android:label="fragment_patient_details"
-        tools:layout="@layout/fragment_patient_details" >
-        <action
-            android:id="@+id/action_patientDetailsFragment_to_fragmentLocation"
-            app:destination="@id/fragmentLocation" />
-    </fragment>
 
-    <!--    <fragment-->
-<!--        android:id="@+id/fhirLocationFragment"-->
-<!--        android:name="org.piramalswasthya.cho.ui.commons.fhir_add_patient.location_fragment.FhirLocationFragment"-->
-<!--        android:label="FhirLocationFragment" >-->
-<!--&lt;!&ndash;        <argument&ndash;&gt;-->
-<!--&lt;!&ndash;            android:name="patientDetails"&ndash;&gt;-->
-<!--&lt;!&ndash;            app:argType="org.hl7.fhir.r4.model.Patient"/>&ndash;&gt;-->
-<!--        <action-->
-<!--            android:id="@+id/action_fhirLocationFragment_to_fhirOtherInformationFragment"-->
-<!--            app:destination="@id/fhirOtherInformationFragment" />-->
-<!--&lt;!&ndash;            <argument&ndash;&gt;-->
-<!--&lt;!&ndash;                android:name="patientDetails"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:defaultValue="null" />&ndash;&gt;-->
-<!--&lt;!&ndash;        </action>&ndash;&gt;-->
-<!--        <action-->
-<!--            android:id="@+id/action_fhirLocationFragment_to_fhirAddPatientFragment"-->
-<!--            app:destination="@id/fhirAddPatientFragment" />-->
-<!--    </fragment>-->
-<!--    <fragment-->
-<!--        android:id="@+id/fhirOtherInformationFragment"-->
-<!--        android:name="org.piramalswasthya.cho.ui.commons.fhir_add_patient.other_information.FhirOtherInformationFragment"-->
-<!--        android:label="FhirOtherInformationFragment" >-->
-<!--&lt;!&ndash;        <argument&ndash;&gt;-->
-<!--&lt;!&ndash;            android:name="patientDetails"&ndash;&gt;-->
-<!--&lt;!&ndash;            app:argType="org.hl7.fhir.r4.model.Patient"/>&ndash;&gt;-->
-<!--        <action-->
-<!--            android:id="@+id/action_fhirOtherInformationFragment_to_fhirLocationFragment"-->
-<!--            app:destination="@id/fhirLocationFragment" />-->
-<!--    </fragment>-->
-</navigation>
\ No newline at end of file
+</navigation>
diff --git a/app/src/main/res/values-as/strings.xml b/app/src/main/res/values-as/strings.xml
new file mode 100644
index 000000000..dfd9b59e1
--- /dev/null
+++ b/app/src/main/res/values-as/strings.xml
@@ -0,0 +1,2044 @@
+<resources>
+    <string name="app_name">AAM</string>
+    <string name="all_td_doses_message"> সকল TD মাত্ৰা দিয়া হৈছে</string>
+    <string name="anc_alert_bradycardia">ব্ৰেডিকাৰ্ডিয়া ধৰা পৰিছে — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_tachycardia">টেকিকাৰ্ডিয়া ধৰা পৰিছে — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_blood_sugar_high">ৰক্ত চেনি (উপবাস) — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_urine_sugar_hrp">মূত্ৰত চেনি পজিটিভ — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_urine_albumin_hrp">মূত্ৰত এলবিউমিন পজিটিভ — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_hb_severe_anemia">গভীৰ ৰক্তাল্পতা — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_bp_hrp">অস্বাভাৱিক ৰক্তচাপ ধৰা পৰিছে — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="anc_alert_danger_signs_hrp">সতৰ্কতা: বিপদ সংকেত(সমূহ) নিৰ্বাচিত — উচ্চ ঝুঁকিৰ গৰ্ভাৱস্থা</string>
+    <string name="PREF_NAME" translatable="false">cho-pref-1</string>
+    <string name="PREF_D2D_API_KEY" translatable="false">JWT-Token_A</string>
+    <string name="PREF_primary_API_KEY" translatable="false">JWT-Token_B</string>
+    <string name="PREF_primary_JWT_API_KEY" translatable="false">JWT-Token_N</string>
+    <string name="USER_ROLES" translatable="false">User_Roles</string>
+    <string name="WORK_LOCATION_ID" translatable="false">Working_Location_Id</string>
+    <string name="SECOND_USER_ROLES" translatable="false">Second_User_Roles</string>
+    <string name="SWITCH_USER_ROLES" translatable="false">Switch_User_Roles</string>
+    <string name="title_activity_login">লগইন এক্টিভিটি</string>
+    <string name="prompt_email">ইমেইল</string>
+    <string name="prompt_password">পাছৱৰ্ড</string>
+    <string name="action_sign_in">চাইন ইন বা পঞ্জীয়ন</string>
+    <string name="action_sign_in_short">চাইন ইন কৰক</string>
+    <string name="welcome">স্বাগতম !</string>
+    <string name="invalid_username">এটা বৈধ ব্যৱহাৰকাৰী নাম নহয়</string>
+    <string name="invalid_password">পাছৱৰ্ড ৫ তকৈ বেছি আখৰ হ\'ব লাগিব</string>
+    <string name="PREF_current_saved_language" translatable="false">Locale.Helper.Selected.Language</string>
+    <string name="til_username_hint_text">ব্যৱহাৰকাৰীৰ নাম</string>
+    <string name="login_failed">"লগইন বিফল"</string>
+
+    <string name="hello_blank_fragment">হেলো ব্লেংক ফ্ৰেগমেণ্ট</string>
+    <string name="next">পৰৱৰ্তী</string>
+    <string name="til_password_hint_text">পাছৱৰ্ড</string>
+    <string name="login">লগইন কৰক</string>
+    <string name="app_title">HWC মোবাইল এপ</string>
+    <string name="hwc">এইচ ডব্লিউ চি</string>
+    <string name="facility">সুবিধা</string>
+    <string name="outreach">আউটৰিচ</string>
+    <string name="system_issue">চিস্টেম সমস্যা</string>
+    <string name="manual_issue">মেনুৱেল ইছ্যু</string>
+    <string name="no_batch_selected">দাখিল কৰাৰ আগতে এটা বেচ নিৰ্বাচন কৰক</string>
+    <string name="refresh_batch_data">বেচ ডাটা সতেজ কৰক</string>
+    <string name="batch_data_refreshed">বেচ ডাটা সফলভাৱে সতেজ কৰা হৈছে</string>
+    <string name="batch_refresh_failed">বেচ ডাটা সতেজ কৰিব পৰা নগ’ল। অনুগ্ৰহ কৰি আপোনাৰ সংযোগ পৰীক্ষা কৰক।</string>
+    <string name="no_batches_available">এই ঔষধৰ বাবে কোনো বেচ উপলব্ধ নাই</string>
+    <string name="batch_data_loading">বেচ ডাটা ল’ড হৈ আছে...</string>
+    <string name="medicine_dispensed_successfully">ঔষধ সফলভাৱে বিতৰণ কৰা হৈছে</string>
+    <string name="dispensing_failed">ঔষধ বিতৰণ কৰিব পৰা নগ’ল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+    <string name="network_required_manual_batch">হাতে বেচ নিৰ্বাচনৰ বাবে নেটৱৰ্ক সংযোগ আৱশ্যক</string>
+    <string name="network_required_refresh">বেচ ডাটা সতেজ কৰিবলৈ নেটৱৰ্ক সংযোগ আৱশ্যক। অনুগ্ৰহ কৰি ইণ্টাৰনেটত সংযোগ কৰক।</string>
+    <string name="view_batch_disabled_system">চিষ্টেম সমস্যাৰ মোডত বেচ দৰ্শন নিষ্ক্ৰিয় কৰা হৈছে</string>
+    <string name="system_issue_auto_allocation">চিষ্টেম সমস্যাৰ মোড: স্বয়ংক্ৰিয় বেচ বণ্টন সক্ৰিয়</string>
+    <string name="batch_selection_required">হাতে ইছ্যু মোডত সকলো ঔষধৰ বাবে বেচ নিৰ্বাচন কৰক</string>
+    <string name="batch_selection_required_for">অনুগ্ৰহ কৰি বেচ নিৰ্বাচন কৰক: %s</string>
+    <string name="refreshing">সতেজ কৰি আছে...</string>
+    <string name="last_refreshed_never">শেষ সতেজ কৰা: কেতিয়াও নহয়</string>
+    <string name="error_refreshing_batch_data">বেচ ডাটা সতেজ কৰাত ত্ৰুটি</string>
+    <string name="wellness_activity">সুস্থতা কাৰ্য্যকলাপ</string>
+    <string name="training">প্ৰশিক্ষণ</string>
+    <string name="health_mela">স্বাস্থ্য মেলা</string>
+    <string name="vhsnc_vhsnd">ভিএইচএছএনচি/ ভিএইচএছএনডি</string>
+    <string name="add_patient">ৰোগী যোগ কৰক\n</string>
+    <string name="query_hint_patient_search">সন্ধান কৰিবলৈ ইয়াত টেপ কৰক</string>
+    <string name="title_patient_list">পঞ্জীয়নভুক্ত ৰোগী</string>
+    <string name="login_settings">লগইন_ছেটিংছ</string>
+    <string name="last_sync_time">last_sync_time</string>
+    <string name="last_patient_sync_time">last_patient_sync_time</string>
+    <string name="last_benflow_sync_time">last_benflow_sync_time</string>
+    <string name="last_cbac_sync_time">last_benflow_sync_time</string>
+    <string name="personal_details">ব্যক্তিগত বিৱৰণ</string>
+    <string name="first_name">প্ৰথম নাম <font color="#FF0000">*</font></string>
+    <string name="village_hint">গাঁও <font color="#FF0000">*</font></string>
+    <string name="last_name_surname">শেষ নাম/ উপাধি</string>
+    <string name="contact_no">যোগাযোগ নং</string>
+    <string name="gender">লিংগ <font color="#FF0000">*</font></string>
+    <string name="age">বয়স <font color="#FF0000">*</font></string>
+    <string name="select_subcategory">উপশ্ৰেণী নিৰ্ব্বাচন কৰক</string>
+    <string-array name="subcategories_array">
+        <item>সাধাৰণ সংক্ৰামক ৰোগৰ ব্যৱস্থাপনা</item>
+        <item>তীৱ্ৰ সৰল ৰোগ আৰু সৰু অসুখৰ বাবে আউট পেছেণ্ট যত্ন</item>
+    </string-array>
+
+    <string name="select_category">শ্ৰেণী নিৰ্ব্বাচন কৰক</string>
+    <string-array name="categories_array">
+        <item>সাধাৰণ OPD যত্ন</item>
+    </string-array>
+
+    <string name="select_reason_for_visit">ভ্ৰমণৰ কাৰণ নিৰ্ব্বাচন কৰক</string>
+    <string-array name="reason_for_visit_array">
+        <item>নতুন মুখ্য অভিযোগ(সমূহ)</item>
+        <item>অনুসৰণ</item>
+    </string-array>
+    <string name="select_unit_of_duration">সময়ৰ একক নিৰ্বাচন কৰক</string>
+    <string name="visit_details">বিৱৰণ চাওক</string>
+    <string name="duration">অবধি <font color="#FF0000">*</font></string>
+    <string name="duration2">সময়কাল:</string>
+    <string name="dispensed">বিতৰণ কৰা হৈছে:</string>
+    <string-array name="unit_of_duration_array">
+        <item>ঘণ্টা</item>
+    </string-array>
+    <string name="abha_number">আভা নম্বৰ</string>
+    <string name="name">নাম</string>
+    <string name="phone_no">ফোন নং</string>
+    <string name="registration">পঞ্জীয়ন</string>
+    <string name="advance_search">অগ্ৰিম সন্ধান কৰক</string>
+    <string name="household_search">সন্ধান</string>
+
+    <string name="do_you_want_to_go_back">আপুনি উভতি যাব বিচাৰে নেকি?</string>
+    <string name="offline">অফলাইন</string>
+    <string name="something_went_wrong_nunable_to_connect_to_server_ntry_again_later">কিছু ভুল হ\'ল !\nচাৰ্ভাৰৰ সৈতে সংযোগ কৰিব পৰা নগ\'ল !\nপিছত পুনৰ চেষ্টা কৰক!</string>
+    <string name="try_again">আকৌ এবাৰ চেষ্টা কৰক!</string>
+    <string name="go_to_home">ঘৰলৈ যাওক</string>
+    <string name="tv_ben_name_ph">হিতাধিকাৰীৰ নাম</string>
+    <string name="otp_resent">OTP Resent কৰক</string>
+
+    <string name="medication_form">প্ৰপত্ৰ</string>
+    <string name="medicine_text">দৰৱ</string>
+    <string name="dosage_text">মাত্ৰা</string>
+    <string name="submit_btn_text">দাখিল কৰক</string>
+    <string name="frequency_text">কম্পনাংক</string>
+    <string name="vitals_text">ভিটালছ</string>
+    <string name="location_details">স্থানৰ বিৱৰণ</string>
+    <string name="personal_info">ব্যক্তিগত তথ্য</string>
+    <string name="revisit_details_text">বিৱৰণ পুনৰ চাওক</string>
+    <string name="case_record_text">কেছ ৰেকৰ্ড</string>
+    <string name="lab_record_text">লেব ৰেকৰ্ড</string>
+    <string name="pharmacist_record_text">ফাৰ্মাচিষ্টৰ ৰেকৰ্ড</string>
+
+    <string name="anc">এ এন চি</string>
+    <string name="pnc">পিএনচি</string>
+    <string name="immunization">প্ৰতিষেধক</string>
+
+    <string name="weight_kg_text">ওজন(কিলোগ্ৰাম)</string>
+    <string name="temperature_f_text">তাপমাত্ৰা(F)</string>
+    <string name="bp_mmhg_diastolic_text">বি পি (মিমি এইচ জি) ডায়েষ্টোলিক</string>
+    <string name="bp_mmhg_systolic_text">বি পি (মিমি এইচ জি) চিষ্টোলিক</string>
+    <string name="submit_to_doctor_text">ডাক্তৰৰ ওচৰত জমা দিব</string>
+    <string name="prescription_text">প্ৰেছক্ৰিপচন</string>
+    <string name="investigation">তদন্ত</string>
+    <string name="examination_text">পৰীক্ষা</string>
+    <string name="other_info">অন্যান্য তথ্য</string>
+    <string name="info">তথ্য</string>
+    <string name="want_care_context">তথ্য সফলতাৰে সংৰক্ষণ কৰা হৈছে। আপুনি কেয়াৰ কনটেক্সট লিংক কৰিব বিচাৰেনে?</string>
+    <string name="cancel_care_context">আপুনি কেয়াৰ প্ৰসংগ বাতিল কৰিব বিচাৰেনে?</string>
+    <string name="abha_care_context">ABHA কেয়াৰ প্ৰসংগ মেপিং</string>
+    <string name="generate_abha_otp">OTP সৃষ্টি কৰক</string>
+    <string name="created_date">সৃষ্টি কৰা তাৰিখ</string>
+    <string name="otp_sent">আপোনাৰ পঞ্জীয়নভুক্ত মোবাইল নম্বৰত প্ৰেৰণ কৰা OTP</string>
+    <string name="add_text">যোগ কৰা</string>
+    <string name="stock_warning_text">ষ্টক অনুপলব্ধ</string>
+    <string name="view_prescription_text">প্ৰেছক্ৰিপচন চাওক</string>
+    <string name="submit">দাখিল কৰক</string>
+    <string name="categories_heading">শ্ৰেণী</string>
+    <string name="categories_subcategory">উপ শ্ৰেণী</string>
+    <string name="categories_reasonFV">ভ্ৰমণৰ কাৰণ</string>
+    <string name="DurationInUnit">সময়সীমা ইউনিটত</string>
+    <string name="cancel">বাতিল কৰক</string>
+    <string name="previous">পূৰ্ৱবৰ্তী</string>
+    <string name="anthropometry">নৃতত্ত্ববিজ্ঞান</string>
+    <string name="benificiary_list">লাভৱান তালিকা</string>
+    <string name="title_activity_visit_details">ভিজিটডিটেইলছএক্টিভিটি</string>
+    <string name="esanjeevni">ইসঞ্জীৱনী</string>
+
+
+    <string name="first_fragment_label">প্ৰথম খণ্ড</string>
+    <string name="second_fragment_label">দ্বিতীয় খণ্ড</string>
+
+    <string name="title_activity_abha_id">আভা আইডি কাৰ্য্যকলাপ</string>
+    <string name="aadhar_disclaimer_consent_disclaimer">ABHA Number সৃষ্টিৰ বাবে সন্মতি</string>
+    <string name="aadhar_disclaimer_consent_text">মই ইয়াৰ দ্বাৰা ঘোষণা কৰিছোঁ যে মই স্বেচ্ছাৰে মোৰ আধাৰ নম্বৰ আৰু UIDAI দ্বাৰা প্ৰদান কৰা জনমিতিক তথ্য National Health Authority (NHA)-ৰ সৈতে কেৱল ABHA নম্বৰ সৃষ্টিৰ উদ্দেশ্যে শ্বেয়াৰ কৰিছোঁ। মই বুজি পাওঁ যে মোৰ ABHA নম্বৰ ABDM দ্বাৰা সময়ে সময়ে জাননী কৰা উদ্দেশ্যসমূহৰ বাবে ব্যৱহাৰ আৰু শ্বেয়াৰ কৰা যাব, যাৰ ভিতৰত স্বাস্থ্যসেৱা প্ৰদান অন্তৰ্ভুক্ত। \nঅধিকতে, মই অৱগত যে মোৰ ব্যক্তিগত চিনাক্তযোগ্য তথ্য (নাম, ঠিকনা, বয়স, জন্ম তাৰিখ, লিংগ আৰু ফটো) National Digital Health Ecosystem (NDHE)-ত কৰ্মৰত সংস্থাসমূহৰ সৈতে শ্বেয়াৰ কৰা যাব। ইয়াত স্বাস্থ্য পেছাজীৱী (যেনে ডাক্টৰ), সুবিধাসমূহ (যেনে চিকিৎসালয়, লেবৰেটৰি) আৰু ডাটা ফিডিউচিয়াৰী (যেনে স্বাস্থ্য কাৰ্যসূচী ব্যৱস্থাপক) অন্তৰ্ভুক্ত, যিসকল Ayushman Bharat Digital Mission (ABDM)-ৰ সৈতে নিবন্ধিত বা সংযুক্ত। \nমই NHA-ক UIDAIৰ সৈতে আধাৰ-ভিত্তিক প্ৰমাণীকৰণ কৰাৰ বাবে মোৰ আধাৰ নম্বৰ ব্যৱহাৰ কৰিবলৈ অনুমতি দিছোঁ, যি Aadhaar (Targeted Delivery of Financial and other Subsidies, Benefits and Services) Act, 2016 অনুসৰি কৰা হ’ব। সফল প্ৰমাণীকৰণৰ পিছত UIDAI-এ মোৰ e-KYC বিৱৰণ অথবা “Yes” উত্তৰ NHA-ক শ্বেয়াৰ কৰিব। \nমই আধাৰৰ বিকল্প চিনাক্তকৰণ ব্যৱহাৰৰ বিকল্পৰ বিষয়ে অৱগত কৰা হৈছে; তথাপিও, NDHE জুৰি সুবিধা লাভ কৰাৰ উদ্দেশ্যে মই সচেতনভাৱে আধাৰ নম্বৰ ব্যৱহাৰ কৰিবলৈ বাছি লৈছোঁ। আধাৰ নম্বৰ ব্যতীত মোৰ ব্যক্তিগত চিনাক্তযোগ্য তথ্য ওপৰত উল্লেখ কৰা উদ্দেশ্যসমূহৰ বাবে ব্যৱহাৰ আৰু শ্বেয়াৰ কৰা যাব বুলি মই অৱগত। \nAadhaar আইন আৰু বিধি অনুসৰি, মই যিকোনো সময়ত এই সন্মতি বাতিল কৰাৰ অধিকাৰ সংৰক্ষণ কৰি ৰাখিছোঁ।</string>
+    <string name="generate_abha_id">ABHA নম্বৰ সৃষ্টি কৰক</string>
+
+    <string name="aadhar_consent_text">মই ইয়াৰ দ্বাৰা নিশ্চিত কৰিছোঁ যে ABHA নম্বৰ সৃষ্টিৰ উদ্দেশ্যে ব্যক্তিৰ আধাৰ নম্বৰ ব্যৱহাৰ কৰি তলত উল্লেখ কৰা সন্মতি প্ৰক্ৰিয়াটো তেওঁক বুজাই দিয়া হৈছে।</string>
+    <string name="title_activity_nav">নেভিগেচন এক্টিভিটি</string>
+    <string name="navigation_drawer_open">নেভিগেচন ড্ৰয়াৰ খোলক</string>
+    <string name="navigation_drawer_close">নেভিগেচন ড্ৰয়াৰ বন্ধ কৰক</string>
+    <string name="nav_header_title">Android Studio</string>
+    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_desc">নেভিগেচন হেডাৰ</string>
+    <string name="action_settings">ছেটিংছ</string>
+
+    <string name="menu_home">গৃহ</string>
+    <string name="tab_dashboard">ডেচব\'ৰ্ড</string>
+    <string name="tab_rmnch">আৰএমএনচিএইচ</string>
+    <string name="menu_gallery">গেলেৰী</string>
+    <string name="menu_slideshow">স্লাইডশ্ব\'</string>
+    <string name="error_while_logging_in">লগ ইন কৰাৰ সময়ত ত্ৰুটি!!</string>
+    <string name="invalid_username_entered">অবৈধ ব্যৱহাৰকাৰীৰ নাম!!</string>
+    <string name="confirm_go_back">আপুনি উভতি যাব বিচাৰে নেকি?</string>
+
+    <string name="downloading_abha_card">আভা কাৰ্ড ডাউনলোড কৰি আছে</string>
+    <string name="downloading">ডাউনলোড কৰা হৈছে</string>
+    <string name="downloading_percentage">ডাউনলোড হৈ আছে %d%%</string>
+    <string name="download_failed_retry">ডাউনলোড কৰাত ব্যৰ্থ , অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক</string>
+    <string name="otp_was_resent">অ’টিপিক ক্ষোভিত কৰা হৈছিল।</string>
+    <string name="please_confirm_to_logout">লগআউট কৰিবলৈ অনুগ্ৰহ কৰি নিশ্চিত কৰক।</string>
+    <string name="logout">লগআউট কৰক</string>
+    <string name="select_yes">হয়</string>
+    <string name="select_no">নহয়</string>
+    <string name="history_text">ইতিহাস</string>
+    <string name="previous_comorbidity_conditions">পূৰ্বৰ কোমৰবিডিটিৰ অৱস্থা</string>
+    <string name="time_period_ago">সময়ৰ সময়ছোৱা আগৰ</string>
+    <string name="fever">জ্বৰ</string>
+    <string name="_3_days">৩ দিন</string>
+    <string name="_1_month_ago">১ মাহৰ আগতে</string>
+    <string name="close">বন্ধ</string>
+    <string name="illness">ৰোগ</string>
+    <string name="previous_alcohol_history">পূৰ্বৰ মদ্যপানৰ ইতিহাস</string>
+    <string name="previous_allergic_history">পূৰ্বৰ এলাৰ্জিৰ ইতিহাস</string>
+    <string name="previous_illness">পূৰ্বৰ অসুস্থতা</string>
+    <string name="previous_medication_history">পূৰ্বৰ ঔষধৰ ইতিহাস</string>
+    <string name="previous_tobacco_history">পূৰ্বৰ ধঁপাতৰ ইতিহাস</string>
+    <string name="associated_ailments">সংশ্লিষ্ট ৰোগ</string>
+    <string name="select_associated_ailments">সংশ্লিষ্ট ৰোগসমূহ নিৰ্বাচন কৰক</string>
+    <string name="enter_duration">সময়সীমা লিখক  <font color="#FF0000">*</font></string>
+    <string name="enter_inspection">পৰিদৰ্শন</string>
+    <string name="duration_unit">সময়সীমা একক</string>
+    <string name="select_duration_unit">সময়সীমা একক নিৰ্ব্বাচন কৰক</string>
+    <string name="f_h_of_member">সদস্যৰ F/H</string>
+    <string name="select_f_h_of_member">সদস্যৰ F/H নিৰ্বাচন কৰক</string>
+    <string name="inactive_for_future_visit">ভৱিষ্যত ভ্ৰমণৰ বাবে নিষ্ক্ৰিয়</string>
+    <string name="add">যোগ কৰা</string>
+    <string name="reset">ৰিছেট কৰক</string>
+    <string name="delete">বিলোপ</string>
+    <string name="alcohol_use_status">মদ্যপান সেৱনৰ অৱস্থা</string>
+    <string name="select_alcohol_use_status">মদ্যপান ব্যৱহাৰৰ অৱস্থা নিৰ্ব্বাচন কৰক</string>
+    <string name="allergy_name">এলাৰ্জীৰ নাম</string>
+    <string name="enter_allergy_name">এলাৰ্জীৰ নাম লিখক</string>
+    <string name="type_of_allergic_reaction">এলাৰ্জিৰ প্ৰকাৰ</string>
+    <string name="select_type_of_allergic_reaction">এলাৰ্জিক প্ৰতিক্ৰিয়াৰ ধৰণ নিৰ্বাচন কৰক</string>
+    <string name="genetic_disorder">জেনেটিক ডিছঅৰ্ডাৰ</string>
+    <string name="enter_genetic_disorder">জেনেটিক ডিছঅৰ্ডাৰত প্ৰৱেশ কৰক</string>
+    <string name="select_illness">অসুস্থতা নিৰ্বাচন কৰক</string>
+    <string name="select_time_period_ago">আগৰ সময়কাল নিৰ্ব্বাচন কৰক</string>
+    <string name="current_medication">বৰ্তমানৰ ঔষধ</string>
+    <string name="enter_medication">ঔষধ প্ৰৱেশ কৰক</string>
+    <string name="h_o_surgery">H/O অস্ত্ৰোপচাৰ</string>
+    <string name="select_h_o_surgery">H/O Surgery নিৰ্বাচন কৰক</string>
+    <string name="tobacco_use_status">ধঁপাত সেৱনৰ অৱস্থা</string>
+    <string name="select_tobacco_use_status">ধঁপাত ব্যৱহাৰৰ অৱস্থা নিৰ্ব্বাচন কৰক</string>
+    <string name="past_history">অতীতৰ ইতিহাস</string>
+    <string name="previous_history">পূৰ্বৰ ইতিহাস</string>
+    <string name="past_illness">অতীতৰ অসুস্থতা</string>
+    <string name="past_h_o_surgery">অতীতৰ H/O অস্ত্ৰোপচাৰ</string>
+    <string name="covid_vaccination_status">Covid টিকাকৰণৰ অৱস্থা</string>
+    <string name="age_group">বয়সৰ গোট</string>
+    <string name="vaccination_status">টিকাকৰণৰ অৱস্থা</string>
+    <string name="select_vaccination_status">টিকাকৰণৰ অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="vaccination_type">টিকাকৰণৰ প্ৰকাৰ</string>
+    <string name="select_vaccination_type">টিকাকৰণৰ ধৰণ নিৰ্বাচন কৰক</string>
+    <string name="dose_taken">ড’জ লোৱা</string>
+    <string name="select_dose_taken">গ্ৰহণ কৰা মাত্ৰা নিৰ্বাচন কৰক</string>
+    <string name="medication_history">ঔষধৰ ইতিহাস</string>
+    <string name="personal_history_habit_risk_factor">ব্যক্তিগত ইতিহাস(অভ্যাস/বিপদ কাৰক)</string>
+    <string name="personal_tobacco_history">ব্যক্তিগত ধঁপাতৰ ইতিহাস</string>
+    <string name="personal_alcohol_history">ব্যক্তিগত মদ্যপানৰ ইতিহাস</string>
+    <string name="personal_alergy_history">ব্যক্তিগত এলাৰ্জীৰ ইতিহাস</string>
+
+    <string name="choose_abha_gen_mode">আভা জেন মোড বাছক</string>
+    <string name="abha_gen_mode">আভা জেন মোড</string>
+    <string name="state">ৰাজ্য</string>
+    <string name="choose_state">ৰাজ্য বাছক</string>
+    <string name="district_town_city">জিলা/নগৰ/নগৰ</string>
+    <string name="choose_district">জিলা বাছক</string>
+    <string name="taluk_tehsil">তালুক/তেহচিল</string>
+    <string name="choose_taluk">তালুক বাছি লওক</string>
+    <string name="street_panchayat_village">ৰাস্তা/পঞ্চায়ত/গাঁও</string>
+    <string name="choose_panchayat">পঞ্চায়ত বাছি লওক</string>
+    <string name="select_sub_category">উপ শ্ৰেণী</string>
+    <string name="select_chief_complaint">মুখ্য অভিযোগ নিৰ্বাচন কৰক  <font color="#FF0000">*</font></string>
+    <string name="select_chief_complaint_without_astrict">মুখ্য অভিযোগ</string>
+    <string name="enter_your_description">বিৱৰণ দিয়ক</string>
+    <string name="select_file">ফাইল নিৰ্ব্বাচন কৰক</string>
+    <string name="upload_file">ফাইল আপল\'ড কৰক</string>
+    <string name="category">শ্ৰেণী (<font color="#FF0000">*</font>)</string>
+    <string name="sub_category">উপ-শ্ৰেণী (<font color="#FF0000">*</font>)</string>
+    <string name="select_and_upload_file">ফাইল আপল\'ড কৰক</string>
+    <string name="selected_file">নিৰ্বাচিত ফাইল</string>
+    <string name="chief_complaint">মুখ্য অভিযোগ (<font color="#FF0000">*</font>)</string>
+    <string name="unit_of_duration">সময়সীমাৰ একক (<font color="#FF0000">*</font>)</string>
+    <string name="description">বিৱৰণ</string>
+    <string name="enter_other_associated_ailments">অন্যান্য সংশ্লিষ্ট ৰোগসমূহ প্ৰৱেশ কৰক</string>
+    <string name="select_allergy_status">এলাৰ্জীৰ অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="allergy_type">এলাৰ্জীৰ প্ৰকাৰ</string>
+    <string name="select_allergy_type">এলাৰ্জীৰ ধৰণ নিৰ্বাচন কৰক</string>
+    <string name="enter_other_type_of_allergic_reaction">অন্য ধৰণৰ এলাৰ্জিক প্ৰতিক্ৰিয়া প্ৰৱেশ কৰক</string>
+    <string name="allergy_status">এলাৰ্জীৰ অৱস্থা</string>
+    <string name="enter_weight">ওজন লিখক</string>
+    <string name="height_cm">উচ্চতা(চে.মি.)</string>
+    <string name="bmi">বি এম আই</string>
+    <string name="waist_circumference_cm">কঁকালৰ পৰিধি(চে.মি.)</string>
+    <string name="temperature_f">তাপমাত্ৰা (F)</string>
+    <string name="pulse_rate_min">পালছ ৰেট (BPM)</string>
+    <string name="spo2">SPO2(%)</string>
+    <string name="respiratory_per_min">শ্বাস-প্ৰশ্বাসৰ হাৰ(প্ৰতি মিনিট)</string>
+    <string name="rbs_mg_dl">RBS ফলাফল(mg/dl)</string>
+    <string name="previous_allergy_history">পূৰ্বৰ এলাৰ্জীৰ ইতিহাস</string>
+    <string name="outpatient_care">বহিঃৰোগীৰ যত্ন</string>
+    <string name="file_type">ফাইল আপলোড কৰক (সৰ্বাধিক আকাৰ: ৫ MB)\nসমৰ্থিত ফাইল ফৰ্মেটসমূহ \n(.msg,.pdf,.png,.jpeg,.doc,.docx,.xlsx,.xls,.csv,.txt)</string>
+    <string name="lonic_url">http://loinc.org</string>
+    <string name="vital_signs_panel">ভাইটেল চিহ্ন পেনেল</string>
+    <string name="vital_signs_panel_code_text">ভাইটেল চিহ্ন পেনেল</string>
+    <string name="observation_category_url">http://terminology.hl7.org/CodeSystem/observation-category</string>
+    <string name="vital_signs">জীৱনদায়ক চিন</string>
+    <string name="vital_signs_code">vital-signs</string>
+    <string name="height_cm_text">উচ্চতা_চে.মি</string>
+    <string name="weight_kg">ওজন_কিলোগ্ৰাম</string>
+    <string name="bmi_text">বিএমআই</string>
+    <string name="waistcircumference_cm">কঁকালৰ পৰিধি_চে.মি</string>
+    <string name="temperature">তাপমান</string>
+    <string name="pulserate">pulseRate</string>
+    <string name="spo2_text">sPO2</string>
+    <string name="systolicbp_1streading">systolicBP_1stReading</string>
+    <string name="diastolicbp_1streading">ডায়েষ্টোলিকBP_1stReading</string>
+    <string name="respiratoryrate">শ্বাস-প্ৰশ্বাসজনিতRate</string>
+    <string name="rbstestresult">rbsTestResult</string>
+    <string name="vitals_information_is_saved">ভিটালছৰ তথ্য সংৰক্ষণ কৰা হয়।</string>
+    <string name="overweight_txt">অতিৰিক্ত ওজন</string>
+    <string name="obese_txt">মেদবহুল</string>
+    <string name="normal_txt">স্বাভাৱিক</string>
+    <string name="higher_center">উচ্চ কেন্দ্ৰ</string>
+    <string name="reason_for_referral">ৰেফাৰেলৰ কাৰণ</string>
+    <string name="linkage_with_other_health_services">অন্যান্য স্বাস্থ্য সেৱাৰ সৈতে সংযোগ</string>
+    <string name="date_of_birth">জন্ম তাৰিখ <font color="#FF0000">*</font></string>
+    <string name="age_in_unit">বয়স (এককত) <font color="#FF0000">*</font></string>
+    <string name="phone_number">ফোন নম্বৰ</string>
+    <string name="registration_date">পঞ্জীয়নৰ তাৰিখ</string>
+    <string name="marital_status">বৈবাহিক অৱস্থা <font color="#FF0000">*</font></string>
+    <string name="spouse_name">জীৱনসঙ্গীৰ নাম <font color="#FF0000">*</font></string>
+    <string name="wife_name">স্ত্ৰীৰ নাম <font color="#FF0000">*</font></string>
+    <string name="husband_s_name">স্বামীৰ নাম <font color="#FF0000">*</font></string>
+    <string name="wife_s_name">স্ত্ৰীৰ নাম <font color="#FF0000">*</font></string>
+    <string name="age_at_marriage">বিয়াৰ সময়ৰ বয়স <font color="#FF0000">*</font></string>
+
+    <string name="revisit_date">পুনৰ ভ্ৰমণৰ তাৰিখ</string>
+    <string name="saved">সংৰক্ষিত হৈছে !!</string>
+    <string name="error_in_saving_refer_and_revisit_information">তথ্য চাওক আৰু পুনৰায় চাওক সংৰক্ষণ কৰাত ত্ৰুটি</string>
+    <string name="error">আঁসোৱাহ!</string>
+    <string name="toast_msg_duration_unit">অনুগ্ৰহ কৰি সময়সীমাৰ একক নিৰ্বাচন কৰক</string>
+    <string name="toast_msg_duration">"অনুগ্ৰহ কৰি সময়সীমা লিখক"</string>
+    <string name="toast_msg_chief">অনুগ্ৰহ কৰি মুখ্য অভিযোগ নিৰ্বাচন কৰক</string>
+    <string name="toast_upload_file">অনুগ্ৰহ কৰি নিৰ্বাচিত ফাইলটো আপল\'ড কৰক</string>
+    <string name="toast_sub_cat_select">অনুগ্ৰহ কৰি উপ শ্ৰেণী নিৰ্বাচন কৰক</string>
+    <string name="toast_cat_select">অনুগ্ৰহ কৰি শ্ৰেণী নিৰ্বাচন কৰক</string>
+    <string name="toast_file_uploaded">আপুনি ফাইলটো আপলোড কৰিছে</string>
+    <string name="toast_file_size_max">অনুগ্ৰহ কৰি 5MB তকৈ কম ফাইল নিৰ্ব্বাচন কৰক</string>
+    <string name="nav_item_1_text">নাম : <b>%s</b></string>
+    <string name="nav_item_4_text">ম’বাইল নম্বৰ : <b>%s</b></string>
+    <string name="nav_item_2_text">ব্যৱহাৰকাৰী নাম : <b>%s</b></string>
+    <string name="nav_item_3_text">ব্যৱহাৰকাৰী ID :  <b>%d</b></string>
+    <string name="nav_item_5_text">সুবিধাৰ নাম : <b>%s</b></string>
+    <string name="nav_item_6_text">কৰ্মচাৰী আইডি : <b>%s</b></string>
+    <string name="nav_item_7_text">সুবিধা আইডি : <b>%s</b></string>
+    <string name="nav_item_8_text">অৱস্থানৰ প্ৰকাৰ : <b>%s</b></string>
+    <string name="individual_s_consent_for_creation_of_abha_number">ABHA Number সৃষ্টিৰ বাবে ব্যক্তিৰ সন্মতি।</string>
+    <string name="exit">প্ৰস্থান</string>
+    <string name="timer">টাইমাৰ</string>
+    <string name="yes">হয়</string>
+    <string name="no">নহয়</string>
+    <string name="fp_tv">আগবাঢ়ি যাবলৈ অনুগ্ৰহ কৰি আঙুলিৰ ছাপ চেন্সৰত আপোনাৰ আঙুলি ৰাখক</string>
+    <string name="fp_try_again">আঙুলি চিনি পোৱা নাই আকৌ চেষ্টা কৰক!</string>
+    <string name="fingerprint_captured">FingerPrint বন্দী কৰা হৈছে!</string>
+    <string name="parent_gurdian_name">পিতৃ-মাতৃ/অভিভাৱকৰ নাম</string>
+    <string name="religion">ধৰ্ম</string>
+    <string name="community">সমুদায়</string>
+    <string name="select_test_name">পৰীক্ষাৰ নাম</string>
+    <string name="diagnosis">নিদান</string>
+    <string name="provisional_diagnosis">অস্থায়ী/চূড়ান্ত ৰোগ নিৰ্ণয় <font color="#FF0000">*</font></string>
+    <string name="dosage">মাত্ৰা</string>
+    <string name="dose">মাত্ৰা:</string>
+    <string name="frequency">কম্পনাংক</string>
+    <string name="frequency2">কম্পনাংক:</string>
+    <string name="batch_no">বেচ নং:</string>
+    <string name="instructions">নিৰ্দেশনাসমূহ</string>
+    <string name="unit">একক</string>
+    <string name="route">পথ</string>
+    <string name="route2">পথ:</string>
+    <string name="external_investigation">বাহ্যিক তদন্ত</string>
+    <string name="save_successful">সংৰক্ষণ সফল\n</string>
+    <string name="success">সফলতা</string>
+    <string name="something_wend_wong">কিবা এটা ভুল হ’ল</string>
+    <string name="loading_form">প্ৰপত্ৰ লোড কৰা হৈছে</string>
+    <string name="loading">লোড কৰা হৈছে অনুগ্ৰহ কৰি অপেক্ষা কৰক....</string>
+    <string name="initial_setup_title">প্ৰাৰম্ভিক ব্যৱস্থা</string>
+    <string name="initial_setup_subtitle">প্ৰয়োজনীয় ডাটা ডাউনলোড হৈ আছে। প্ৰথমবাৰৰ লগইনত এইটো কেইমিনিট সময় ল’ব পাৰে।</string>
+    <string name="personal_information">ৰোগীৰ পঞ্জীয়ন</string>
+    <string name="location_information">স্থানৰ তথ্য</string>
+    <string name="other_information">অন্যান্য তথ্য</string>
+    <string name="invalid_phone_number">এটা বৈধ ফোন নম্বৰ দিয়ক</string>
+    <string name="enter_a_valid_phone_number">এটা বৈধ ফোন নম্বৰ দিয়ক</string>
+    <string name="enter_your_first_name">আপোনাৰ প্ৰথম নাম লিখক</string>
+    <string name="enter_last_name">আপোনাৰ শেষ নাম লিখক</string>
+    <string name="fill_dob">আপোনাৰ জন্ম তাৰিখ পূৰণ কৰক</string>
+    <string name="enter_your_age">আপোনাৰ বয়স প্ৰৱেশ কৰক</string>
+    <string name="select_age_in_unit">এককত বয়স নিৰ্বাচন কৰক</string>
+    <string name="select_marital_status">বৈবাহিক অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="enter_spouse_name">পত্নীৰ নাম লিখক</string>
+    <string name="enter_husband_name">স্বামীৰ নাম লিখক</string>
+    <string name="enter_wife_name">পত্নীৰ নাম লিখক</string>
+    <string name="enter_age_at_marriage">বিবাহত বয়স প্ৰৱেশ কৰক</string>
+    <string name="select_gender">লিংগ নিৰ্বাচন কৰক</string>
+    <string name="select_village">গাঁও নিৰ্বাচন কৰক</string>
+    <string name="enter_father_s_name_error">এটা বৈধ পিতৃৰ নাম দিয়ক</string>
+    <string name="are_you_sure">আপুনি নিশ্চিত নেকি?</string>
+    <string name="cancel_confirmation_message">আপুনি বাতিল কৰিব বিচাৰেনে? কোনো সংৰক্ষিত নোহোৱা তথ্য হেৰাই যাব।</string>
+    <string name="patient_registered_successfully_title">ৰোগী সফলতাৰে পঞ্জীয়ন কৰা হৈছে</string>
+    <string name="patient_edited_successfully_title">ৰোগীৰ বিৱৰণ সফলতাৰে সম্পাদনা কৰা হৈছে</string>
+    <string name="network_error">নেটৱৰ্ক ত্ৰুটি!!</string>
+    <string name="linked_to_beneficiary">হিতাধিকাৰীৰ সৈতে সংযুক্ত</string>
+    <string name="duration_tv">সময়কাল</string>
+    <string name="url_uat_esanjeevani">https://uat.esanjeevani.in/#/বাহ্যিক-প্ৰদানকাৰী-চাইন/</string>
+    <string name="something_went_wrong">কিবা এটা ভুল হ\'ল !</string>
+    <string name="beneficiary_abha_number">হিতাধিকাৰী আভা নম্বৰ।</string>
+    <string name="no_records_found">কোনো ৰেকৰ্ড পোৱা নগ\'ল!!</string>
+    <string name="patients_cnt_display">ৰোগী</string>
+    <string name="subtractSign">-</string>
+    <string name="addSign">+</string>
+    <string name="_1">1</string>
+    <string name="form_medicine_dosage">ৰূপ/ঔষধ/মাত্ৰা</string>
+    <string name="councilling_advice">পৰামৰ্শ/ পৰামৰ্শ</string>
+    <string name="refer">উল্লেখ</string>
+    <string name="instruction">নিৰ্দেশনা</string>
+    <string name="Unit">একক</string>
+    <string name="Frequency">কম্পনাংক</string>
+    <string name="Prescription">প্ৰেছক্ৰিপচন</string>
+    <string name="nurseDataNotSaved">এই ৰেকৰ্ডৰ বাবে নাৰ্ছৰ তথ্য সংৰক্ষণ কৰা নহয়</string>
+    <string name="dataSavedCaseRecord">কেছ ৰেকৰ্ড তথ্য সংৰক্ষণ কৰা হৈছে</string>
+    <string name="pendingForLabtech">লেবৰ ফলাফলৰ বাবে বাকী আছে</string>
+    <string name="pending_for_pharmacist_dispense">ফাৰ্মাচিষ্টৰ বিতৰণৰ বাবে অপেক্ষাৰত</string>
+    <string name="case_close_confirmation">এই কেছটো বন্ধ কৰা হৈছে। আপুনি আগবাঢ়িব বিচাৰে নেকি?</string>
+    <string name="case_closed_successfully">কেছ সফলভাৱে বন্ধ কৰা হৈছে</string>
+    <string name="close_case_btn">কেছ বন্ধ কৰক</string>
+    <string name="flowCompleted">প্ৰবাহ সম্পূৰ্ণ হৈছে</string>
+    <string name="unsyncedNurseData">অচিংকড নাৰ্ছৰ তথ্য পোৱা গৈছে। অনুগ্ৰহ কৰি সিঙ্ক কৰক আৰু পুনৰ চেষ্টা কৰক</string>
+    <string name="diagnosisCannotBeEmpty">অনুগ্ৰহ কৰি অস্থায়ী প্ৰৱেশ কৰক</string>
+    <string name="note_ben_reg">টোকা!</string>
+    <string name="please_search_for_beneficiary">পঞ্জীয়নৰ পূৰ্বে Beneficiary বুলি সন্ধান কৰক।</string>
+    <string name="no_patient_found">কোনো মিল থকা ৰোগী পোৱা নগ’ল। তলৰ পৰা এটা বিকল্প বাছি লওক।</string>
+    <string name="chief_complaint2">মুখ্য অভিযোগ তালিকা</string>
+    <string name="beneficiary_name">হিতাধিকাৰীৰ নাম:</string>
+    <string name="abha_no">আভা নং:</string>
+    <string name="ben_id">বেন আইডি:</string>
+    <string name="ben_age">বয়স:</string>
+    <string name="quantity_prescribed">নিৰ্ধাৰিত পৰিমাণ:</string>
+    <string name="quantity_in_hand">হাতত থকা পৰিমাণ:</string>
+    <string name="quantity_dispensed">বিতৰণ কৰা পৰিমাণ:</string>
+    <string name="special_instructions">বিশেষ নিৰ্দেশনা:</string>
+    <string name="dispensed_quantity">বিতৰণ কৰা পৰিমাণ:</string>
+    <string name="expiry_date">মেয়াদ উকলি যোৱাৰ তাৰিখ:</string>
+    <string name="ben_phone_no">ফোন নং:</string>
+    <string name="ben_visit_date">ভ্ৰমণৰ তাৰিখ:</string>
+    <string name="ben_visit_num">ভ্ৰমণ নং:</string>
+    <string name="ben_gender">লিংগ:</string>
+    <string name="abha">আভা</string>
+    <string name="view_batch">বেচ চাওক</string>
+    <string name="ok_button">ঠিক আছে</string>
+    <string name="change_role">ভূমিকা সলনি কৰক</string>
+    <string name="remember_me">মোক মনত পেলাওক</string>
+    <string name="other_cphc_services">অন্যান্য চিপিএইচচি সেৱাসমূহ</string>
+    <string name="reason_for_visit">ভ্ৰমণৰ কাৰণ</string>
+    <string name="ben_card_name">নাম:</string>
+    <string name="beneficiary_id">হিতাধিকাৰী আইডি:</string>
+    <string name="beneficiary_id_format">হিতাধিকাৰী আইডি: %s</string>
+    <string name="beneficiary_id_label">হিতাধিকাৰী আইডি:</string>
+    <string name="master_longitude">মাষ্টাৰ দ্ৰাঘিমাংশ</string>
+    <string name="get_location">স্থান পাওক</string>
+    <string name="master_latitude">মাষ্টাৰ লেটিটুড</string>
+    <string name="get_gps_location">জিপিএছ স্থান লাভ কৰক</string>
+    <string name="retry">পুনৰ চেষ্টা কৰক</string>
+    <string name="please_select_your_language">অনুগ্ৰহ কৰি আপোনাৰ ভাষা নিৰ্বাচন কৰক</string>
+    <string name="please_select_your_language_kannada">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+
+    <string name="english_lang">English</string>
+    <string name="kannada_lang">ಕನ್ನಡ</string>
+    <string name="hindi_lang">हिंदी</string>
+    <string name="assamese">অসমীয়া</string>
+
+    <string name="registrar_role">পঞ্জীয়ক</string>
+    <string name="nurse_role">নাৰ্ছ</string>
+    <string name="doctor_role">ডাক্তৰ</string>
+    <string name="pharmacist_role">ফাৰ্মাচিষ্ট</string>
+    <string name="lab_technician_role">লেব টেকনিচিয়ান</string>
+    <string name="cho_role">CHO</string>
+    <string name="proceed_with_registration">পঞ্জীয়নৰ কাম আগবাঢ়ক</string>
+
+    <string name="patient_successfully_registered">ৰোগী সফলতাৰে পঞ্জীয়ন কৰা হৈছে।</string>
+
+    <string name="tap_to_take_photo">ফটো তুলিবলৈ টেপ কৰক</string>
+    <string name="photo">ফটো</string>
+    <string name="permission_to_access_the_camera_denied">কেমেৰাত প্ৰৱেশ কৰাৰ অনুমতি অস্বীকাৰ কৰা হৈছে!</string>
+
+    <string name="User_Login_Type">ব্যৱহাৰকাৰী_লগইন_প্ৰকাৰ</string>
+
+    <string name="pwr_by_text" translatable="false">Powered by\n <b>Piramal Foundation</b></string>
+
+    <string name="opd_count">OPD গণনা :</string>
+    <string name="female_opd">মহিলা:</string>
+    <string name="others_opd">অন্যান্য:</string>
+    <string name="ncd_count">এনচিডিৰ সংখ্যা:</string>
+    <string name="anc_count">ANC\nগণনা:</string>
+    <string name="pnc_count">পিএনচি গণনা :</string>
+    <string name="family_count">পৰিয়াল\nগণনা:</string>
+    <string name="immunization_tv">প্ৰতিষেধক\nগণনা:</string>
+    <string name="count_imm">হিচাপ কৰা:</string>
+    <string name="hbnc_count">এইচ বি এন চি কাউণ্ট</string>
+    <string name="hbyc_count">HBYC\nগণনা:</string>
+
+    <string name="select_menu">চয়ন কৰা</string>
+    <string name="male_opd">পুৰুষ:</string>
+
+    <string name="consultant_name">পৰামৰ্শদাতাৰ নাম:</string>
+    <string name="visit_code">ভিজিট কোড:</string>
+    <string name="prescription_id">প্ৰেছক্ৰিপচন আইডি:</string>
+
+    <string name="form_label">প্ৰপত্ৰ:</string>
+    <string name="available_quantity">উপলব্ধ পৰিমাণ:</string>
+    <string name="prescribed_label">নিৰ্ধাৰিত:</string>
+    <string name="prescribed_label_qt">নিৰ্ধাৰিত পৰিমাণ:</string>
+
+    <string name="patient_registered_successfully">ৰোগী সফলতাৰে পঞ্জীয়ন কৰা হৈছে।</string>
+
+    <string name="father_s_name">পিতৃৰ নাম <font color="#FF0000">*</font></string>
+
+    <string name="exit_application">এপ্লিকেচনৰ পৰা ওলাই যাওক</string>
+    <string name="do_you_want_to_exit_application">আপুনি এপ্লিকেচনৰ পৰা ওলাই যাব বিচাৰেনে</string>
+
+    <string name="patient_cnt_display">" ৰোগী"</string>
+
+    <string name="alert_popup">সতৰ্ক</string>
+    <string name="phone_no_not_found">ফোন নং পোৱা নগ\'ল।</string>
+
+    <string name="esanjeevaniusername_local_saved" translatable="false">esanjeevaniUsername-local-saved</string>
+    <string name="esanjeevanipassword_local_saved" translatable="false">esanjeevaniPassword-local-saved</string>
+
+    <string name="new_chief_complaint_str">নতুন মুখ্য অভিযোগ</string>
+    <string name="follow_up_str">খতিয়ান লোৱা</string>
+
+    <string name="report">অভিযোগ কৰা</string>
+    <string name="component_name">উপাদানৰ নাম</string>
+    <string name="result">ফলাফল</string>
+    <string name="meas_unit">জোখ-মাখৰ একক</string>
+    <string name="remarks">মন্তব্য</string>
+
+    <string name="select_test_name_date">পৰীক্ষাৰ নাম - (তাৰিখ)</string>
+    <string name="result_meas_unit">ফলাফল -জোখ-মাখৰ একক</string>
+    <string name="date_time">তাৰিখ আৰু সময়</string>
+
+    <string name="Use_Previous_data">পুৰণি মুখ্য অভিযোগ আৰু গুৰুত্বপূৰ্ণ তথ্য দাখিল কৰক</string>
+
+    <string name="save_template">টেমপ্লেট সংৰক্ষণ কৰক</string>
+    <string name="enter_temp_name">সাঁচৰ নাম সুমুৱাওক</string>
+    <string name="select_temp_to_fill">পূৰণ কৰিবলৈ Template select কৰি নাম</string>
+    <string name="template_save">টেমপ্লেটৰ নাম সংৰক্ষিত</string>
+
+    <string name="form_name">প্ৰপত্ৰৰ নাম</string>
+    <string name="Sync_state">ছিঙ্ক অৱস্থা</string>
+
+    <string name="patient_form">পঞ্জীয়ন</string>
+    <string name="sync">ছিঙ্ক কৰক</string>
+    <string name="pharmacy_form">ফাৰ্মাচী ফৰ্ম</string>
+    <string name="lab_form">লেব টেকনিচিয়ান ফৰ্ম</string>
+    <string name="doctor_form">কেছ ৰেকৰ্ড</string>
+    <string name="nurse_form">ভিজিট আৰু ভাইটেলছ</string>
+
+    <string name="Yes_state">হয়</string>
+    <string name="No_state">নহয়</string>
+
+    <string name="duration_prescription">সময়কাল</string>
+
+    <string name="form_input_empty_error">প্ৰয়োজনীয় ক্ষেত্ৰ খালী হ\'ব নোৱাৰে !</string>
+    <string name="form_input_upper_case_error">কেৱল ডাঙৰ আখৰৰ বৰ্ণমালাহে অনুমতি দিয়া হৈছে!</string>
+    <string name="form_input_missing_entry_error">ক্ষেত্ৰত %1$d সংখ্যা থাকিব লাগিব।</string>
+    <string name="form_input_alphabet_space_only_error">কেৱল বৰ্ণমালা আৰু বগা স্থানৰ অনুমতি!</string>
+    <string name="form_input_alphabet_special_only_error">কেৱল বৰ্ণমালা আৰু বিশেষ আখৰৰ অনুমতি!</string>
+    <string name="form_input_min_limit_error">%1$s %2$d তকৈ ডাঙৰ বা সমান হব লাগে</string>
+    <string name="form_input_alph_numeric_space_only_error">কেৱল বৰ্ণমালা আৰু সংখ্যাৰ অনুমতি!</string>
+    <string name="form_input__no_alpha_space_error">কোনো বৰ্ণমালা বা স্থানৰ অনুমতি নাই!</string>
+    <string name="form_input_digit_only_error">কেৱল Digits ৰ অনুমতি!</string>
+    <string name="form_input_min_limit_error_decimal">%1$s %2$.1f তকৈ ডাঙৰ বা সমান হব লাগে</string>
+    <string name="form_input_max_limit_error">%1$s %2$d তকৈ কম বা সমান হব লাগে</string>
+    <string name="form_input_max_limit_error_decimal">%1$s %2$.1f তকৈ কম বা সমান হব লাগে</string>
+    <string name="form_input_error_invalid_mobile">অবৈধ মোবাইল নম্বৰ !</string>
+    <string name="form_input_error_invalid_rch">অবৈধ RCH আইডি !</string>
+    <string name="form_input_error_invalid_mcp">অবৈধ এমচিপি নম্বৰ !</string>
+    <string name="form_input_error_invalid_aadhar">অবৈধ আধাৰ নম্বৰ !</string>
+
+    <string name="view">দৰ্শন</string>
+    <string name="back">পিছলৈ</string>
+    <string name="something_wend_wong_contact_testing">কিবা এটা wend wong! যোগাযোগ পৰীক্ষা!</string>
+
+    <string name="iv_sync_state_tv">SYNC STATE</string>
+    <string name="high_risk">হাই ৰিস্ক</string>
+
+    <string name="tv_required_text_asterisk">*</string>
+
+    <string name="btn_submit">দাখিল কৰক</string>
+    <string name="edit">সম্পাদনা কৰক</string>
+
+    <string name="radio_title_ds">%s<span> **</span></string>
+    <string name="radio_title">%s<span> *</span></string>
+
+    <string name="anc_visit_number">ANC %1d ভ্ৰমণ কৰক</string>
+    <string name="anc_visits">এ এন চি ভ্ৰমণ</string>
+    <string name="pnc_visit_number">%1d দিনত পিএনচি ভ্ৰমণ</string>
+    <string name="pnc_visits">পিএনচি ভ্ৰমণ</string>
+    <string name="view_visits">ভিজিটসমূহ চাওক</string>
+
+    <string name="icon_title_pmr">গৰ্ভৱতী মহিলাৰ পঞ্জীয়ন</string>
+    <string name="title_register_pregnancy">গৰ্ভৱতী মহিলাৰ পঞ্জীয়ন</string>
+    <string name="title_view_pregnancy_registration">গৰ্ভাৱস্থাৰ পঞ্জীয়ন চাওক</string>
+    <string name="pwr_eligibility_error">গৰ্ভাৱস্থা পঞ্জীয়ন প্ৰ-পত্ৰ উপলব্ধ নহয়</string>
+
+    <string name="pnc_period">পিএনচি পিৰিয়ড</string>
+    <string name="pnc_visit_date">পিএনচি ভ্ৰমণৰ তাৰিখ</string>
+    <string name="pnc_ifa_tabs_given">IFA Tablets ৰ সংখ্যা দিয়া হৈছে</string>
+    <string name="pnc_contraception_method">গৰ্ভনিৰোধৰ পদ্ধতি</string>
+    <string name="pnc_any_contraception_method">প্ৰসৱৰ পিছত গৰ্ভধাৰণ ৰোধ কৰিবলৈ দম্পতিয়ে ব্যৱহাৰ কৰা পৰিয়াল পৰিকল্পনা পদ্ধতি কি?</string>
+    <string name="pnc_other_ppc_method">অন্যান্য পিপিচি পদ্ধতি</string>
+    <string name="pnc_mother_danger_sign">মাতৃ বিপদৰ চিন</string>
+    <string name="pnc_other_danger_sign">অন্যান্য বিপদৰ চিন</string>
+    <string name="pnc_referral_facility">ৰেফাৰেল সুবিধা</string>
+    <string name="pnc_mother_death">মাতৃ মৃত্যু</string>
+    <string name="pnc_death_date">মৃত্যুৰ তাৰিখ</string>
+    <string name="pnc_death_cause">মাতৃৰ মৃত্যুৰ সম্ভাৱ্য কাৰণ</string>
+    <string name="pnc_other_death_cause">অন্যান্য মৃত্যুৰ কাৰণ</string>
+    <string name="pnc_death_place">মৃত্যুৰ স্থান</string>
+    <string name="pnc_remarks">মন্তব্য</string>
+    <string name="pnc_calcium_supplementation">কেলচিয়ামৰ পৰিপূৰক</string>
+    <string name="pnc_maternal_symptoms">মাতৃৰ লক্ষণ</string>
+    <string name="pnc_other_maternal_symptoms">মাতৃৰ অন্যান্য লক্ষণ</string>
+    <string name="pnc_pallor">Pallor (ৰক্তহীনতা পৰীক্ষা)</string>
+    <string name="pnc_vaginal_bleeding">যোনিৰ পৰা ৰক্তক্ষৰণ</string>
+    <string name="pnc_date_of_sterilization">বন্ধ্যাকৰণৰ তাৰিখ</string>
+    <string name="pnc_any_danger_sign">কোনো বিপদৰ চিন?\nকোনো উচ্চ-বিপদজনক চিনাক্ত কৰা হৈছে?</string>
+
+    <string name="other_place_of_death">মৃত্যুৰ অন্যান্য স্থান</string>
+    <string name="pnc_ifa_max_error">আই এফ এ টেবলেট ৪০০ তকৈ অধিক হ’ব নোৱাৰে</string>
+    <string name="pnc_calcium_max_error">কেলচিয়ামৰ পৰিপূৰক ৪০০ তকৈ অধিক হ’ব নোৱাৰে</string>
+    <string name="pnc_referral_alert_multiple_symptoms">ৰেফাৰেলৰ প্ৰয়োজন: ২ বা তাতকৈ অধিক মাতৃৰ লক্ষণ ধৰা পৰিছে</string>
+    <string name="pnc_referral_alert_severe_pallor">ৰেফাৰেলৰ প্ৰয়োজন: গুৰুতৰ পেলাৰ ধৰা পৰিছে</string>
+    <string name="pnc_referral_alert_vaginal_bleeding">ৰেফাৰেলৰ প্ৰয়োজন: প্ৰচণ্ড ৰক্তক্ষৰণ বা দুৰ্গন্ধযুক্ত স্ৰাৱ ধৰা পৰিছে</string>
+
+    <string name="tracking_form_filled_successfully">ট্ৰেকিং ফৰ্ম সফলতাৰে পূৰণ কৰা হৈছে</string>
+    <string name="form_save_failed">ফৰ্ম সংৰক্ষণ কৰাত ব্যৰ্থ। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+    <string name="tracking_date">ভ্ৰমণৰ তাৰিখ</string>
+    <string name="visit_history_title">ইতিহাস ভ্ৰমণ কৰক</string>
+    <string name="no_visits_found">কোনো ভ্ৰমণ পোৱা নগ\'ল</string>
+    <string name="visit_count_icon">গণনা আইকন চাওক</string>
+    <string name="error_loading_visits">ভ্ৰমণ লোড কৰাত ত্ৰুটি। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+
+    <string name="long_to_string">%d</string>
+
+    <string-array name="pnc_period_array">
+        <item>১ম দিন</item>
+        <item>৩য় দিন</item>
+        <item>৭ম দিন</item>
+        <item>১৪তম দিন</item>
+        <item>২১তম দিন</item>
+        <item>২৮তম দিন</item>
+        <item>৪২তম দিন</item>
+    </string-array>
+
+    <string-array name="pnc_confirmation_array">
+        <item>হয়</item>
+        <item>নাই</item>
+    </string-array>
+
+    <string-array name="pnc_contraception_method_array">
+        <item>প্ৰসৱৰ ৪৮ ঘণ্টাৰ ভিতৰত IUCD স্থাপন (PPIUCD)</item>
+        <item>কণ্ডম</item>
+        <item>পুৰুষ নিষ্ক্ৰিয়কৰণ</item>
+        <item>মহিলা নিষ্ক্ৰিয়কৰণ</item>
+        <item>প্ৰসৱৰ ৭ দিনৰ ভিতৰত নিষ্ক্ৰিয়কৰণ (PPS)</item>
+        <item>মিনিল্যাপ</item>
+        <item>কোনো নহয়</item>
+        <item>অন্য (উল্লেখ কৰক)</item>
+    </string-array>
+
+    <string-array name="pnc_mother_danger_sign_array">
+        <item>অতি ৰক্তক্ষৰণ (PPH)</item>
+        <item>জ্বৰ</item>
+        <item>সংক্রমণ (Sepsis)</item>
+        <item>তীব্ৰ পেটৰ বিষ</item>
+        <item>তীব্ৰ মূৰৰ বিষ বা অস্পষ্ট দৃষ্টি</item>
+        <item>শ্বাস ল’বলৈ অসুবিধা</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="pnc_referral_facility_array">
+        <item>প্ৰাথমিক স্বাস্থ্য কেন্দ্ৰ</item>
+        <item>সমুদায় স্বাস্থ্য কেন্দ্ৰ</item>
+        <item>জিলা চিকিৎসালয়</item>
+        <item>ব্যক্তিগত চিকিৎসালয়</item>
+        <item>অন্য (উল্লেখ কৰক)</item>
+    </string-array>
+
+    <string-array name="pnc_death_cause_array">
+        <item>এক্লেম্পচিয়া</item>
+        <item>ৰক্তক্ষৰণ (PPH)</item>
+        <item>ৰক্তাল্পতা</item>
+        <item>তীব্ৰ জ্বৰ</item>
+        <item>সংক্রমণ</item>
+        <item>দুৰ্ঘটনা</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="pnc_death_place_array">
+        <item>ঘৰ</item>
+        <item>ছাব-চেণ্টাৰ</item>
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>জিলা চিকিৎসালয়</item>
+        <item>মেডিকেল কলেজ চিকিৎসালয়</item>
+        <item>ব্যক্তিগত চিকিৎসালয়</item>
+        <item>পথত</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="pnc_maternal_symptoms_array">
+        <item>অতি ৰক্তক্ষৰণ</item>
+        <item>দুৰ্গন্ধযুক্ত স্ৰাৱ</item>
+        <item>জ্বৰ</item>
+        <item>তীব্ৰ পেটৰ বিষ</item>
+        <item>স্তনৰ বিষ</item>
+        <item>প্ৰস্ৰাৱ কৰাৰ সময় বিষ</item>
+        <item>তীব্ৰ মূৰৰ বিষ</item>
+        <item>মূৰ ঘূৰণি</item>
+        <item>শ্বাস ল’বলৈ অসুবিধা</item>
+        <item>ফুলা</item>
+        <item>ঘাঁৰ বিষ</item>
+        <item>মনৰ পৰিবর্তন</item>
+        <item>কোনো নাই</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="pnc_pallor_array">
+        <item>নাই</item>
+        <item>সামান্য</item>
+        <item>মধ্যম</item>
+        <item>তীব্ৰ</item>
+    </string-array>
+
+    <string-array name="pnc_vaginal_bleeding_array">
+        <item>স্বাভাৱিক</item>
+        <item>অধিক ৰক্তক্ষৰণ</item>
+        <item>দুৰ্গন্ধযুক্ত স্ৰাৱ</item>
+        <item>কম</item>
+        <item>বন্ধ হৈছে</item>
+    </string-array>
+
+    <string-array name="sterilization_methods_array">
+        <item>পুৰুষ নিষ্ক্ৰিয়কৰণ</item>
+        <item>মহিলা নিষ্ক্ৰিয়কৰণ</item>
+        <item>প্ৰসৱৰ ৭ দিনৰ ভিতৰত নিষ্ক্ৰিয়কৰণ (PPS)</item>
+        <item>মিনিল্যাপ</item>
+    </string-array>
+
+    <string-array name="female_sterilization_methods_array">
+        <item>মহিলা নিষ্ক্ৰিয়কৰণ</item>
+        <item>প্ৰসৱৰ ৭ দিনৰ ভিতৰত নিষ্ক্ৰিয়কৰণ (PPS)</item>
+        <item>মিনিল্যাপ</item>
+    </string-array>
+
+    <string-array name="visit_months">
+        <item>জানুৱাৰী</item>
+        <item>ফেব্ৰুৱাৰী</item>
+        <item>মাৰ্চ</item>
+        <item>এপ্ৰিল</item>
+        <item>মে</item>
+        <item>জুন</item>
+        <item>জুলাই</item>
+        <item>আগষ্ট</item>
+        <item>ছেপ্টেম্বৰ</item>
+        <item>অক্টোবৰ</item>
+        <item>নৱেম্বৰ</item>
+        <item>ডিচেম্বৰ</item>
+    </string-array>
+
+    <string-array name="method_of_contraception">
+        <item>নিজে</item>
+        <item>ANTRA ইনজেকচন</item>
+        <item>কপাৰ টি (IUCD)</item>
+        <item>কণ্ডম</item>
+        <item>Mala N</item>
+        <item>Chaya</item>
+        <item>ECP</item>
+        <item>পুৰুষ নিষ্ক্ৰিয়কৰণ</item>
+        <item>মহিলা নিষ্ক্ৰিয়কৰণ</item>
+        <item>মিনিল্যাপ</item>
+        <item>অন্য পদ্ধতি</item>
+    </string-array>
+
+    <string-array name="antra_doses">
+        <item>১ম ড’জ</item>
+        <item>২য় ড’জ</item>
+        <item>৩য় ড’জ</item>
+        <item>৪ৰ্থ ড’জ</item>
+        <item>৫ম ড’জ</item>
+        <item>৬ষ্ঠ ড’জ</item>
+        <item>৭ম ড’জ</item>
+        <item>৮ম ড’জ</item>
+        <item>৯ম ড’জ</item>
+        <item>১০ম ড’জ</item>
+    </string-array>
+
+    <string name="template_null">সাঁচৰ নাম সুমুৱাওক</string>
+    <string name="templte_exists">সাঁচৰ নাম ইতিমধ্যে আছে</string>
+    <string name="delete_temp">টেমপ্লেট মচি পেলাওক</string>
+    <string name="temp_name">টেমপ্লেটৰ নাম</string>
+    <string name="villageName">গাঁৱৰ নাম:</string>
+    <string name="required">প্ৰয়োজনীয়</string>
+    <string name="version">সংস্কৰণ 6.0.0</string>
+    <string name="str_duration">সময়কাল:</string>
+    <string name="edd_date">ইডিডি তাৰিখ</string>
+    <string name="update_btn">নবীকৰণ</string>
+
+    <!-- EC Tracking Form -->
+    <string name="ec_tracking_title">যোগ্য দম্পতী অনুসৰণ</string>
+    <string name="status_of_woman_eligible_couple_name">যোগ্য দম্পতি</string>
+    <string name="status_of_woman_eligible_couple_code">EC</string>
+    <string name="status_of_woman_pregnant_woman_name">গৰ্ভৱতী মহিলা</string>
+    <string name="status_of_woman_pregnant_woman_code">PW</string>
+    <string name="status_of_woman_postnatal_name">প্ৰসবোত্তৰ</string>
+    <string name="status_of_woman_postnatal_code">PN</string>
+    <string name="status_of_woman_elderly_name">বৃদ্ধ</string>
+    <string name="status_of_woman_elderly_code">EL</string>
+    <string name="status_of_woman_adolescent_name">কৈশোৰীয়া</string>
+    <string name="status_of_woman_adolescent_code">AD</string>
+    <string name="status_of_woman_permanent_sterilization_name">স্থায়ী বন্ধ্যাকৰণ</string>
+    <string name="status_of_woman_permanent_sterilization_code">ST</string>
+    <string name="status_of_woman_not_applicable_name">প্ৰযোজ্য নহয়</string>
+    <string name="status_of_woman_not_applicable_code">NA</string>
+    <string name="is_pregnancy_test_done">গৰ্ভাৱস্থাৰ পৰীক্ষা কৰা হয়নে?</string>
+    <string name="pregnancy_test_result">গৰ্ভাৱস্থা পৰীক্ষাৰ ফলাফল</string>
+    <string name="is_woman_pregnant">মহিলাগৰাকী গৰ্ভৱতী নেকি?</string>
+    <string name="using_family_planning">আপুনি কোনো পৰিয়াল পৰিকল্পনা পদ্ধতি ব্যৱহাৰ কৰিছেনে / ব্যৱহাৰ কৰিব বিচাৰেনে?</string>
+    <string name="method_of_contraception_label">গৰ্ভনিৰোধৰ পদ্ধতি</string>
+    <string name="any_other_method">অন্য যিকোনো পদ্ধতি</string>
+    <string name="antra_dose">ANTRA ড\'জ</string>
+    <string name="antra_injection_date">ANTRA বেজী দিয়াৰ তাৰিখ</string>
+    <string name="antra_due_date">পৰৱৰ্তী বেজীৰ নিৰ্ধাৰিত তাৰিখ</string>
+    <string name="date_of_sterilization">বন্ধ্যাকৰণৰ তাৰিখ</string>
+
+    <string name="incentive_alert_title">প্ৰৰোচনামূলক তথ্য</string>
+    <string name="antra_incentive_alert">আপোনাৰ Incentive দাবী কৰিবলৈ MCA Card ফটো আপলোড কৰক</string>
+    <string name="sterilization_incentive_alert">আপোনাৰ Incentive দাবী কৰিবলৈ অনুগ্ৰহ কৰি Discharge Summary ফটো আপলোড কৰক</string>
+
+    <string name="one_visit_per_month_error">প্ৰতিমাহে মাত্ৰ এটা ভ্ৰমণৰ অনুমতি</string>
+    <string name="visit_date_before_registration_error">ভ্ৰমণৰ তাৰিখ ইচি পঞ্জীয়নৰ তাৰিখৰ আগতে হ’ব নোৱাৰে</string>
+    <string name="lmp_backdated_limit_error">এলএমপিৰ তাৰিখ ৬ মাহলৈকেহে বেকডেট কৰিব পাৰিব</string>
+    <string name="sterilization_backdated_limit_error">বন্ধ্যাকৰণৰ তাৰিখ ২ মাহলৈকেহে বেকডেট কৰিব পাৰি</string>
+    <string name="antra_backdated_limit_error">ANTRA বেজীৰ তাৰিখ ২ মাহলৈকেহে বেকডেট কৰিব পাৰি</string>
+    <string name="antra_dose_restart_alert">ব্যৱধান ১২০ দিনতকৈও অধিক। ড\'জ ১ৰ পৰা পুনৰ আৰম্ভ কৰা।</string>
+
+    <string name="not_available">উপলব্ধ নহয়</string>
+
+    <!-- RMNCHA+ Dashboard -->
+    <string name="all_beneficiaries">সকলো হিতাধিকাৰী</string>
+    <string name="eligible_couple_list">যোগ্য দম্পতীৰ তালিকা</string>
+    <string name="maternal_health">মাতৃৰ স্বাস্থ্য</string>
+    <string name="child_care">শিশুৰ যত্ন</string>
+    <string name="disease_control">ৰোগ নিয়ন্ত্ৰণ</string>
+    <string name="communicable_diseases">সংক্ৰামক ৰোগ</string>
+    <string name="routine_immunization">নিয়মীয়া প্ৰতিষেধক</string>
+    <string name="high_risk_assessment">উচ্চ বিপদৰ মূল্যায়ন</string>
+    <string name="general_opd_care_list">সাধাৰণ অ\'পিডি যত্ন তালিকা</string>
+    <string name="death_reports">মৃত্যুৰ খবৰ</string>
+    <string name="village_level_forms">গাঁও পৰ্যায়ৰ প্ৰ-পত্ৰ</string>
+    <string name="cd_icon_grid_icon">আইকন গ্ৰীড বস্তু</string>
+
+    <!-- Maternal Health -->
+    <string name="pregnant_women_registration">গৰ্ভৱতী মহিলাৰ পঞ্জীয়ন</string>
+    <string name="delivery_outcome">ডেলিভাৰীৰ ফলাফল</string>
+    <string name="pnc_mother_list">পিএনচি মাতৃ তালিকা</string>
+    <string name="infant_registration">শিশুৰ পঞ্জীয়ন</string>
+    <string name="child_registration">শিশু পঞ্জীয়ন</string>
+    <string name="abortion_list">গৰ্ভপাতৰ তালিকা</string>
+    <string name="e_pmsma_list">ই-পিএমএছএমএ তালিকা</string>
+
+    <!-- Child Care -->
+    <string name="infant_list">শিশু তালিকা</string>
+    <string name="child_list">শিশুৰ তালিকা</string>
+    <string name="adolescent_list">কিশোৰ-কিশোৰীৰ তালিকা</string>
+    <string name="children_under_5_years">৫ বছৰৰ তলৰ শিশু</string>
+
+    <!-- Eligible Couple -->
+    <string name="eligible_couple_registration">যোগ্য দম্পতী পঞ্জীয়ন</string>
+    <string name="eligible_couple_tracking">যোগ্য দম্পতী অনুসৰণ</string>
+
+    <!-- Eligible Couple List -->
+    <string name="husband_name">স্বামীৰ নাম</string>
+    <string name="lmp_date">এলএমপি তাৰিখ</string>
+    <string name="missed_period">মিছড পিৰিয়ড</string>
+    <string name="under_review">পৰ্যালোচনাৰ অধীনত</string>
+    <string name="register">পঞ্জীয়ন কৰা</string>
+    <string name="no_eligible_couples_found">কোনো যোগ্য দম্পতী পোৱা নগ\'ল</string>
+    <string name="no_registered_couples_found">কোনো পঞ্জীয়নভুক্ত দম্পতী পোৱা নগ\'ল</string>
+    <string name="call">কল কৰা</string>
+    <string name="no_data">N/A</string>
+    <string name="search">সন্ধান</string>
+    <string name="status">স্থিতি</string>
+    <string name="age_ben">বয়স</string>
+    <string name="tv_mob_no_ph">মোবাইল নম্বৰ</string>
+    <string name="tv_rch_id">আৰ চি এইচ আই ডি</string>
+
+    <!-- Pregnant Women Registration -->
+    <string name="no_pregnant_women_found">কোনো গৰ্ভৱতী মহিলা পোৱা নাযায়</string>
+
+    <!-- ANC Visits -->
+    <string name="weeks_of_pregnancy">গৰ্ভাৱস্থাৰ সপ্তাহ</string>
+    <string name="edd">ইডিডি</string>
+    <string name="last_visit_date">শেষ ভ্ৰমণৰ তাৰিখ</string>
+    <string name="add_anc_visit">ADD ANC VISIT যোগ কৰক</string>
+    <string name="add_pmsma">পিএমএছএমএ যোগ কৰক</string>
+    <string name="no_anc_eligible_women_found">কোনো এএনচি যোগ্য মহিলা পোৱা নগ\'ল</string>
+
+    <!-- Delivery Outcome -->
+    <string name="no_delivered_women_found">কোনো প্ৰসৱ কৰা মহিলা পোৱা নাযায়</string>
+    <string name="do_mother_condition">প্ৰসৱৰ পিছৰ লগে লগে মাতৃৰ অৱস্থা</string>
+    <string name="do_maternal_complications">মাতৃৰ জটিলতা</string>
+    <string name="do_mother_currently_admitted">মাতৃ বৰ্তমান ভৰ্তি?</string>
+    <string name="do_discharge_date">ডিচচাৰ্জৰ তাৰিখ</string>
+    <string name="do_discharge_time">ডিচচাৰ্জৰ সময়</string>
+    <string name="do_delivery_outcome">প্ৰসৱৰ ফলাফল</string>
+    <string name="do_live_birth">লাইভ বাৰ্থ</string>
+    <string name="do_still_birth">এতিয়াও জন্ম</string>
+    <string name="do_next">পৰৱৰ্তী</string>
+    <string name="do_inform_district_nodal_officer">জিলা ন\'ডেল বিষয়াক অৱগত কৰক</string>
+    <string name="do_alert_intensive_pnc">এই মাতৃৰ বাবে নিবিড় পিএনচি নিৰীক্ষণৰ পৰামৰ্শ দিয়া হৈছে।</string>
+    <string name="do_hysterectomy_note">হিষ্টেৰেকটমীৰ বাবে পৰিয়াল পৰিকল্পনাৰ অৱস্থা আৰু যোগ্য দম্পতী অনুসৰণ আপডেট কৰা হ’ব।</string>
+    <string name="do_maternal_death_audit">খোলা হ’ব মাতৃ মৃত্যুৰ অডিট প্ৰ-পত্ৰ।</string>
+    <string name="do_discharge_date_before_delivery">ডিচচাৰ্জৰ তাৰিখ প্ৰসৱৰ তাৰিখৰ আগতে হ’ব নোৱাৰে।</string>
+    <string name="do_vitals_and_prescription">ভিটাল আৰু প্ৰেছক্ৰিপচন</string>
+
+    <string-array name="do_mother_condition_array">
+        <item>সুস্থ / স্থিৰ</item>
+        <item>জটিলতা (উল্লেখ কৰক)</item>
+        <item>গুরুতৰ / ICU ভৰ্তি</item>
+        <item>মাতৃ মৃত্যু</item>
+    </string-array>
+
+    <string-array name="do_maternal_complications_array">
+        <item>প্ৰসব পৰৱৰ্তী ৰক্তক্ষৰণ (PPH)</item>
+        <item>প্লেচেণ্টা থাকি যোৱা</item>
+        <item>পেৰিনিয়েল ছিঁড়া (১ম/২য় ডিগ্ৰী)</item>
+        <item>পেৰিনিয়েল ছিঁড়া (৩য়/৪ৰ্থ ডিগ্ৰী)</item>
+        <item>জৰায়ু ফাটি যোৱা</item>
+        <item>সংক্রমণ</item>
+        <item>প্ৰি-এক্লেম্পচিয়া / এক্লেম্পচিয়া</item>
+        <item>ৰক্ত সঞ্চালন প্ৰয়োজন</item>
+        <item>হিস্টেৰেক্টমী কৰা হৈছে</item>
+        <item>অ্যানাস্থেছিয়া জটিলতা</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="do_mother_admitted_array">
+        <item>হয় (এখনো চিকিৎসালয়ত)</item>
+        <item>নাই (ছুটি দিয়া হৈছে)</item>
+    </string-array>
+
+    <string name="do_woman_name">মহিলাগৰাকীৰ নাম</string>
+    <string name="do_woman_age">বয়স</string>
+    <string name="do_case_id">কেছ আইডি:</string>
+    <string name="do_view_anc_history">ANC ইতিহাস চাওক</string>
+    <string name="do_delivery_date">ডেলিভাৰীৰ তাৰিখ</string>
+    <string name="do_delivery_time">ডেলিভাৰীৰ সময়</string>
+    <string name="do_gestational_age_at_delivery">প্ৰসৱৰ সময়ত গৰ্ভাৱস্থাৰ বয়স</string>
+    <string name="do_place_of_delivery">ডেলিভাৰীৰ স্থান</string>
+    <string name="do_private_hospital_name">যদি ব্যক্তিগত চিকিৎসালয় তেন্তে নাম উল্লেখ কৰক</string>
+    <string name="do_delivery_conducted_by">দ্বাৰা পৰিচালিত ডেলিভাৰী</string>
+    <string name="do_mode_of_delivery">ডেলিভাৰীৰ ধৰণ</string>
+    <string name="do_indication_for_lscs">এল এছ চি এছ/জৰুৰীকালীন এল এছ চি এছ/সহায়কসকলৰ বাবে ইংগিত</string>
+    <string name="do_indication_for_lscs_other">অন্যান্য (নিৰ্দিষ্ট কৰক)</string>
+
+    <string name="do_error_future_date">ভৱিষ্যতৰ তাৰিখ হ’ব নোৱাৰে</string>
+    <string name="do_error_date_range">তাৰিখ %1$s আৰু %2$s ৰ মাজত হব লাগিব</string>
+
+    <string name="do_alert_post_term_delivery">পোষ্ট-টাৰ্ম ডেলিভাৰী</string>
+    <string name="do_alert_preterm_delivery">অকাল প্ৰসৱ</string>
+    <string name="do_alert_home_delivery">হোম ডেলিভাৰী সংঘটিত হয়। বিপদৰ ওপৰত পৰামৰ্শ প্ৰদান কৰা। ২৪ ঘণ্টাৰ ভিতৰত তাৎক্ষণিক পিএনচি ভ্ৰমণ নিশ্চিত কৰক।</string>
+    <string name="do_alert_on_the_way">২৪ ঘণ্টাৰ ভিতৰত জৰুৰী পিএনচি ঘৰ ভ্ৰমণৰ প্ৰয়োজন।</string>
+    <string name="do_alert_unskilled_delivery">অদক্ষ ডেলিভাৰী। উচ্চ বিপদজনক পিএনচিৰ প্ৰয়োজন।</string>
+    <string name="do_alert_extremely_preterm">অত্যন্ত প্ৰিটাৰ্ম (&lt;২৮ সপ্তাহ)</string>
+    <string name="do_alert_very_preterm">অতি প্ৰাককালীন (২৮–৩২ সপ্তাহ)</string>
+    <string name="do_alert_moderate_preterm">মধ্যমীয়াৰ পৰা পলমকৈ প্ৰাককালীন (৩২–৩৭ সপ্তাহ)</string>
+    <string name="do_alert_term">কাৰ্যকাল (৩৭–৪২ সপ্তাহ)</string>
+    <string name="do_alert_post_term">পোষ্ট-টাৰ্ম (&gt;৪২ সপ্তাহ)</string>
+
+    <string name="do_error_indication_required">অনুগ্ৰহ কৰি অন্ততঃ এটা ইংগিত নিৰ্বাচন কৰক</string>
+    <string name="do_error_indication_other_required">অনুগ্ৰহ কৰি ইংগিতটো নিৰ্দিষ্ট কৰক</string>
+
+    <string-array name="do_place_of_delivery_array">
+        <item>ছাব-চেণ্টাৰ</item>
+        <item>প্ৰাথমিক স্বাস্থ্য কেন্দ্ৰ (PHC)</item>
+        <item>সমুদায় স্বাস্থ্য কেন্দ্ৰ (CHC)</item>
+        <item>জিলা চিকিৎসালয়</item>
+        <item>মেডিকেল কলেজ চিকিৎসালয়</item>
+        <item>ৰেফাৰেল / তৃতীয় স্তৰৰ চিকিৎসালয়</item>
+        <item>ব্যক্তিগত চিকিৎসালয়</item>
+        <item>ঘৰত প্ৰসব</item>
+        <item>চিকিৎসালয়লৈ যাওঁতে পথত</item>
+    </string-array>
+
+    <string-array name="do_delivery_conducted_by_array">
+        <item>ডাক্টৰ</item>
+        <item>নাৰ্চ / ANM</item>
+        <item>CHO</item>
+        <item>প্ৰশিক্ষিত প্ৰসব সহায়ক (SBA)</item>
+        <item>দাই / পৰম্পৰাগত সহায়ক</item>
+        <item>পৰিয়াল সদস্য</item>
+        <item>নিজে / সহায় নোহোৱা</item>
+    </string-array>
+
+    <string-array name="do_mode_of_delivery_array">
+        <item>স্বাভাৱিক প্ৰসব (NVD)</item>
+        <item>ভেকিউম / ফোৰচেপ সহায়ত</item>
+        <item>LSCS</item>
+        <item>জৰুৰী LSCS</item>
+        <item>VBAC</item>
+    </string-array>
+
+    <string-array name="do_indication_for_lscs_array">
+        <item>ভ্ৰূণ সংকট</item>
+        <item>CPD</item>
+        <item>পূৰ্বৰ LSCS</item>
+        <item>অসঠিক ভ্ৰূণ অৱস্থান</item>
+        <item>দীর্ঘস্থায়ী / বাধাগ্ৰস্ত প্ৰসব</item>
+        <item>APH</item>
+        <item>প্ৰি-এক্লেম্পচিয়া / এক্লেম্পচিয়া</item>
+        <item>নাভিৰ নাড়ি স্খলন</item>
+        <item>ইনডাকচন ব্যৰ্থ</item>
+        <item>যমজ / বহুগৰ্ভ</item>
+        <item>মাতৃৰ অনুৰোধ</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <!-- Lists -->
+    <string name="delivery_date">ডেলিভাৰীৰ তাৰিখ</string>
+    <string name="days_since_delivery">ডেলিভাৰীৰ পিছৰ দিন</string>
+    <string name="no_pnc_mothers_found">কোনো পিএনচি মাতৃ পোৱা নগ\'ল</string>
+    <string name="no_e_pmsma_women_found">কোনো ই-পিএমএছএমএ মহিলা পোৱা নগ\'ল</string>
+
+    <string name="infant_reg_list">শিশুৰ ৰেগ তালিকা</string>
+    <string name="mother_name">মাৰ নাম</string>
+    <string name="no_infants_found">কোনো শিশু পোৱা নগ\'ল</string>
+
+    <string name="child_reg_list">শিশু নিবন্ধন তালিকা</string>
+    <string name="no_children_found">কোনো শিশু পোৱা নগ\'ল</string>
+
+    <string name="name_of_child">শিশুৰ নাম</string>
+    <string name="child_registration_saved">শিশুৰ পঞ্জীয়ন সফলভাৱে সংৰক্ষণ কৰা হৈছে</string>
+
+    <string name="abortion_date">গৰ্ভপাতৰ তাৰিখ</string>
+    <string name="no_abortion_records_found">গৰ্ভপাতৰ কোনো ৰেকৰ্ড পোৱা নগ\'ল</string>
+
+    <string name="no_pmsma_women_found">কোনো PMSMA মহিলা পোৱা নগ\'ল</string>
+    <string name="no_adolescents_found">কোনো কিশোৰ-কিশোৰী পোৱা নগ\'ল</string>
+    <string name="no_children_under_5_found">৫ বছৰৰ তলৰ কোনো শিশু পোৱা নগ\'ল</string>
+
+    <string name="check_sam">Check SAM</string>
+    <string name="ors">ORS</string>
+    <string name="ifa">IFA</string>
+    <string name="add_visit">Add Visit</string>
+    <string name="view_visit">View Visit</string>
+    <string name="visit_history">Visit History</string>
+    <string name="no_of_children">No. of Children</string>
+
+    <string name="select_mariital_status">বৈবাহিক অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="select_status_of_woman">মহিলাৰ অৱস্থা নিৰ্বাচন কৰক</string>
+
+    <string name="duplicate_face_detected">ডুপ্লিকেট মুখ ধৰা পৰিছে</string>
+    <string name="duplicate_face_message">ব্যৱস্থাটোত একেধৰণৰ মুখ পোৱা গৈছিল। আপুনি বৰ্তমানৰ ৰেকৰ্ড ব্যৱহাৰ কৰিব বিচাৰেনে বা নতুন পঞ্জীয়নৰ সৈতে আগবাঢ়িব বিচাৰেনে?</string>
+    <string name="use_existing">Existing ব্যৱহাৰ কৰক</string>
+    <string name="continue_new">নতুন অব্যাহত ৰাখক</string>
+
+    <string name="status_of_woman">মহিলাৰ অৱস্থা <font color="#FF0000">*</font></string>
+    <string name="does_beneficiary_have_abha">হিতাধিকাৰীৰ ABHA ID আছে নেকি?</string>
+    <string name="abha_id_number">ABHA আইডি নম্বৰ (১৪ সংখ্যা)</string>
+    <string name="abha_enrollment_alert">ABHA ID ৰ বাবে নামভৰ্তি কৰিবলৈ হিতাধিকাৰীক পৰামৰ্শ দিব</string>
+    <string name="patient_details_edited_successfully">ৰোগীৰ বিৱৰণ সফলতাৰে সম্পাদনা কৰা হৈছে</string>
+    <string name="invalid_abha_format">ABHA ID ১৪ অংক হব লাগিব</string>
+
+    <!-- Beneficiary Card -->
+    <string name="beneficiary_card_title">হিতাধিকাৰী কাৰ্ড</string>
+    <string name="age_gender_label">বয়স / লিংগ</string>
+    <string name="phone_number_label">ফোন নম্বৰ</string>
+    <string name="village_name_label">গাঁৱৰ নাম</string>
+    <string name="abha_id_label">আভা আই.ডি</string>
+    <string name="generate_abha_id_btn">ABHA ID সৃষ্টি কৰক</string>
+    <string name="continue_btn">অব্যাহত ৰাখক</string>
+    <string name="view_beneficiary_card">ভিউ কাৰ্ড</string>
+
+    <!-- Edit Beneficiary -->
+    <string name="edit_beneficiary_details">হিতাধিকাৰীৰ বিৱৰণ সম্পাদনা কৰক</string>
+    <string name="last_name_optional">শেষ নাম (ঐচ্ছিক)</string>
+    <string name="phone_number_optional">ফোন নম্বৰ (ঐচ্ছিক)</string>
+    <string name="age_mandatory">বয়স <font color="#FF0000">*</font></string>
+    <string name="years_mandatory">বছৰ <font color="#FF0000">*</font></string>
+    <string name="months_optional">মাহ</string>
+    <string name="days_optional">দিন</string>
+    <string name="save_btn">সঞ্চয় কৰা</string>
+    <string name="cancel_btn">বাতিল কৰক</string>
+    <string name="edit_btn">সম্পাদনা কৰক</string>
+    <string name="age_years_required">বছৰত বয়সৰ প্ৰয়োজন</string>
+    <string name="beneficiary_updated_successfully">হিতাধিকাৰীৰ বিৱৰণ সফলতাৰে আপডেট কৰা হৈছে</string>
+    <string name="status_of_woman_required">Status of Woman ৰ প্ৰয়োজন</string>
+
+    <string name="speak_now">এতিয়া কথা কওক...</string>
+    <string name="speech_recognition_error">বাক্য চিনাক্তকৰণ উপলব্ধ নহয়</string>
+    <string name="beneficiary_photo_content_description">%s ৰ ফটো</string>
+    <string name="desc_patient_photo">ৰোগীৰ ফটো</string>
+
+
+    <!-- Neonatal Outcome -->
+    <string name="neonatal_outcome">নৱজাতকৰ ফলাফল</string>
+    <string name="baby_number">শিশু %1d</string>
+    <string name="no_outcome_at_birth">জন্মৰ সময়ত ফলাফল</string>
+    <string name="no_sex">লিংগ</string>
+    <string name="no_cried_immediately">জন্মৰ লগে লগে কান্দিলে?</string>
+    <string name="no_type_of_resuscitation">পুনৰুজ্জীৱনৰ প্ৰকাৰ</string>
+    <string name="no_birth_weight">জন্মৰ ওজন (গ্ৰামত)</string>
+    <string name="no_congenital_anomaly_detected">কোনো জন্মগত বিজুতি ধৰা পৰিছেনে?</string>
+    <string name="no_type_of_congenital_anomaly">জন্মগত বিজুতিৰ প্ৰকাৰ</string>
+    <string name="no_other_congenital_anomaly">অন্যান্য জন্মগত বিজুতি (নিৰ্দিষ্ট কৰক)</string>
+    <string name="no_newborn_complications">নৱজাতকৰ জটিলতা</string>
+    <string name="no_current_status_of_baby">শিশুৰ বৰ্তমানৰ অৱস্থা</string>
+    <string name="no_cause_of_death">মৃত্যুৰ কাৰণ</string>
+    <string name="no_other_cause_of_death">মৃত্যুৰ অন্যান্য কাৰণ (নিৰ্দিষ্ট কৰক)</string>
+    <string name="no_birth_dose_vaccines_given">জন্মৰ মাত্ৰাৰ ভেকচিন দিয়া হয়</string>
+    <string name="no_reason_for_no_vaccines">জন্মৰ মাত্ৰাৰ ভেকচিন নিদিয়াৰ কাৰণ</string>
+    <string name="no_vitamin_k_injection_given">ভিটামিন কে বেজী দিয়া হৈছে?</string>
+    <string name="no_reason_for_no_vitamin_k">ভিটামিন কে বেজী নিদিয়াৰ কাৰণ</string>
+    <string name="no_birth_certificate_issued">জন্মৰ প্ৰমাণ পত্ৰ প্ৰদান?</string>
+
+    <!-- Alerts -->
+    <string name="no_alert_lbw">জন্মৰ সময়ত কম ওজন (LBW): ১৫০০-২৪৯৯গ্ৰাম। ঘনিষ্ঠ নিৰীক্ষণৰ প্ৰয়োজন।</string>
+    <string name="no_alert_vlbw">জন্মৰ সময়ত অতি কম ওজন (VLBW): ১০০০-১৪৯৯গ্ৰাম। তাৎক্ষণিকভাৱে এছএনচিইউ ৰেফাৰেল কৰাৰ পৰামৰ্শ দিয়া হৈছে।</string>
+    <string name="no_alert_elbw">জন্মৰ সময়ত অতি কম ওজন (ELBW): \u003c1000g। জটিল - এন আই চি ইউৰ যত্নৰ প্ৰয়োজন।</string>
+    <string name="no_alert_macrosomia">অধিক ওজন (Macrosomia): &gt;4000g। মাতৃৰ গেষ্টেচনেল ডায়াবেটিছ পৰীক্ষা কৰক।</string>
+    <string name="no_alert_ambiguous_sex">অস্পষ্ট যৌন অঙ্গ চিনাক্ত হৈছে। তাৎক্ষণিক বিশেষজ্ঞ পৰীক্ষা প্ৰয়োজন।</string>
+    <string name="no_alert_stillbirth">মৃত জন্মৰ ৰেকৰ্ড। মৃত জন্মৰ অডিট ফৰ্ম ট্ৰিগাৰ কৰা হ’ব।</string>
+    <string name="no_alert_neonatal_death">নৱজাতকৰ মৃত্যুৰ ৰেকৰ্ড। ডেথ অডিট ফৰ্ম ট্ৰিগাৰ কৰা হ’ব।</string>
+    <string name="no_alert_complications">জটিলতাৰ বাবে তাৎক্ষণিকভাৱে শিশু/বিশেষজ্ঞৰ পৰ্যালোচনাৰ প্ৰয়োজন।</string>
+    <string name="no_alert_pnc_counseling">নৱজাতকৰ যত্নৰ ক্ষেত্ৰত মাতৃৰ বাবে সঠিক পিএনচি পৰামৰ্শ নিশ্চিত কৰা।</string>
+
+    <string name="no_alert_birth_certificate_legal">জন্ম পঞ্জীয়ন এটা আইনী বাধ্যবাধকতা।</string>
+
+    <!-- Validation -->
+    <string name="no_error_birth_weight_range">জন্মৰ সময়ত ওজন ৫০০গ্ৰামৰ পৰা ৬০০০গ্ৰামৰ ভিতৰত হ’ব লাগিব</string>
+    <string name="no_error_birth_weight_required">জন্মৰ ওজন লিখক</string>
+    <string name="no_error_outcome_required">জন্মৰ সময়ত ফলাফল নিৰ্বাচন কৰক</string>
+    <string name="no_error_sex_required">অনুগ্ৰহ কৰি লিংগৰ নিৰ্বাচন কৰক</string>
+    <string name="no_error_crying_status_required">অনুগ্ৰহ কৰি কান্দি থকা অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="no_error_resuscitation_required">অনুগ্ৰহ কৰি পুনৰুজ্জীৱনৰ ধৰণ নিৰ্বাচন কৰক</string>
+    <string name="no_error_current_status_required">অনুগ্ৰহ কৰি শিশুৰ বৰ্তমানৰ অৱস্থা নিৰ্বাচন কৰক</string>
+    <string name="no_error_cause_of_death_required">অনুগ্ৰহ কৰি মৃত্যুৰ কাৰণ বাছি লওক</string>
+    <string name="no_error_vaccines_required">অনুগ্ৰহ কৰি দিয়া ভেকচিন নিৰ্বাচন কৰক</string>
+    <string name="no_error_vitamin_k_required">ভিটামিন কে দিয়া হৈছিল নেকি বাছি লওক</string>
+
+    <string-array name="no_outcome_at_birth_array">
+        <item>জীৱিত জন্ম</item>
+        <item>মৃত জন্ম (তাজা)</item>
+        <item>মৃত জন্ম (মেচাৰেটেড)</item>
+        <item>প্ৰসব সময়ত মৃত্যু</item>
+    </string-array>
+
+    <string-array name="no_sex_array">
+        <item>পুৰুষ</item>
+        <item>মহিলা</item>
+        <item>অস্পষ্ট</item>
+    </string-array>
+
+    <string-array name="no_cried_immediately_array">
+        <item>লগে লগে কান্দিছিল</item>
+        <item>পুনৰুজ্জীৱনৰ পিছত কান্দিছিল</item>
+        <item>কান্দা নাছিল</item>
+    </string-array>
+
+    <string-array name="no_type_of_resuscitation_array">
+        <item>উদ্দীপনা</item>
+        <item>সাকচন</item>
+        <item>বেগ আৰু মাস্ক ভেন্টিলেচন</item>
+        <item>অক্সিজেন</item>
+        <item>ইন্টুবেচন</item>
+        <item>বুক চাপ</item>
+        <item>ঔষধ</item>
+        <item>নাই</item>
+    </string-array>
+
+    <string-array name="no_congenital_anomaly_array">
+        <item>হয়</item>
+        <item>নাই</item>
+        <item>সন্দেহ (মূল্যায়ন চলি আছে)</item>
+    </string-array>
+
+    <string-array name="no_type_of_congenital_anomaly_array">
+        <item>নিউৰাল টিউব ত্ৰুটি</item>
+        <item>ঠোঁট/তালু ফাঁটা</item>
+        <item>ক্লাব ফুট</item>
+        <item>ডাউন সিন্ড্ৰম</item>
+        <item>জন্মগত হৃদ ৰোগ</item>
+        <item>হাইড্ৰ’চেফেলাছ</item>
+        <item>স্পাইনা বিফিডা</item>
+        <item>অধিক/জোৰা আঙুলি</item>
+        <item>গেষ্ট্ৰোস্কিছিছ/অম্ফালোচিল</item>
+        <item>অন্য</item>
+        <item>নাই</item>
+    </string-array>
+
+    <string-array name="no_newborn_complications_array">
+        <item>জন্ম শ্বাসৰোধ</item>
+        <item>শ্বাস কষ্ট</item>
+        <item>নৱজাত জণ্ডিছ</item>
+        <item>সংক্রমণ</item>
+        <item>হাইপোথাৰ্মিয়া</item>
+        <item>হাইপোগ্লাইচেমিয়া</item>
+        <item>খাদ্য গ্ৰহণ অসুবিধা</item>
+        <item>খিঁচুনি</item>
+        <item>নাই</item>
+    </string-array>
+
+    <string-array name="no_current_status_array">
+        <item>সুস্থ আৰু মাতৃৰ সৈতে</item>
+        <item>ভৰ্তি (SNCU/NICU)</item>
+        <item>ভৰ্তি (সাধাৰণ ৱাৰ্ড)</item>
+        <item>মৃত</item>
+    </string-array>
+
+    <string-array name="no_cause_of_death_array">
+        <item>জন্ম শ্বাসৰোধ</item>
+        <item>অকাল জন্ম</item>
+        <item>কম জন্ম ওজনৰ জটিলতা</item>
+        <item>সংক্রমণ</item>
+        <item>শ্বাস কষ্ট সিন্ড্ৰম</item>
+        <item>জন্মগত বিকৃতি</item>
+        <item>মেকোনিয়াম এস্পিৰেচন</item>
+        <item>অজ্ঞাত</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <string-array name="no_birth_dose_vaccines_array">
+        <item>BCG</item>
+        <item>হেপাটাইটিছ B (জন্ম ডোজ)</item>
+        <item>OPV-0</item>
+        <item>নাই</item>
+    </string-array>
+
+    <string-array name="no_birth_certificate_array">
+        <item>হয়</item>
+        <item>প্ৰক্ৰিয়াত</item>
+        <item>নাই (আবেদন কৰা হোৱা নাই)</item>
+    </string-array>
+
+    <!-- Extracted from Kotlin - user facing strings (Assamese) -->
+    <string name="today">আজি</string>
+    <string name="month_january">জানুৱাৰী</string>
+    <string name="month_february">ফেব্ৰুৱাৰী</string>
+    <string name="month_march">মাৰ্চ</string>
+    <string name="month_april">এপ্ৰিল</string>
+    <string name="month_may">মে</string>
+    <string name="month_june">জুন</string>
+    <string name="month_july">জুলাই</string>
+    <string name="month_august">আগষ্ট</string>
+    <string name="month_september">ছেপ্টেম্বৰ</string>
+    <string name="month_october">অক্টোবৰ</string>
+    <string name="month_november">নৱেম্বৰ</string>
+    <string name="month_december">ডিচেম্বৰ</string>
+    <string name="no_face_detected">কোনো মুখ ধৰা পৰা নাই</string>
+    <string name="multiple_faces_detected">একাধিক মুখ ধৰা পৰিল</string>
+    <string name="invalid_face_detection">অবৈধ মুখ ধৰা পেলোৱা</string>
+    <string name="failed_to_generate_face_embeddings">মুখৰ এম্বেডিং সৃষ্টি কৰাত ব্যৰ্থ</string>
+    <string name="face_embeddings_generated">ফেচ এম্বেডিংসমূহ সৃষ্টি কৰা হৈছে</string>
+    <string name="face_detection_failed">মুখ ধৰা পেলোৱা ব্যৰ্থ: %1$s</string>
+    <string name="unable_to_fetch_details">বিৱৰণ আনিব পৰা নাই</string>
+    <string name="age_years_format">%1$d বছৰ</string>
+    <string name="anc_visit_number_format">ANC ভ্ৰমণ %1$d</string>
+    <string name="completed_with_date">সম্পূৰ্ণ: %1$s</string>
+    <string name="completed_status">✓ সম্পূৰ্ণ</string>
+    <string name="scheduled_ga_format">নিৰ্ধাৰিত: %1$s (GA: %2$d সপ্তাহ)</string>
+    <string name="due_status">দেয়</string>
+    <string name="pending_status">বাকী থকা</string>
+    <string name="na">NA</string>
+    <string name="previous_activity">পূৰ্বৰ কাৰ্য্যকলাপ</string>
+    <string name="activity_details">কাৰ্য্যকলাপৰ বিৱৰণ</string>
+    <string name="activity_form">কাৰ্য্যকলাপৰ প্ৰ-পত্ৰ</string>
+    <string name="medicine_not_available">ঔষধ উপলব্ধ নহয়</string>
+    <string name="login_failed_toast">লগইন ব্যৰ্থ</string>
+    <string name="processing">প্ৰচেছিং...</string>
+    <string name="invalid_input">অবৈধ ইনপুট</string>
+    <string name="delivery_record_not_found">ডেলিভাৰীৰ ৰেকৰ্ড পোৱা নগ\'ল</string>
+    <string name="save_successful_toast">সফল সংৰক্ষণ কৰক</string>
+    <string name="invalid_data_entered">অবৈধ তথ্য প্ৰৱেশ কৰা হৈছে</string>
+    <string name="please_wait_master_location">অনুগ্ৰহ কৰি মাষ্টাৰ অৱস্থান স্থানাংক অনাৰ সময়ত অপেক্ষা কৰক।</string>
+    <string name="data_saved">ডাটা সংৰক্ষণ কৰা হৈছে!</string>
+    <string name="error_saving_master_location">মাষ্টাৰ অৱস্থান সংৰক্ষণ কৰাৰ সময়ত ত্ৰুটি</string>
+    <string name="please_fill_all_details">অনুগ্ৰহ কৰি সকলো সবিশেষ পূৰণ কৰক</string>
+    <string name="all_pnc_visits_completed">সকলো পিএনচি ভ্ৰমণ সম্পূৰ্ণ</string>
+    <string name="all_4_anc_visits_completed">৪টা এএনচি ভ্ৰমণৰ সকলোবোৰ সম্পূৰ্ণ হ’ল</string>
+    <string name="verify_abha_otp">ABHA OTP পৰীক্ষা কৰক</string>
+    <string name="events_for_date_already_exist">এই তাৰিখৰ বাবে ইভেন্টসমূহ ইতিমধ্যে আছে</string>
+    <string name="proceed_to_home">ঘৰলৈ আগবাঢ়ক</string>
+    <string name="invalid_image_try_again">অবৈধ ছবি! আকৌ চেষ্টা কৰক</string>
+    <string name="exception_image_processing_failed">ব্যতিক্ৰম! প্ৰতিমুৰ্তি প্ৰক্ৰিয়াকৰণ ব্যৰ্থ</string>
+    <string name="eyes_closed_try_again">চকু বন্ধ! আকৌ চেষ্টা কৰক</string>
+    <string name="home_visit">হোম ভিজিট</string>
+    <string name="please_capture_image_to_continue">আগবাঢ়ি যাবলৈ অনুগ্ৰহ কৰি ছবিখন কেপচাৰ কৰক।</string>
+    <string name="loading_patient_data_please_wait">ৰোগীৰ তথ্য লোড কৰি আছে, অনুগ্ৰহ কৰি অপেক্ষা কৰক...</string>
+    <string name="nav_error">নেভ ত্ৰুটি: %1$s</string>
+    <string name="records_transferred_format">ৰেকৰ্ড স্থানান্তৰ: %1$d/%2$d</string>
+    <string name="progress_percentage_format">%1$d%%</string>
+    <string name="please_enter_beneficiary_name">অনুগ্ৰহ কৰি হিতাধিকাৰীৰ নাম লিখক</string>
+    <string name="batch_selection">বেচ নিৰ্বাচন</string>
+    <string name="template_deleted">টেমপ্লেট মচি পেলোৱা হৈছে</string>
+    <string name="max_duration_allowed_6">সময়ৰ বাবে অনুমোদিত সৰ্বাধিক মান 6।</string>
+    <string name="medicine_number_format">ঔষধ - %1$d</string>
+    <string name="location_update_message">আপুনি নিৰ্দিষ্ট বিন্দুৰ পৰা ২ মিটাৰতকৈ অধিক আঁতৰি গৈছে। আপুনি আপোনাৰ অৱস্থান আপডেট কৰিব বিচাৰেনে?</string>
+    <string name="beneficiary_abha_mapping">হিতাধিকাৰী ABHA মেপিং।</string>
+    <string name="alert_title">সতৰ্ক</string>
+    <string name="please_confirm_logout_exit">লগআউট আৰু প্ৰস্থান কৰিবলৈ অনুগ্ৰহ কৰি নিশ্চিত কৰক।</string>
+    <string name="login_away_from_facility">আপুনি আপোনাৰ সুবিধাৰ পৰা আঁতৰত Log-in কৰিবলৈ চেষ্টা কৰিছে। আপুনি পুনৰ চেষ্টা কৰিব বিচাৰেনে?</string>
+    <string name="patient_already_exists">ৰোগী ইতিমধ্যে আছে</string>
+    <string name="error_saving_patient">ৰোগী সংৰক্ষণ কৰাত ত্ৰুটি</string>
+    <string name="esanjeevani_login">eSanjeevani লগইন</string>
+    <string name="update_ready_to_install">এটা আপডেইট ইনষ্টল কৰিবলৈ সাজু হৈছে।</string>
+    <string name="restart">পুনৰাৰম্ভ কৰক</string>
+    <string name="applytxt">প্ৰয়োগ কৰক</string>
+    <string name="choose_application_language">এপ্লিকেচন ভাষা নিৰ্ব্বাচন কৰক</string>
+    <string name="update_canceled_or_failed">আপডেট বাতিল কৰা হৈছিল বা বিফল হৈছিল।</string>
+    <string name="try_again_btn">আকৌ চেষ্টা কৰক</string>
+    <string name="permission_denied">অনুমতি অস্বীকাৰ কৰা হৈছে</string>
+    <string name="not_scheduled">নিৰ্ধাৰিত নহয়</string>
+    <string name="location_provider_gps_disabled">অৱস্থান প্ৰদানকাৰী/জিপিএছ নিষ্ক্ৰিয় কৰা হৈছে</string>
+    <string name="invalid_image_multiple_faces">অবৈধ ছবি! একাধিক মুখ ধৰা পৰিছে</string>
+    <string name="linking_abha_to_beneficiary">হিতাধিকাৰীৰ সৈতে ABHA সংযোগ কৰা</string>
+    <string name="patient_already_exists_message">লাভগ্ৰাহী ID %1$s থকা ৰোগী ইতিমধ্যে চিস্টেমত আছে।</string>
+    <string name="error_saving_patient_message">তথ্য নোহোৱাৰ বাবে ৰোগীক সংৰক্ষণ কৰাত ব্যৰ্থ। অনুগ্ৰহ কৰি সকলো তথ্য ছিঙ্ক কৰাটো নিশ্চিত কৰক।</string>
+    <string name="case_closure_yes">হয়</string>
+    <string name="case_closure_no">নহয়</string>
+    <string name="pref_location_data" translatable="false">pref_location_data</string>
+    <string name="title_activity_user_master_loc">UserMasterLocActivity</string>
+
+    <string name="stock_label">ষ্টকত আছে: %1$d</string>
+    <string name="out_of_stock">ষ্টকত নাই</string>
+
+    <!-- Case Closure Strings -->
+    <string name="case_closure_confirmation_title">কেছ বন্ধ কৰক</string>
+    <string name="case_closure_confirmation_message">এই কেছটো বন্ধ কৰা হৈছে। আপুনি আগবাঢ়িব বিচাৰে নেকি?</string>
+    <string name="case_closure_error_pending_lab">কেছ বন্ধ কৰিব পৰা নাযায়: লেব টেষ্ট অপেক্ষাৰত আছে</string>
+    <string name="case_closure_error_undispensed_medicine">কেছ বন্ধ কৰিব পৰা নাযায়: ঔষধ বিতৰণ কৰা হোৱা নাই</string>
+    <string name="case_closure_success">কেছ সফলভাৱে বন্ধ কৰা হৈছে</string>
+    <string name="case_closure_error">কেছ বন্ধ কৰাত ত্ৰুটি</string>
+    <string name="antra_next_due_date">ANTRA পৰৱৰ্তী তাৰিখ</string>
+
+    <!-- Nose Diagnosis Form Strings -->
+    <string name="difficulty_in_breathing">উশাহ লোৱাত অসুবিধা</string>
+    <string name="open_mouth_breathing">মুখ খুলি উশাহ লোৱা</string>
+    <string name="nose_bleed_title">নাকৰ ৰক্তপাত (Epistaxis)</string>
+    <string name="systolic_bp_title">সিষ্ট’লিক BP (mmHg)</string>
+    <string name="diastolic_bp_title">ডায়াষ্ট’লিক BP (mmHg)</string>
+    <string name="foreign_body_nose_title">নাকত বিদেশী বস্তু</string>
+    <string name="foreign_body_anterior">হয় (আগফালে দৃশ্যমান)</string>
+    <string name="foreign_body_posterior">হয় (পিছফালে দৃশ্যমান)</string>
+    <string name="sinusitis_title">ছাইনাছাইটিছ</string>
+    <string name="sinusitis_with_pain">হয় (মুখৰ বেদনা / কোমলতা)</string>
+
+    <!-- Nose Diagnosis Alert Messages -->
+    <string name="difficulty_in_breathing_alert">উশাহ লোৱাত অসুবিধা ধৰা পৰিছে। URI / Rhinitis / Sinusitis নিৰ্ণয় কৰক। HWC ত পৰিচালনযোগ্য নহলে বিশেষজ্ঞৰ ওপৰলৈ পঠিয়াওক।</string>
+    <string name="open_mouth_breathing_alert">মুখ খুলি উশাহ লোৱা ধৰা পৰিছে। URI / Rhinitis / Sinusitis নিৰ্ণয় কৰক। HWC ত পৰিচালনযোগ্য নহলে বিশেষজ্ঞৰ ওপৰলৈ পঠিয়াওক।</string>
+    <string name="nose_bleed_alert_systolic_bp">সিষ্ট’লিক BP &gt; 120 mmHg। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="nose_bleed_alert_diastolic_bp">ডায়াষ্ট’লিক BP &gt; 80 mmHg। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="foreign_body_posterior_alert">পিছফালে দৃশ্যমান পোৱা গৈছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="sinusitis_alert">দীৰ্ঘকালীন ছাইনাছাইটিছ সন্দেহ কৰা হৈছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+
+    <!-- Nose Diagnosis Dropdown/Radio Options -->
+    <string-array name="nose_foreign_body_options">
+        <item>হয় (আগফালে দৃশ্যমান)</item>
+        <item>হয় (পিছফালে দৃশ্যমান)</item>
+        <item>নাই</item>
+    </string-array>
+
+    <!-- Mental Health Screening Strings - Assamese -->
+
+
+    <!-- Initial Screening Questions -->
+    <string name="emotional_behavioural_concerns">মানসিক বা আচৰণগত উদ্বেগ আছে</string>
+    <string name="substance_use_concerns">মাদক দ্রব্য ব্যৱহাৰ সম্পর্কীয় উদ্বেগ আছে</string>
+    <string name="self_harm_suicide_thoughts">আত্মক্ষতি বা আত্মহত্যাৰ চিন্তা আছে</string>
+    <string name="memory_loss_confusion">স্মৃতিশক্তি হ্রাস বা বিভ্ৰান্তি আছে</string>
+    <string name="seizures_fits_loc">খিঁচুনি, মৃগ্দশা, বা চেতনা হ্রাস আছে</string>
+    <string name="postpartum_woman">প্রসবোত্তর মহিলা (≤12 মাস পরে)</string>
+
+    <!-- PHQ-9 Depression Screening -->
+    <string name="phq9_section_title">PHQ-9 বিষণ্নতা পৰীক্ষা</string>
+    <string name="phq9_little_interest">কাম-কাজত কৌতুক বা আনন্দৰ অভাৱ</string>
+    <string name="phq9_feeling_down">নিম্নমনোভাৱ, হতাশ বা অসহায় অনুভৱ কৰা</string>
+    <string name="phq9_sleep_trouble">টোপনিৰ ডিঙাবোৱা, থাকিযোৱা, বা অত্যধিক টোপনি</string>
+    <string name="phq9_feeling_tired">ক্লান্তি বা শক্তি অভাৱ অনুভৱ কৰা</string>
+    <string name="phq9_appetite">খাদ্য লোভ বা অত্যধিক খোৱা</string>
+    <string name="phq9_feeling_bad">নিজৰ প্রতি বেয়া অনুভৱ বা ব্যৰ্থ অনুভৱ কৰা</string>
+    <string name="phq9_concentration">কামত মনোযোগ দিতে কষ্ট হোৱা</string>
+    <string name="phq9_moving_slowly">লেহেমীয়াকৈ চলা বা কথা কওঁ অথবা অস্থিৰ থকা</string>
+    <string name="phq9_self_harm_thoughts">মৃত্যু বা আত্মক্ষতিৰ চিন্তা</string>
+    <string name="phq9_total_score">PHQ-9 মোট স্কোর</string>
+
+    <string-array name="phq9_options">
+        <item>0 - বিন্দুমাত্র নহয়</item>
+        <item>1 - কেইটামান দিন</item>
+        <item>2 - আধা দিনৰ বেছি</item>
+        <item>3 - প্রায় প্রতিদিন</item>
+    </string-array>
+
+    <!-- Substance Use Screening & Brief Intervention -->
+    <string name="substance_section_title">মাদক ব্যৱহাৰ পৰীক্ষা আৰু সংক্ষিপ্ত হস্তক্ষেপ</string>
+    <string name="substance_alcohol_use">মদ্যপানৰ ব্যৱহাৰ</string>
+    <string name="substance_tobacco_use">তম্বাকু ব্যৱহাৰ</string>
+    <string name="substance_other_use">অন্য মাদক ব্যৱহাৰ</string>
+    <string name="substance_other_specify">অন্য মাদক স্পষ্ট কৰক</string>
+    <string name="substance_frequency">মাদক ব্যৱহাৰৰ ফ্রিকোয়েন্সি</string>
+    <string name="brief_intervention_given">সংক্ষিপ্ত হস্তক্ষেপ দিয়া হৈছে</string>
+
+    <string-array name="substance_frequency_options">
+        <item>দৈনিক</item>
+        <item>সাপ্তাহিক</item>
+        <item>মাসিক</item>
+        <item>মাঝে মাঝে</item>
+    </string-array>
+
+    <!-- Suicide Risk Screening -->
+    <string name="suicide_section_title">আত্মহত্যা ঝুঁকি পৰীক্ষা</string>
+    <string name="suicide_current_thoughts">আত্মহত্যা বা আত্মক্ষতিৰ বর্তমান চিন্তা</string>
+    <string name="suicide_plan">নিজক ক্ষতি কৰাৰ নির্দিষ্ট পরিকল্পনা আছে</string>
+    <string name="suicide_previous_attempt">পূর্বে আত্মহত্যাৰ চেষ্টা</string>
+    <string name="suicide_hopelessness">নিরাশা বা বোঝা হোৱাৰ অনুভৱ প্রকাশ কৰা</string>
+    <string name="suicide_risk_level">আত্মহত্যা ঝুঁকি স্তর</string>
+
+    <string-array name="suicide_risk_options">
+        <item>কম</item>
+        <item>মধ্যম</item>
+        <item>উচ্চ</item>
+    </string-array>
+
+    <!-- Dementia Screening Checklist -->
+    <string name="dementia_section_title">তত্ত্বাবধায়ন প্রাক্ষণ পরীক্ষা সূচী</string>
+    <string name="dementia_progressive_memory_loss">ক্রমান্বয়ে স্মৃতিশক্তি হ্রাস</string>
+    <string name="dementia_forgetting_recent">সম্প্রতিৰ ঘটনা পাহৰি যোৱা</string>
+    <string name="dementia_disorientation">সময়ৰ বা স্থানৰ প্রতি বিভ্ৰান্তি</string>
+    <string name="dementia_daily_activities">দৈনন্দিন কাজ সামলাতে কষ্ট</string>
+    <string name="dementia_behavioural_changes">আচৰণগত পরিবর্তন</string>
+
+    <!-- Epilepsy Screening Checklist -->
+    <string name="epilepsy_section_title">মৃগীৰোগ পৰীক্ষা সূচী</string>
+    <string name="epilepsy_recurrent_seizures">বাৰবাৰ খিঁচুনি / মৃগ্দশা</string>
+    <string name="epilepsy_jerky_movements">আক্রমণৰ সময় ঝাকেৰে নড়াচড়া</string>
+    <string name="epilepsy_tongue_bite">আক্রমণৰ সময় জিভ কামৰ বা অসংযম</string>
+    <string name="epilepsy_confusion_after">আক্রমণৰ পরে বিভ্ৰান্তি</string>
+    <string name="epilepsy_loc_duration">চেতনা হ্রাসৰ সময়কাল</string>
+
+    <string-array name="epilepsy_duration_options">
+        <item>5 মিনিটৰ কম</item>
+        <item>5–15 মিনিট</item>
+        <item>15 মিনিটৰ বেছি</item>
+    </string-array>
+
+    <!-- Mental Health Referral Reasons -->
+    <string name="mental_health_reason_for_referral">রেফারেলৰ কাৰণ</string>
+    <string-array name="mental_health_referral_reasons">
+        <item>বিষণ্নতা (PHQ-9 স্কোর ≥10)</item>
+        <item>আত্মহত্যা ঝুঁকি চিহ্নিত হৈছে</item>
+        <item>মাদক ব্যৱহাৰৰ বিকার</item>
+        <item>তত্ত্বাবধায়ন প্রাক্ষণ সন্দেহজনক</item>
+        <item>মৃগীৰোগ সন্দেহজনক</item>
+        <item>প্রসবোত্তর বিষণ্নতা</item>
+        <item>গুরুতর মানসিক বিকার সন্দেহজনক</item>
+        <item>অন্য</item>
+    </string-array>
+
+    <!-- Yes/No Options Array -->
+    <string-array name="yes_no_options">
+        <item>হয়</item>
+        <item>নহয়</item>
+    </string-array>
+
+    <!-- PHQ-9 Alert Strings -->
+    <string name="phq9_alert_referral_mo_phc"><font color="#FF0000">MO/PHC লৈ প্ৰেৰণ কৰক (PHQ-9 স্ক’ৰ ≥ 10)</font></string>
+    <string name="phq9_alert_urgent"><font color="#FF0000">জৰুৰী প্ৰেৰণ (PHQ-9 স্ক’ৰ ≥ 15)</font></string>
+    <string name="phq9_alert_emergency"><font color="#FF0000">আপাতকালীন প্ৰেৰণ (PHQ-9 স্ক’ৰ ≥ 20)</font></string>
+
+    <!-- Mental Health Screening Form Titles and Messages -->
+    <string name="title_mental_health_screening">মানসিক স্বাস্থ্য পৰীক্ষা</string>
+    <string name="mental_health_screening_saved">মানসিক স্বাস্থ্য পৰীক্ষা সফলভাৱে সংৰক্ষণ কৰা হৈছে</string>
+    <string name="cd_camera_search">কেমেৰা খোলক</string>
+
+    <!-- Ear Diagnosis Dataset -->
+    <string name="ear_difficulty_hearing">শুনাত অসুবিধা</string>
+    <string name="ear_whisper_test_response">ফুচফুচনি পৰীক্ষাৰ প্ৰতিক্ৰিয়া</string>
+    <string name="ear_whisper_correct">শুদ্ধ</string>
+    <string name="ear_whisper_incorrect">ভুল</string>
+    <string name="ear_hearing_test_outcome">শ্ৰৱণ পৰীক্ষাৰ ফলাফল</string>
+    <string name="ear_hearing_normal">স্বাভাৱিক</string>
+    <string name="ear_hearing_slight_loss">সামান্য হ্ৰাস</string>
+    <string name="ear_hearing_moderate">মধ্যম</string>
+    <string name="ear_hearing_severe">গুৰুতৰ</string>
+    <string name="ear_hearing_deaf">বধিৰ</string>
+    <string name="ear_pain">কাণৰ বিষ</string>
+    <string name="ear_discharge_present">কাণৰ পৰা স্ৰাৱ</string>
+    <string name="ear_foreign_body">কাণত বিদেশী বস্তু</string>
+    <string name="ear_foreign_body_superficial">হয় (পৃষ্ঠীয়)</string>
+    <string name="ear_foreign_body_deep">হয় (গভীৰ)</string>
+    <string name="ear_condition_type">কাণৰ অৱস্থাৰ প্ৰকাৰ</string>
+    <string name="ear_otomycosis">অট\'মাইক\'ছিছ</string>
+    <string name="ear_otitis_externa">অটাইটিছ এক্সটাৰ্না</string>
+    <string name="ear_acute_discharge">তীব্ৰ কাণৰ স্ৰাৱ</string>
+    <string name="ear_chronic_discharge">দীৰ্ঘকালীন কাণৰ স্ৰাৱ</string>
+    <string name="ear_wax">কাণৰ মলি</string>
+    <string name="ear_congenital_malformation">জন্মগত কাণৰ বিকৃতি</string>
+    <string name="ear_alert_abnormal_hearing">অস্বাভাৱিক শ্ৰৱণ ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="ear_alert_deep_foreign_body">গভীৰ বিদেশী বস্তু ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="ear_alert_congenital_malformation">জন্মগত কাণৰ বিকৃতি ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+
+    <!-- Ophthalmic Screening -->
+    <string name="ophthalmic_screening_title">চকুৰ পৰীক্ষা</string>
+    <string name="ophthalmic_symptomatic_title">চক্ষু বিজ্ঞান লক্ষণাত্মক</string>
+    <string name="ophthalmic_screening_section_title">অন্ধত্ব আৰু প্ৰতিসৰণ ত্ৰুটিৰ বাবে পৰীক্ষা</string>
+    <string name="ophthalmic_is_diabetic">ৰোগী মধুমেহত আক্ৰান্ত নেকি? <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_screening_performed">মধুমেহ ৰোগীৰ বাবে পৰীক্ষা কৰা হৈছে <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_right">দূৰ দৃষ্টি তীক্ষ্ণতা \u2013 সোঁ চকু <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_left">দূৰ দৃষ্টি তীক্ষ্ণতা \u2013 বাওঁ চকু <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_visual_impairment_alert">সন্দেহজনক দৃষ্টি দোষ</string>
+    <string name="ophthalmic_reason_for_visit">ভ্ৰমণৰ কাৰণ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_near_va">ওচৰৰ দৃষ্টি তীক্ষ্ণতা <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_chart_used">দৃষ্টি তীক্ষ্ণতা চাৰ্ট ব্যৱহাৰ কৰা হৈছে <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_case_identification_title">কেছ চিনাক্তকৰণ</string>
+    <string name="ophthalmic_case_id_alert">সন্দেহজনক দৃষ্টি দোষ চিনাক্ত কৰা হৈছে। অনুগ্ৰহ কৰি তলত কেছ চিনাক্তকৰণ সম্পূৰ্ণ কৰক।</string>
+    <string name="ophthalmic_case_id_conditions">কেছ চিনাক্তকৰণ আৰু অৱস্থা(সমূহ)</string>
+    <string name="ophthalmic_case_id_conditions_mandatory">কেছ চিনাক্তকৰণ আৰু অৱস্থা(সমূহ) <font color="#FF0000">*</font></string>
+    <string name="select_conditions">অৱস্থা(সমূহ) বাছক</string>
+    <string name="ophthalmic_vitamin_a_deficiency">ভিটামিন এ-ৰ অভাৱ / জেৰ\'ফথেলমিয়া</string>
+    <string name="ophthalmic_cataract_symptoms">ছানি পৰাৰ লক্ষণ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_glaucoma_symptoms">গ্লুক\'মাৰ লক্ষণ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dr_symptoms">মধুমেহজনিত ৰেটিন\'পেথিৰ লক্ষণ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_presbyopia_symptoms">প্ৰেছবায়\'পিয়াৰ লক্ষণ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_trachoma_status">ট্ৰেক\'মাৰ অৱস্থা <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_corneal_disease_type">কৰ্ণিয়াৰ ৰোগৰ প্ৰকাৰ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_vitamin_a_deficiency_label">ভিটামিন এ-ৰ অভাৱৰ লক্ষণ / বিট\'ট স্পট চিনাক্ত <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_trachoma_status">ট্ৰেক\'মাৰ অৱস্থা বাছক</string>
+    <string name="ophthalmic_select_corneal_disease_type">কৰ্ণিয়াৰ ৰোগৰ প্ৰকাৰ বাছক</string>
+    <string name="ophthalmic_alert_ophthalmologist_referral">ৰোগীক দ্বিতীয় স্তৰত চক্ষু বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="ophthalmic_alert_presbyopia_management">ৰোগীয়ে প্ৰেছবায়\'পিয়া প্ৰবন্ধনৰ বাবে (যেনে, পঢ়াৰ চশমা) যোগ্য হ\'ব পাৰে।</string>
+    <string name="ophthalmic_alert_vitamin_a">ভিটামিন এ প্ৰফাইলেক্সিচ দিয়া হওক। ৰোগীক দ্বিতীয় স্তৰত চক্ষু বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="ophthalmic_injury_trauma_title">আঘাত আৰু ট্ৰমা ফৰ্ম</string>
+    <string name="ophthalmic_injury_type_label">আঘাতৰ প্ৰকাৰ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_injury_type">আঘাতৰ প্ৰকাৰ বাছক</string>
+    <string name="ophthalmic_foreign_body_removal_attempted">বিদেশী বস্তু আঁতৰোৱাৰ চেষ্টা কৰা হৈছে</string>
+    <string name="ophthalmic_chemical_exposure_wash_performed">ৰাসায়নিক সংস্পৰ্শ \u2013 ভালদৰে ধোৱা হৈছে</string>
+
+    <string-array name="ophthalmic_reason_for_visit_options">
+        <item>স্ক্ৰীণিং</item>
+        <item>লক্ষণগত</item>
+        <item>চকুৰ আঘাত/ট্ৰমাৰ বাবে প্ৰাথমিক চিকিৎসা</item>
+    </string-array>
+
+    <string-array name="ophthalmic_chart_options">
+        <item>স্নেলেন দূৰত্বৰ চাৰ্ট</item>
+        <item>নিকট দৃষ্টিৰ চাৰ্ট</item>
+    </string-array>
+
+    <string-array name="ophthalmic_case_id_options">
+        <item>চানি</item>
+        <item>গ্লুকোমা</item>
+        <item>ডায়েবেটিক ৰেটিনোপেথী</item>
+        <item>প্ৰেছবায়\'পিয়া</item>
+        <item>ট্ৰেক\'মা</item>
+        <item>কৰ্ণিয়াৰ ৰোগ</item>
+        <item>চকু উঠা</item>
+        <item>চকু শুকাই যোৱা</item>
+        <item>চকুৰ এলাৰ্জি</item>
+    </string-array>
+
+    <string-array name="ophthalmic_injury_type_options">
+        <item>যান্ত্ৰিক বিদেশী বস্তু</item>
+        <item>কুণ্ঠিত আঘাত</item>
+        <item>কটা আঘাতৰ সন্দেহ</item>
+        <item>ৰাসায়নিক (এচিড/ক্ষাৰ/অন্য)</item>
+    </string-array>
+
+    <string-array name="ophthalmic_foreign_body_options">
+        <item>চেষ্ট কৰা হোৱা নাই</item>
+        <item>কনজাংটিভেল থলীৰ পৰা চেষ্টা কৰা হৈছে</item>
+        <item>কৰ্ণিয়াত সোমাই থকা বস্তু</item>
+    </string-array>
+
+    <string-array name="ophthalmic_trachoma_options">
+        <item>সন্দেহযুক্ত সক্ৰিয় ট্ৰেক\'মা</item>
+        <item>সন্দেহযুক্ত TT/TI</item>
+        <item>ট্ৰেক\'মা নাই</item>
+    </string-array>
+
+    <string-array name="ophthalmic_corneal_disease_options">
+        <item>কৰ্ণিয়াৰ অস্বচ্ছতা</item>
+        <item>সন্দেহযুক্ত কৰ্ণিয়াৰ আলচাৰ</item>
+        <item>অন্য কৰ্ণিয়াৰ ৰোগ</item>
+    </string-array>
+    <string name="saved_successfully">সফলভাৱে সংৰক্ষণ কৰা হৈছে</string>
+    <string name="save_failed_retry">সংৰক্ষণ কৰাত বিফল। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।</string>
+    <string name="please_complete_field">অনুগ্ৰহ কৰি সম্পূৰ্ণ কৰক: %s</string>
+
+    <!-- Oral Health Dataset -->
+    <string name="oral_tooth_decay_present">দাঁতৰ পচন</string>
+    <string name="oral_tooth_decay_symptoms">দাঁতৰ পচনৰ লক্ষণ</string>
+    <string name="oral_symptom_black_spot">ক\'লা দাগ</string>
+    <string name="oral_symptom_discoloration">দাঁতৰ গহ্বৰত ৰং সলনি</string>
+    <string name="oral_symptom_hole">দাঁতত ফুটা</string>
+    <string name="oral_symptom_sensitivity">গৰম আৰু ঠাণ্ডা, মিঠা আৰু টেঙাৰ প্ৰতি সংবেদনশীলতা</string>
+    <string name="oral_symptom_food_lodgment">গহ্বৰ/দাঁতৰ মাজত খাদ্য জমা হোৱা</string>
+    <string name="oral_symptom_pain">বিষ</string>
+    <string name="oral_symptom_swelling">ফুলা</string>
+    <string name="oral_symptom_pus_discharge">পূঁজ ওলোৱা</string>
+    <string name="oral_gum_disease_present">মাৰিৰ ৰোগ</string>
+    <string name="oral_gum_disease_symptoms">মাৰিৰ ৰোগৰ লক্ষণ</string>
+    <string name="oral_gum_foul_smell">দুৰ্গন্ধ</string>
+    <string name="oral_gum_bleeding">মাৰিৰ পৰা তেজ ওলোৱা</string>
+    <string name="oral_gum_deposits">দাঁতত জমা আৰু ৰং সলনি</string>
+    <string name="oral_gum_loose_teeth">ঢিলা দাঁত</string>
+    <string name="oral_gum_widening_gap">দাঁতৰ মাজত ফাঁক বাঢ়ি যোৱা</string>
+    <string name="oral_gum_swollen">ফুলা মাৰি</string>
+    <string name="oral_irregular_teeth_jaws">অনিয়মিত দাঁত/হনু</string>
+    <string name="oral_abnormal_growth_ulcer">অস্বাভাৱিক বৃদ্ধি/ঘা</string>
+    <string name="oral_cleft_lip_palate">ফাটা ওঁঠ/তালু</string>
+    <string name="oral_dental_fluorosis">দন্ত ফ্ল\'ৰ\'ছিছ</string>
+    <string name="oral_dental_emergency">দন্ত জৰুৰীকালীন</string>
+    <string name="oral_emergency_pain">বিষ</string>
+    <string name="oral_emergency_abscess">ফোঁহা</string>
+    <string name="oral_emergency_swelling">ফুলা</string>
+    <string name="oral_emergency_tooth_injury">দাঁতৰ আঘাত</string>
+    <string name="oral_emergency_avulsion">দাঁত উভালি যোৱা</string>
+    <string name="oral_emergency_non_healing_ulcer">ভাল নোহোৱা ঘা</string>
+    <string name="oral_emergency_uncontrolled_bleeding">অনিয়ন্ত্ৰিত ৰক্তক্ষৰণ</string>
+    <string name="oral_emergency_trauma">আঘাত (ভঙা হনু/লৰচৰ দাঁত)</string>
+    <string name="oral_health_referral_alert">ৰোগীক দ্বিতীয় স্তৰত দন্ত চিকিৎসকৰ ওচৰলৈ পঠিয়াওক।</string>
+
+    <!-- Elderly Health Assessment Dataset -->
+    <string name="elderly_geriatric_complaints">সাধাৰণ জৰাবিদ্যা সম্পৰ্কীয় অভিযোগ আছেনে?</string>
+    <string name="elderly_multiple_chronic">একাধিক দীৰ্ঘম্যাদী অৱস্থা</string>
+    <string name="elderly_recent_falls">শেহতীয়া পতন</string>
+    <string name="elderly_difficulty_walking">খোজকঢ়া বা ভাৰসাম্যত অসুবিধা</string>
+    <string name="elderly_visual_hearing">দৃষ্টি বা শ্ৰৱণ সমস্যা</string>
+    <string name="elderly_functional_decline">কাৰ্যক্ষমতাৰ অৱনতি / দৈনন্দিন কামত অসুবিধা (ADL)</string>
+    <string name="elderly_functional_assessment_headline">কাৰ্যক্ষমতা মূল্যায়ন শাখা</string>
+    <string name="elderly_bathing">গা ধোৱা</string>
+    <string name="elderly_dressing">কাপোৰ পিন্ধা</string>
+    <string name="elderly_toileting">শৌচালয় যোৱা</string>
+    <string name="elderly_transferring">স্থানান্তৰ</string>
+    <string name="elderly_continence">মূত্ৰ নিয়ন্ত্ৰণ</string>
+    <string name="elderly_feeding">খোৱা</string>
+    <string name="elderly_independent">স্বতন্ত্ৰ (1)</string>
+    <string name="elderly_dependent">নিৰ্ভৰশীল (0)</string>
+    <string name="elderly_total_score">মুঠ স্কোৰ</string>
+    <string name="elderly_functional_status">কাৰ্যক্ষমতাৰ অৱস্থা</string>
+    <string name="elderly_functional_decline_flag">কাৰ্যক্ষমতাৰ অৱনতিৰ চিন</string>
+    <string name="elderly_status_no_decline">কোনো অৱনতি নাই</string>
+    <string name="elderly_status_partial_dependence">আংশিক নিৰ্ভৰশীলতা</string>
+    <string name="elderly_status_functional_dependence">কাৰ্যক্ষমতাত নিৰ্ভৰশীলতা</string>
+    <string name="elderly_status_highly_dependent">অত্যন্ত নিৰ্ভৰশীল</string>
+    <string name="elderly_status_unknown">অজ্ঞাত</string>
+    <string name="elderly_memory_loss">স্মৃতিশক্তি হ্ৰাস বা বিভ্ৰান্তি</string>
+    <string name="elderly_dementia_headline">ডিমেনচিয়া স্ক্ৰীনিং চেকলিষ্ট</string>
+    <string name="elderly_dementia_memory_loss">ক্ৰমান্বয়ে স্মৃতিশক্তি হ্ৰাস</string>
+    <string name="elderly_dementia_disorientation">বিভ্ৰান্তি (সময়/স্থান/ব্যক্তি)</string>
+    <string name="elderly_dementia_behavioural">আচৰণগত পৰিৱৰ্তন</string>
+    <string name="elderly_dementia_self_care">আত্ম-যত্ন / দৈনন্দিন কাৰ্যত অৱনতি</string>
+    <string name="elderly_screening_outcome">পৰীক্ষাৰ ফলাফল</string>
+    <string name="elderly_referral_required">ৰেফাৰেল প্ৰয়োজন</string>
+    <string name="elderly_outcome_suspected">সন্দেহজনক</string>
+    <string name="elderly_outcome_not_suspected">সন্দেহজনক নহয়</string>
+    <string name="elderly_alert_functional_decline">ৰোগীৰ কাৰ্যক্ষমতাত অৱনতি আছে। প্ৰয়োজনত উচ্চ সুবিধালৈ প্ৰেৰণ কৰক।</string>
+    <string name="elderly_alert_memory_loss">ৰোগীৰ স্মৃতিশক্তি হ্ৰাস আছে। প্ৰয়োজনত উচ্চ সুবিধালৈ প্ৰেৰণ কৰক।</string>
+
+    <!-- Psychosocial Caregiver Support Dataset -->
+    <string name="psychosocial_counselling_provided">মনোসামাজিক পৰামৰ্শ প্ৰদান কৰা হৈছে</string>
+    <string name="psychosocial_caregiver_counselling">যত্নকাৰীক পৰামৰ্শ প্ৰদান কৰা হৈছে</string>
+    <string name="psychosocial_caregiver_distress">যত্নকাৰীৰ মানসিক চাপ চিনাক্ত কৰা হৈছে</string>
+    <string name="psychosocial_counselling_remarks">পৰামৰ্শ মন্তব্য</string>
+
+    <!-- Mental Health Screening – remaining hardcoded strings -->
+    <string name="mh_depression_severity">বিষণ্নতাৰ তীব্ৰতা</string>
+    <string name="mh_system_action">চিষ্টেম কাৰ্য</string>
+    <string name="mh_current_tobacco_use">বৰ্তমান তম্বাকু ব্যৱহাৰ</string>
+    <string name="mh_tobacco_type">তম্বাকু ব্যৱহাৰৰ ধৰণ</string>
+    <string name="mh_tobacco_smoking">ধূমপান</string>
+    <string name="mh_tobacco_smokeless">ধোঁৱাবিহীন</string>
+    <string name="mh_tobacco_both">দুয়োটা</string>
+    <string name="mh_tobacco_frequency">তম্বাকু ব্যৱহাৰৰ সঘনতা</string>
+    <string name="mh_tobacco_occasional">মাজে মাজে</string>
+    <string name="mh_tobacco_daily">দৈনিক</string>
+    <string name="mh_tobacco_outcome">তম্বাকু ব্যৱহাৰৰ ফলাফল</string>
+    <string name="mh_tobacco_system_action">চিষ্টেম কাৰ্য</string>
+    <string name="mh_intervention_psychoeducation">মনোশিক্ষা</string>
+    <string name="mh_intervention_counselling">পৰামৰ্শ</string>
+    <string name="mh_intervention_stress_mgmt">মানসিক চাপ ব্যৱস্থাপনা</string>
+    <string name="mh_intervention_family_counselling">পৰিয়ালৰ পৰামৰ্শ</string>
+    <!-- Throat Diagnosis Dataset -->
+    <string name="throat_diagnosis_symptoms">লক্ষণসমূহ</string>
+    <string name="throat_symptom_pain">বিষ</string>
+    <string name="throat_symptom_soreness">কণ্ঠত ঘা / খচখচনি</string>
+    <string name="throat_symptom_cold">লগত হোৱা চৰ্দি</string>
+    <string name="throat_symptom_itching">খজুৱতি</string>
+    <string name="throat_symptom_hoarseness">মাত ভঙা বা ডাঠ হোৱা</string>
+    <string name="throat_diagnosis_neck_swelling">ডিঙিত ফুলা আছে</string>
+    <string name="throat_diagnosis_difficulty_swallowing">গিলি খোৱাত অসুবিধা</string>
+    <string name="throat_diagnosis_tonsillitis">টনচিলাইটিছ</string>
+    <string name="throat_diagnosis_pharyngitis">ফেৰিঞ্জাইটিছ</string>
+    <string name="throat_diagnosis_laryngitis">লেৰিঞ্জাইটিছ</string>
+    <string name="throat_diagnosis_sinusitis">ছাইনাছাইটিছ</string>
+    <string name="throat_diagnosis_cleft_lip">ফাটা ওঁঠ</string>
+    <string name="throat_diagnosis_cleft_palate">ফাটা তালু</string>
+
+    <string name="throat_alert_neck_swelling">ডিঙিত ফুলা ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="throat_alert_difficulty_swallowing">গিলি খোৱাত অসুবিধা পোৱা গৈছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="throat_alert_cleft_lip">ফাটা ওঁঠ ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+    <string name="throat_alert_cleft_palate">ফাটা তালু ধৰা পৰিছে। ৰোগীক দ্বিতীয় স্তৰত বিশেষজ্ঞৰ ওচৰলৈ পঠিয়াওক।</string>
+
+    <!-- Palliative Care / Pain and Symptom Assessment -->
+    <string name="palliative_care_identification_headline">উপশমমূলক যতনৰ চিনাক্তকৰণ (Palliative Care)</string>
+    <string name="pain_symptom_assessment_palliative">বিষ আৰু লক্ষণৰ মূল্যায়ন</string>
+    
+    <string name="persistent_pain_present">নিৰন্তৰ বিষ আছে</string>
+    <string name="pain_severity">বিষৰ তীব্ৰতা</string>
+    <string name="pain_duration">বিষৰ সময়কাল</string>
+    <string name="pain_duration_less_than_one_month">&lt; ১ মাহ</string>
+    <string name="pain_duration_one_to_six_months">১–৬ মাহ</string>
+    <string name="pain_duration_more_than_six_months">&gt; ৬ মাহ</string>
+    <string name="mild">সামান্য</string>
+    <string name="moderate">মধ্যম</string>
+    <string name="severe">গুৰুতৰ</string>
+
+    <string name="other_symptoms_present">অন্যান্য লক্ষণসমূহ আছে</string>
+    <string name="other_symptoms_severity">অন্যান্য লক্ষণসমূহৰ তীব্ৰতা</string>
+    <string name="immediate_relief_provided">তৎকালীন সকাহ দিয়া হৈছে</string>
+    
+    <string name="symptom_assessment_basic_title">লক্ষণৰ মূল্যায়ন</string>
+    <string name="symptom_assessment_basic_field_title">লক্ষণসমূহ</string>
+    <string name="symptom_nausea_vomiting">বমি ভাব / বমি</string>
+    <string name="symptom_constipation">কষ্টকাঠিন্য</string>
+    <string name="symptom_anxiety_restlessness">উদ্বেগ / অস্থিৰতা</string>
+    <string name="symptom_sleep_disturbance">টোপনিত ব্যাঘাত</string>
+    <string name="breathlessness">উশাহ লোৱাত কষ্ট</string>
+    <string name="nausea">বমি ভাব</string>
+    <string name="fatigue">ভাগৰ</string>
+    <string name="weakness">দুৰ্বলতা</string>
+    <string name="other">অন্য</string>
+    
+    <string name="basic_management_cho_level_title">সাধাৰণ পৰিচালনা</string>
+    <string name="basic_symptom_relief_provided">প্ৰাথমিক লক্ষণৰ সকাহ প্ৰদান কৰা হৈছে</string>
+    <string name="basic_psychosocial_support_provided">মানসিক আৰু সামাজিক সঁহাৰি প্ৰদান কৰা হৈছে</string>
+    <string name="basic_caregiver_counselling_provided">যতন লওঁতাক পৰামৰ্শ দিয়া হৈছে</string>
+    <string name="basic_management_remarks">মন্তব্য</string>
+    
+    <string name="distressing_symptoms_present">যন্ত্ৰণাদায়ক লক্ষণসমূহ আছে</string>
+    <string name="bedridden_or_severely_dependent">বিছনাত পৰা বা বেয়াকৈ নিৰ্ভৰশীল</string>
+    <string name="life_limiting_illness_known">জীৱন সীমিত কৰা ৰোগৰ কথা জনা যায়</string>
+    <string name="caregiver_support_required">যতন লওঁতাৰ সহায় প্ৰয়োজন</string>
+
+    <string name="severe_pain_referral_alert">গভীৰ বিষ। অনুগ্ৰহ কৰি উচ্চ সুবিধালৈ প্ৰেৰণ কৰক।</string>
+    <string name="severe_symptoms_referral_alert">গভীৰ লক্ষণ। অনুগ্ৰহ কৰি উচ্চ সুবিধালৈ প্ৰেৰণ কৰক।</string>
+
+    <!-- Generic Referral & Follow Up Fields -->
+    <string name="referral_required_title">প্ৰেৰণ কৰাৰ প্ৰয়োজন নেকি?</string>
+    <string-array name="referral_required_options">
+        <item>হয়</item>
+        <item>নহয়</item>
+    </string-array>
+    
+    <string name="referral_level_title">প্ৰেৰণ কৰাৰ স্তৰ</string>
+    <string-array name="referral_level_options">
+        <item>প্রাথমিক স্বাস্থ্য কেন্দ্র</item>
+        <item>কমিউনিটি স্বাস্থ্য কেন্দ্র</item>
+        <item>জিলা চিকিৎসালয়</item>
+        <item>উপশমমূলক যতন গোট</item>
+    </string-array>
+    
+    <string name="reason_for_referral_title">প্ৰেৰণ কৰাৰ কাৰণ</string>
+    <string-array name="reason_for_referral_options">
+        <item>গভীৰ বিষ</item>
+        <item>কাৰ্য্যক্ষম নিৰ্ভৰশীলতা</item>
+        <item>ডিমেনচিয়াৰ সন্দেহ</item>
+        <item>জীৱনৰ শেষৰ যতন</item>
+    </string-array>
+    
+    <string name="follow_up_required_title">ফলো-আপ প্ৰয়োজন নেকি?</string>
+    <string-array name="follow_up_required_options">
+        <item>হয়</item>
+        <item>নহয়</item>
+    </string-array>
+    
+    <string name="follow_up_date_title">ফলো-আপ তাৰিখ</string>
+    
+    <string name="case_status_title">কেছৰ অৱস্থা</string>
+    <string-array name="case_status_options">
+        <item>সুস্থ হৈছে</item>
+        <item>চিকিৎসা চলি আছে</item>
+        <item>মৃত্যু</item>
+    </string-array>
+    
+    <string name="date_of_death_title">মৃত্যুৰ তাৰিখ</string>
+    <string name="yes_option">হয়</string>
+    <string name="no_option">নহয়</string>
+
+
+    <string name="mh_suicide_immediate_assess">চিঅ’ই তাৎক্ষণিক বিপদাশংকা মূল্যায়ন কৰে</string>
+    <string name="mh_date_format_pattern">dd/MM/yyyy</string>
+    <string name="mh_suicide_risk_alert_moderate">মধ্যমীয়া আত্মহত্যাৰ বিপদাশংকা: তাৎক্ষণিক পৰামৰ্শৰ প্ৰয়োজন। প্ৰেৰণ কৰাৰ কথা বিবেচনা কৰক।</string>
+    <string name="mh_suicide_risk_alert_high">উচ্চ আত্মহত্যাৰ বিপদাশংকা: জৰুৰীকালীন হস্তক্ষেপৰ প্ৰয়োজন। লগে লಗೆ প্ৰেৰণ কৰক।</string>
+
+    <string name="mh_suspected">সন্দেহজনক</string>
+    <string name="mh_de_addiction">নিচামুক্তি</string>
+    <string name="mh_de_addiction_centre">নিচামুক্তি কেন্দ্ৰ</string>
+
+    <string-array name="phq9_severity_options">
+        <item>নূন্যতম</item>
+        <item>সামান্য</item>
+        <item>মধ্যম</item>
+        <item>মধ্যমীয়া গম্ভীৰ</item>
+        <item>গম্ভীৰ</item>
+    </string-array>
+
+    <string-array name="phq9_system_action_options">
+        <item>মনোশিক্ষা</item>
+        <item>পৰামৰ্শ - MO/PHCলৈ প্ৰেৰণ কৰক</item>
+        <item>প্ৰেৰণ - জৰুৰী প্ৰেৰণ</item>
+        <item>প্ৰেৰণ - জৰুৰীকালীন প্ৰেৰণ</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_outcome_options">
+        <item>ব্যৱহাৰ চিনাক্ত কৰা হৈছে</item>
+        <item>কোনো ব্যৱহাৰ চিনাক্ত কৰা হোৱಾ নাই</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_system_action_options">
+        <item>সংক্ষিপ্ত পৰামৰ্শ</item>
+        <item>প্ৰেৰণ</item>
+    </string-array>
+
+    <string-array name="mh_alcohol_classification_options">
+        <item>কোনো সমস্যাজনক সুರা সেৱন চিনাক্ত কৰা হোৱা নাই</item>
+        <item>সমস্যাজনক সুৰা সেৱনৰ সন্দেহ</item>
+    </string-array>
+
+    <string-array name="mh_ed_outcome_options">
+        <item>সন্দেহজনক মৃগীৰোগ</item>
+        <item>সন্দেহজনক ডিমেনচিয়া</item>
+        <item>সন্দেহজনক</item>
+        <item>সন্দেহজনক নহয়</item>
+    </string-array>
+
+    <string name="mh_ed_reason_neurological">স্নায়বিক অৱস্থাৰ সন্দেহ</string>
+
+    <string-array name="mh_referral_level_dmhp_options">
+        <item>প্ৰাথমিক স্বাস্থ্য কেন্দ্ৰ (PHC)</item>
+        <item>সামূহিক স্বাস্থ্য কেন্দ্ৰ (CHC)</item>
+        <item>জিลา চিকিৎসালয়</item>
+        <item>জিলা মানসিক স্বাস্থ্য কাৰ্যসূচী (DMHP)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_alcohol_options">
+        <item>প্ৰাথমিক স্বাস্থ্য কেন্দ্ৰ (PHC)</item>
+        <item>নিচামুক্তি কেন্দ্ৰ (De-addiction)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_rbsk_options">
+        <item>RBSK DEIC</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_child_options">
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>DH</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_adult_options">
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>DH</item>
+        <item>DMHP</item>
+        <item>নিচামুক্তি কেন্দ্ৰ</item>
+    </string-array>
+    
+    <string-array name="mh_referral_level_standard_mh_options">
+        <item>প্ৰাথমিক স্বাস্থ্য কেন্দ্ৰ (PHC)</item>
+        <item>জিলা মানসিক স্বাস্থ্য কাৰ্যসূচী (DMHP)</item>
+    </string-array>
+
+    <!-- Missing Mental Health Strings -->
+    <string-array name="alcohol_system_action_options">
+        <item>সংক্ষিপ্ত হস্তক্ষেপ</item>
+        <item>প্ৰেৰণ</item>
+    </string-array>
+    <string-array name="mh_case_closure_reason_options">
+        <item>আৰোগ্য</item>
+        <item>প্ৰেৰণ কৰা হৈছে</item>
+        <item>ফ\'ল\'-আপ হেৰুৱাইছে</item>
+        <item>মৃত্যু</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options">
+        <item>আত্মহত্যাৰ আশংকা / আত্ম-ক্ষতি</item>
+        <item>মধ্যমীয়াৰ পৰা গুৰুতৰ হতাশা</item>
+        <item>গুৰুতৰ মানসিক বিকাৰৰ সন্দেহ</item>
+        <item>নিচা নিৰ্ভৰশীলতা / প্ৰত্যাহাৰ লক্ষণ</item>
+        <item>কাৰ্য্যকৰী দুৰ্বলতা</item>
+        <item>স্নায়বিক অৱস্থাৰ সন্দেহ</item>
+        <item>শিশুৰ আচৰণ সম্পৰ্কীয় উদ্বেগ</item>
+        <item>নিজৰ বা আনৰ বাবে বিপদাশংকা</item>
+        <item>কোনো উন্নতি নাই / অৱনতি</item>
+        <item>বিশেষজ্ঞৰ যত্নৰ প্ৰয়োজন</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options_under_11">
+        <item>মানসিক স্বাস্থ্য সম্পৰ্কীয় অভিযোগ</item>
+        <item>চিকিৎসা সম্পৰ্কীয় জটিলতা</item>
+    </string-array>
+    <string-array name="mh_referral_level_options">
+        <item>PHC</item>
+        <item>DMHP</item>
+        <item>নিচামুক্তি কেন্দ্ৰ</item>
+    </string-array>
+
+    <string name="ed_age_60_years">বয়স ≥ ৬০ বছৰ</string>
+    <string name="ed_confusion_disorientation">বিভ্ৰান্তি বা দিশহাৰা হোৱা</string>
+    <string name="ed_duration_minutes">সময়সীমা (মিনিট)</string>
+    <string name="ed_edConfusionordrowsiness">খণ্ডটোৰ পিছত বিভ্ৰান্তি বা টোপনি ভাব</string>
+    <string name="ed_edRecurrentEpisodeloss">চেতনা হেৰুওৱাৰ খণ্ড</string>
+    <string name="ed_functional_decline">দৈনন্দিন কাৰ্য্যত অৱনতি (নিজা যত্ন, সচৰাচৰ কাৰ্য্য)</string>
+    <string name="ed_intervention_type">হস্তক্ষেপৰ প্ৰকাৰ</string>
+    <string name="ed_progressive_memory_loss">ক্ৰমান্বয়ে স্মৃতিশক্তি হেৰুওৱা</string>
+    <string name="ed_psychosocial_intervention_provided">মনোসামাজিক হস্তক্ষেপ প্ৰদান কৰা হৈছে</string>
+    <string name="ed_reason">কাৰণ</string>
+    <string name="ed_recurrent_jerky_movements">সঘনাই জঁক দিয়া / ফিট হোৱা</string>
+    <string name="ed_referral_required">প্ৰেৰণৰ প্ৰয়োজন</string>
+    <string name="ed_remarks">মন্তব্য</string>
+    <string name="ed_screening_outcome">পৰীক্ষাৰ ফলাফল</string>
+    <string name="ed_session_date">অধিবেশনৰ তাৰিখ</string>
+    <string name="epilepsy_dementia_checklist_title">মৃগীৰোগ আৰু ডিমেনচিয়া পৰীক্ষণৰ চেকলিষ্ট</string>
+
+    <string name="mh_adherence_to_advice_title">পৰামৰ্শ পালন</string>
+    <string name="mh_case_closure_reason_title">গোচৰ বন্ধ কৰাৰ কাৰণ</string>
+    <string name="mh_follow_up_date_title">ফ\'ল\'-আপৰ তাৰিখ</string>
+    <string name="mh_follow_up_required_title">ফ\'ল\'-আপৰ প্ৰয়োজন</string>
+    <string name="mh_improvement_noted_title">উন্নতি দেখা গৈছে</string>
+    <string name="mh_reason_for_referral_title">প্ৰেৰণ কৰাৰ কাৰণ</string>
+    <string name="mh_referral_date_title">প্ৰেৰণ কৰাৰ তাৰিখ</string>
+    <string name="mh_referral_escalation_title">উচ্ছ পৰ্যায়লৈ প্ৰেৰণ কৰাৰ প্ৰয়োজন</string>
+    <string name="mh_referral_level_title">প্ৰেৰণৰ স্তৰ</string>
+    <string name="mh_referral_required_title">প্ৰেৰণৰ প্ৰয়োজন</string>
+    <string name="mh_repeat_phq9_title">PHQ-9 পুনৰাবৃত্তি কৰক</string>
+
+
+    <string name="substance_alcohol_classification">মদ্যপানৰ শ্ৰেণীবিভাজন</string>
+    <string name="substance_alcohol_frequency">মদ্যপানৰ হাৰ</string>
+    <string name="substance_alcohol_impact">দৈনন্দিন কাৰ্য্যত প্ৰভাৱ (স্বাস্থ্য, পৰিয়াল, কাম)</string>
+    <string name="substance_alcohol_loss">মদ্যপানৰ ওপৰত নিয়ন্ত্ৰণ হেৰুওৱা</string>
+    <string name="substance_alcohol_problematic">সমস্যামূলক মদ্যপানৰ বিষয়ে চিএইচঅ\'ৰ মূল্যায়ন</string>
+    <string name="substance_alcohol_system_action">ব্যৱস্থাৰ কাৰ্য্য</string>
+    <string name="substance_alcohol_title">মদ্যপান চিনাক্তকৰণ</string>
+    <string name="substance_alcohol_withdrawal">প্ৰত্যাহাৰ লক্ষণৰ ইংগিত দিয়া লক্ষণসমূহ</string>
+    <string name="substance_tobacco_title">ধঁপাত ব্যৱহাৰ চিনাক্তকৰণ</string>
+    
+    <string name="elderly_health_assessment_saved">বয়োজ্যেষ্ঠ স্বাস্থ্য মূল্যায়ন সফলতাৰে ছেভ কৰা হৈছে</string>
+    <string name="ear_diagnosis_saved">কাণৰ ৰোগ নিৰ্ণয় ছেভ কৰা হৈছে</string>
+    <string name="throat_diagnosis_saved">ডিঙিৰ ৰোগ নিৰ্ণয় ছেভ কৰা হৈছে</string>
+    <string name="nose_diagnosis_saved">নাকৰ ৰোগ নিৰ্ণয় সফলতাৰে সংৰক্ষণ কৰা হৈছে</string>
+    <string name="title_nose_diagnosis">নাকৰ নিৰ্ণয় ফৰ্ম</string>
+    <string name="title_ear_diagnosis">কাণৰ নিৰ্ণয় ফৰ্ম</string>
+    <string name="title_throat_diagnosis">গলাৰ নিৰ্ণয় ফৰ্ম</string>
+    <string name="title_oral_health">দাঁতৰ স্বাস্থ্য ফৰ্ম</string>
+    <string name="oral_health_saved">মুখৰ স্বাস্থ্যৰ বিৱৰণ সফলভাৱে সংৰক্ষণ কৰা হৈছে</string>
+    <string name="title_pain_symptom_assessment">প্যালিয়েটিভ কেয়াৰ চিনাক্তকৰণ ফৰ্ম</string>
+    <string name="title_elderly_health_assessment">বয়োজ্যেষ্ঠ স্বাস্থ্য মূল্যায়ন</string>
+    <string name="title_psychosocial_caregiver_support">মনোসামাজিক আৰু যত্নপ্ৰদানকাৰী সহায়তা</string>
+
+    <!--
+      Localized labels for chief complaint and duration unit dropdowns.
+      Order MUST match values/strings.xml chief_complaint_en_keys and
+      duration_units_en_keys exactly. MasterDataLocalizer pairs by index.
+    -->
+    <string-array name="chief_complaint_localized">
+        <item>জ্বৰ</item>
+        <item>কাহ</item>
+        <item>মূৰৰ বিষ</item>
+        <item>চৰ্দি</item>
+        <item>বমি</item>
+        <item>ডায়েৰিয়া</item>
+        <item>শৰীৰৰ বিষ</item>
+        <item>পেটৰ বিষ</item>
+        <item>বুকুৰ বিষ</item>
+        <item>উশাহ লোৱাত অসুবিধা</item>
+        <item>ভাগৰ</item>
+        <item>ভোক নলগা</item>
+        <item>চকুৰ ছানি</item>
+        <item>গ্লুকোমা</item>
+        <item>ডায়েবেটিক ৰেটিনোপেথী</item>
+        <item>প্ৰেছবায়োপিয়া</item>
+        <item>ট্ৰেকোমা</item>
+        <item>কৰ্ণিয়াৰ ৰোগ</item>
+        <item>চকু ৰঙা হোৱা</item>
+        <item>শুকান চকু</item>
+        <item>শুকান চকু</item>
+        <item>চকুৰ এলাৰ্জী</item>
+        <item>চকুৰ আঘাত (ভোমা আঘাত / বিন্ধা আঘাত)</item>
+        <item>চকুৰ আঘাত (ভোমা আঘাত / বিন্ধা আঘাত)</item>
+        <item>ৰাসায়নিক সংস্পৰ্শ (এচিড / ক্ষাৰ / অন্য)</item>
+        <item>ৰাসায়নিক সংস্পৰ্শ (এচিড / ক্ষাৰ / অন্য)</item>
+        <item>চকুত বাহ্যিক বস্তু</item>
+        <item>দাঁতৰ ক্ষয়</item>
+        <item>দাঁতৰ মাড়িৰ ৰোগ</item>
+        <item>দাঁত আৰু চোৱালৰ অনিয়মিত গঠন</item>
+        <item>অস্বাভাৱিক বৃদ্ধি, দাগ বা ঘা</item>
+        <item>কটা ওঁঠ / তালু</item>
+        <item>দাঁতৰ ফ্লুৰ\'ছিছ</item>
+        <item>দাঁতৰ জৰুৰীকালীন</item>
+        <item>ডিঙিত ফুলা</item>
+        <item>গিলিবলৈ অসুবিধা</item>
+        <item>কটা ওঁঠ</item>
+        <item>কটা তালু</item>
+        <item>টনচিল ৰোগ</item>
+        <item>গলকণ্ঠ প্ৰদাহ</item>
+        <item>স্বৰযন্ত্ৰ প্ৰদাহ</item>
+        <item>ছাইনাছাইটিছ</item>
+        <item>শুনিবলৈ অসুবিধা</item>
+        <item>কাণৰ ময়লা</item>
+        <item>জন্মগত কাণৰ বিকৃতি</item>
+        <item>কাণত বাহ্যিক বস্তু</item>
+        <item>মুখ মেলি উশাহ লোৱা</item>
+        <item>নাকৰ তেজ</item>
+        <item>নাকত বাহ্যিক বস্তু</item>
+    </string-array>
+
+    <string-array name="duration_units_localized">
+        <item>ঘণ্টা</item>
+        <item>দিন</item>
+        <item>সপ্তাহ</item>
+        <item>মাহ</item>
+        <item>বছৰ</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values-as/strings_abha.xml b/app/src/main/res/values-as/strings_abha.xml
new file mode 100644
index 000000000..faed01b19
--- /dev/null
+++ b/app/src/main/res/values-as/strings_abha.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="verify_aadhaar_number">আধাৰ নম্বৰ পৰীক্ষা কৰক</string>
+    <string name="verify_aadhaar_otp">আধাৰ OTP পৰীক্ষা কৰক</string>
+    <string name="verify_mobile_number">মোবাইল নম্বৰ পৰীক্ষা কৰক</string>
+    <string name="enter_otp">OTP সন্নিবেশ কৰক</string>
+    <string name="verify_otp">OTP পৰীক্ষা কৰক</string>
+    <string name="resend_otp">OTP পুনৰ পঠাওক</string>
+    <string name="full_name">সম্পূৰ্ণ নাম</string>
+    <string name="male">পুৰুষ</string>
+    <string name="female">মহিলা</string>
+    <string name="district">জিলা</string>
+    <string name="aadhaar">আধাৰ</string>
+    <string name="asha">আশা</string>
+    <string name="ashaname">আশাৰ নাম</string>
+    <string name="gov">চৰকাৰ</string>
+    <string name="enter_aadhaar_number">আধাৰ নম্বৰ সন্নিবেশ কৰক</string>
+    <string name="aadhaar_number">আধাৰ নম্বৰ</string>
+    <string name="verified">পৰীক্ষিত</string>
+    <string name="generate_otp">OTP পঠাওক</string>
+    <string name="send_otp">OTP পঠাওক</string>
+    <string name="select_abha">নাম বাছক</string>
+    <string name="pid">PID</string>
+    <string name="generate_abha">ABHA</string>
+    <string name="_30">30</string>
+    <string name="abha_number_generated_successfully">ABHA নম্বৰ সফলভাৱে সৃষ্টি হ\'ল</string>
+    <string name="abha_id">ABHA ID</string>
+    <string name="linked_toO_beneficiary">লাভান্বিতৰ সৈতে সংযুক্ত</string>
+    <string name="do_you_want_to_download_the_abha_card">আপুনি ABHA কাৰ্ড ডাউনলোড কৰিব বিচাৰে নেকি?</string>
+    <string name="enter_mobile_number">মোবাইল নম্বৰ সন্নিবেশ কৰক</string>
+    <string name="enter_number_for_abha">ABHA পঞ্জীয়নৰ বাবে আধাৰ নম্বৰ</string>
+    <string name="aadhaar_linked_mobile">আধাৰ সংযুক্ত মোবাইল নম্বৰ বা অন্য মোবাইল নম্বৰ</string>
+    <string name="mobile_number">মোবাইল নম্বৰ</string>
+    <string name="check_and_generate_otp">পৰীক্ষা কৰক আৰু OTP সৃষ্টি কৰক</string>
+    <string name="textview">TextView</string>
+    <string name="download_abha_channel_id">ABHA কাৰ্ড ডাউনলোড হৈ আছে</string>
+    <string name="create_abha_number">ABHA নম্বৰ সৃষ্টি কৰক</string>
+    <string name="d_o_b">জন্ম তাৰিখ</string>
+    <string name="check_circle">চেক বৃত্ত</string>
+    <string name="name_">নাম :</string>
+    <string name="abha_number_">ABHA নম্বৰ :</string>
+    <string name="aadhaar_linked_mobile_number_or_other_mobile_number">আধাৰ সংযুক্ত মোবাইল নম্বৰ বা অন্য মোবাইল নম্বৰ</string>
+    <string name="validate_fp">আঙুলিৰ ছাপ পৰীক্ষা কৰক</string>
+    <string name="generating_abha_for">সন্নিবেশ কৰক</string>
+    <string name="otp_sent_to">\"আধাৰ সংযুক্ত মোবাইল নম্বৰলৈ OTP পঠোৱা হৈছে\"</string>
+    <string name="str_create_abha">ABHA সৃষ্টি কৰক</string>
+    <string name="str_search_abha">ABHA সন্ধান কৰক</string>
+    <string name="str_invalid_aadhaar_no">অনুগ্ৰহ কৰি বৈধ আধাৰ নম্বৰ সন্নিবেশ কৰক</string>
+    <string name="str_invalid_mobile_no">অনুগ্ৰহ কৰি বৈধ মোবাইল নম্বৰ সন্নিবেশ কৰক</string>
+    <string name="str_invalid_ben_name">অনুগ্ৰহ কৰি বৈধ লাভান্বিতৰ নাম সন্নিবেশ কৰক</string>
+    <string name="str_here_abha_no">ইয়াত আপোনাৰ ABHA নম্বৰ!</string>
+    <string name="str_abha_already_exist">এই ABHA ইতিমধ্যে আছে!</string>
+    <string name="str_abha_successfully_created">ABHA একাউণ্ট সফলভাৱে সৃষ্টি হ\'ল!</string>
+    <string name="str_abha_card_downloaded">আপুনি ডাউনলোড ফোল্ডাৰত Abha কাৰ্ড চাব পাৰে!!</string>
+
+    <string name="str_abha_otp_note">এই OTP কেৱল ১০ মিনিটৰ বাবে বৈধ</string>
+    <string name="str_enter_otp">OTP সন্নিবেশ কৰক:</string>
+    <string name="str_find_abha">ইতিমধ্যে ABHA আছে?\nএতিয়াই জানক!</string>
+    <string name="str_get_your_abha">মোবাইল নম্বৰ ব্যৱহাৰ কৰি ABHA নম্বৰ পাব।</string>
+    <string name="enter_ben_name">লাভান্বিতৰ নাম সন্নিবেশ কৰক</string>
+    <string name="str_didnt_receive_otp">OTP পোৱা নগ\'ল? অনুগ্ৰহ কৰি অপেক্ষা কৰক </string>
+
+    <string name="str_declaration">মই ইয়াৰ দ্বাৰা ঘোষণা কৰো যে:</string>
+    <string name="str_aadhaar_consent_1">মই ভাৰতীয় অনন্য পৰিচয় প্ৰাধিকৰণ (\"UIDAI\") দ্বাৰা জাৰী কৰা মোৰ আধাৰ নম্বৰ/ভাৰ্চুৱেল ID আৰু জনসংখ্যা সংক্ৰান্ত তথ্য স্বেচ্ছাই ভাগ বতৰা কৰিছো, আয়ুষ্মান ভাৰত স্বাস্থ্য একাউণ্ট নম্বৰ (\"ABHA নম্বৰ\") আৰু আয়ুষ্মান ভাৰত স্বাস্থ্য একাউণ্ট ঠিকনা (\"ABHA ঠিকনা\") সৃষ্টিৰ উদ্দেশ্যে। মই NHA ক আধাৰ (বিত্তীয় আৰু অন্যান্য অনুদান, সুবিধা আৰু সেৱাৰ লক্ষ্যযুক্ত প্ৰদান) আইন, ২০১৬ৰ ধাৰাসমূহ অনুসৰি উক্ত উদ্দেশ্যৰ বাবে UIDAIৰ সৈতে আধাৰ ভিত্তিক প্ৰমাণীকৰণ কৰিবলৈ মোৰ আধাৰ নম্বৰ/ভাৰ্চুৱেল ID ব্যৱহাৰ কৰাৰ অনুমতি দিছো। মই বুজিছো যে সফল প্ৰমাণীকৰণত UIDAI মোৰ e-KYC তথ্য বা \"হয়\"ৰ প্ৰতিক্ৰিয়া NHAৰ সৈতে ভাগ বতৰা কৰিব।</string>
+    <string name="str_aadhaar_consent_2">মই আধাৰৰ বাহিৰে দস্তাবেজ ব্যৱহাৰ কৰি আয়ুষ্মান ভাৰত স্বাস্থ্য একাউণ্ট নম্বৰ (\"ABHA নম্বৰ\") আৰু আয়ুষ্মান ভাৰত স্বাস্থ্য একাউণ্ট ঠিকনা (\"ABHA ঠিকনা\") সৃষ্টি কৰিব বিচাৰো। (আগবাঢ়িবলৈ ইয়াত ক্লিক কৰক)</string>
+    <string name="str_aadhaar_consent_3">মই এই এনকাউণ্টাৰৰ সময়ত মোৰ পুৰণা চৰকাৰী স্বাস্থ্য অভিলেখ আৰু যিবোৰ সৃষ্টি হ\'ব সেইবোৰ লিংক কৰিবলৈ মোৰ ABHA ঠিকনা আৰু ABHA নম্বৰ ব্যৱহাৰৰ সন্মতি দিছো।</string>
+    <string name="str_aadhaar_consent_4">মই এই এনকাউণ্টাৰৰ সময়ত মোক স্বাস্থ্য সেৱা প্ৰদান কৰাৰ উদ্দেশ্যে স্বাস্থ্য সেৱা প্ৰদানকাৰী(সকল)ৰ সৈতে মোৰ সকলো স্বাস্থ্য অভিলেখ ভাগ বতৰা কৰিবলৈ অনুমতি দিছো।</string>
+
+    <string name="str_aadhaar_consent_5">মই ৰাজহুৱা স্বাস্থ্য উদ্দেশ্যৰ বাবে মোৰ চৰকাৰী স্বাস্থ্য অভিলেখৰ বেনামীকৰণ আৰু পৰৱৰ্তী ব্যৱহাৰৰ সন্মতি দিছো।</string>
+    <string name="str_aadhaar_consent_6">মই, @ashaName, নিশ্চিত কৰো যে মই লাভান্বিতক উক্ত উদ্দেশ্যৰ বাবে সন্মতিৰ বিষয়বস্তুৰ বিষয়ে due ভাৱে জনাই আৰু ব্যাখ্যা কৰিছো।</string>
+    <string name="str_aadhaar_consent_7">মই, @beneficiaryName, ক ওপৰত উল্লেখ কৰা সন্মতিৰ বিষয়ে ব্যাখ্যা কৰা হৈছে আৰু মই উক্ত উদ্দেশ্যৰ বাবে মোৰ সন্মতি প্ৰদান কৰিছো।</string>
+    <string name="str_seconds">\" ছেকেণ্ড\"</string>
+    <string name="str_aadhaar_otp_number">\"আধাৰ পঞ্জীভূত মোবাইল নম্বৰলৈ OTP পঠোৱা হৈছে যি @mobileNumber ৰে শেষ হয়\"</string>
+    <string name="str_abha_otp_number">\"ABHA পঞ্জীভূত মোবাইল নম্বৰলৈ OTP পঠোৱা হৈছে যি @mobileNumber ৰে শেষ হয়\"</string>
+    <string name="str_otp_number_message">\"@mobileNumber ৰে শেষ হোৱা মোবাইল নম্বৰলৈ OTP পঠোৱা হৈছে।\"</string>
+
+
+</resources>
diff --git a/app/src/main/res/values-as/strings_ncd.xml b/app/src/main/res/values-as/strings_ncd.xml
new file mode 100644
index 000000000..0c58467d3
--- /dev/null
+++ b/app/src/main/res/values-as/strings_ncd.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="date">তাৰিখ</string>
+    <string name="radio_title_cbac">%1s<![CDATA[<font color="#B00020"> *</font>]]></string>
+    <string name="radio_title_cbac_ds">%1s<![CDATA[<font color="#B00020"> **</font>]]></string>
+    <string name="cbac_ask_pat">পাতক সুধক যে ৰোগীৰ এইবোৰ লক্ষণ আছে নেকি</string>
+    <string name="cbac_early_detection">ভাগ B1: আগতীয়া সনাক্তকৰণ</string>
+    <string name="cbac_early_detection_2">ভাগ B2: কেৱল মহিলা</string>
+    <string name="cbac_early_detection_3">ভাগ B3: বয়সীয়াল বিশেষ</string>
+    <string name="cbac_hint_age">আপোনাৰ বয়স কিমান?</string>
+    <string name="cbac_hint_smoke">আপুনি ধূমপান কৰে নে গুটখা বা খৈনীৰ দৰে ধূমপানবিহীন সামগ্ৰী গ্ৰহণ কৰে?</string>
+    <string name="cbac_hint_alcohol">আপুনি দৈনিক মদ খায় নেকি?</string>
+    <string name="cbac_hint_waist">কঁকালৰ মাপ (চেমি ত)</string>
+    <string name="cbac_hint_pa">আপুনি সপ্তাহত কমেও ১৫০ মিনিট শাৰীৰিক কাৰ্য্য কৰে নেকি?</string>
+    <string name="cbac_hint_fh">আপোনাৰ পৰিয়ালত (পিতৃ-মাতৃ বা ভাই-ভনীৰ যিকোনো এজন) উচ্চ ৰক্তচাপ, মধুমেহ আৰু হৃদয় ৰোগৰ ইতিহাস আছে নেকি?</string>
+
+    <string name="cbac_ask_pat_note">টোকা :</string>
+    <string name="cbac_ast1">* তলৰ \"*\" থকা যিকোনো প্ৰশ্নত \"হয়\" বাছিলে পপআপ বাৰ্তা দেখুৱাব \"MO ক পৰামৰ্শ দিয়ক আৰু থুথুৰ নমুনা সংগ্ৰহ কৰক\"</string>
+    <string name="cbac_ast2">** তলৰ \"**\" থকা যিকোনো প্ৰশ্নত \"হয়\" বাছিলে পপআপ বাৰ্তা দেখুৱাব \"MO ক পৰামৰ্শ দিয়ক বা সকলো পৰিয়ালৰ সদস্যৰ ট্ৰেচিংৰ বাবে ANM/MPW ক জনাওক\"</string>
+    <string name="cbac_select">বাছক …</string>
+    <string name="cbac_fh_tb">পৰিয়ালত কাৰোবাক বৰ্তমান TB আছে</string>
+    <string name="cbac_taking_tb_drug">আপুনি বৰ্তমান এণ্টি-TB ঔষধ গ্ৰহণ কৰিছে নেকি</string>
+    <string name="cbac_histb">TB ৰ ইতিহাস</string>
+    <string name="cbac_coughing">২ সপ্তাহতকৈ বেছি কাহ</string>
+    <string name="cbac_blsputum">থুথুত তেজ</string>
+    <string name="cbac_feverwks">২ সপ্তাহতকৈ বেছি জ্বৰ</string>
+    <string name="cbac_lsweight">ওজন হ্ৰাস</string>
+    <string name="cbac_ntswets">ৰাতি ঘাম</string>
+    <string name="cbac_recurrent_ulceration">হাতৰ তলুৱা বা ভৰিৰ তলুৱাত পুনৰাবৃত্তি ঘা</string>
+    <string name="cbac_recurrent_tingling">হাতৰ তলুৱা(বোৰ) বা ভৰিৰ তলুৱাত জ্বলন</string>
+    <string name="cbac_recurrent_cloudy">ঢলুৱা বা অস্পষ্ট দৃষ্টি</string>
+    <string name="cbac_recurrent_diffculty_reading">পঢ়াত অসুবিধা</string>
+    <string name="cbac_recurrent_pain_eyes">এক সপ্তাহতকৈ বেছি চকুত বিষ</string>
+    <string name="cbac_recurrent_redness_eyes">এক সপ্তাহতকৈ বেছি চকু ৰঙা</string>
+    <string name="cbac_recurrent_diff_hearing">শুনাত অসুবিধা</string>
+    <string name="cbac_breath">হাঁপনি</string>
+    <string name="cbac_hifits">ব Convulsion ৰ ইতিহাস</string>
+    <string name="cbac_difmouth">মুখ খোলাত অসুবিধা</string>
+    <string name="cbac_heald">মুখত ঘা/প্যাচ/বৃদ্ধি যি দুসপ্তাহত ভাল হোৱা নাই</string>
+    <string name="cbac_voice">মাতৰ সূৰত কোনো পৰিৱৰ্তন</string>
+    <string name="cbac_Any_Growth">মুখত যিকোনো বৃদ্ধি যি ২ সপ্তাহত ভাল হোৱা নাই</string>
+    <string name="cbac_Any_white">মুখত যিকোনো বগা বা ৰঙা প্যাচ যি ২ সপ্তাহত ভাল হোৱা নাই</string>
+    <string name="cbac_Pain_while_chewing">চোবোতে বিষ</string>
+    <string name="cbac_Any_hyper_pigmented">সংবেদন হেৰুওৱাৰ সৈতে ছালত হাইপাৰ পিগমেণ্টেড প্যাচ বা বৰণ সলনি</string>
+    <string name="cbac_any_thickend_skin">যিকোনো ঘন ছাল</string>
+    <string name="cbac_any_nodules_skin">ছালত যিকোনো নডিউল</string>
+    <string name="cbac_Recurrent_numbness">হাতৰ তলুৱা(বোৰ) বা ভৰিৰ তলুৱাত সুন্নতা</string>
+    <string name="cbac_Clawing_of_fingers">হাত(বোৰ) বা ভৰি(বোৰ)ত আঙুলি নখৰ দৰে</string>
+    <string name="cbac_Tingling_or_Numbness">হাত আৰু/বা ভৰিত জ্বলন বা সুন্নতা</string>
+    <string name="cbac_Inability_close_eyelid">চকুৰ পতা বন্ধ কৰিব নোৱৰা</string>
+    <string name="cbac_diff_holding_objects">আঙুলিৰে বস্তু ধৰাত অসুবিধা</string>
+    <string name="cbac_Weekness_in_feet">ভৰিত দুৰ্বলতা যিয়ে খোজ কাঢ়াত অসুবিধা কৰে</string>
+
+    <string name="cbac_lumpbrest">স্তনত গাঁঠি</string>
+    <string name="cbac_nipple">স্তনবৃন্তৰ পৰা তেজযুক্ত নিঃসৰণ</string>
+    <string name="cbac_breast">স্তনৰ আকাৰ আৰু আকৃতিৰ পৰিৱৰ্তন</string>
+    <string name="cbac_blperiods">মাহেকীয়াৰ মাজত ৰক্তস্ৰাৱ</string>
+    <string name="cbac_blmenopause">ৰজোনিবৃত্তিৰ পিছত ৰক্তস্ৰাৱ</string>
+    <string name="cbac_blintercorse">সম্ভোগৰ পিছত ৰক্তস্ৰাৱ</string>
+    <string name="cbac_fouldis">দুৰ্গন্ধযুক্ত যোনি নিঃসৰণ</string>
+
+
+    <string name="cbac_double_ast" translatable="false">**</string>
+    <string name="cbac_single_ast" translatable="false">* </string>
+    <string name="cbac_yes">হয়</string>
+    <string name="cbac_no">নহয়</string>
+
+    <string name="cbac_risk_Factors_COPD">ভাগ C: COPD ৰ বাবে ঝুঁকি কাৰক</string>
+    <string name="cbac_occupational_exposure">বৃত্তিমূলক এক্সপোজাৰ</string>
+    <string name="cbac_PHQ2">ভাগ D: PHQ2</string>
+    <string name="cbac_last_two_weeks">গত দুসপ্তাহত তলত দিয়া সমস্যাসমূহৰ দ্বাৰা আপুনি কিমানবাৰ বিচলিত হৈছে?</string>
+    <string name="cbac_little_interest">কাম কৰাত অলপ আগ্ৰহ বা আনন্দ?</string>
+    <string name="cbac_feeling_down">নিম্ন, হতাশ বা আশাহীন অনুভৱ?</string>
+
+
+    <string name="hrp_valid">HRP কেছ, অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="hrp_sug_valid"> সন্দেহযুক্ত HRP কেছ, অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_hyper">NCD সম্পৰ্কীয় (উচ্চ ৰক্তচাপ, DM), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_diab">NCD সম্পৰ্কীয় (মধুমেহ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_diabm">NCD সম্পৰ্কীয় (মধুমেহ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_tb">NCD সম্পৰ্কীয় (TB), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_oc">NCD সম্পৰ্কীয় (মুখৰ কেঞ্চাৰ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_bc">NCD সম্পৰ্কীয় (স্তন কেঞ্চাৰ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_cc">NCD সম্পৰ্কীয় (গৰ্ভাশয় কেঞ্চাৰ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_lep">NCD সম্পৰ্কীয় (কুষ্ঠ ৰোগ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_dia_lep">NCD সম্পৰ্কীয় (মধুমেহ, কুষ্ঠ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_can_thy">NCD সম্পৰ্কীয় (কেঞ্চাৰ, থাইৰয়ড), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_dia_can">NCD সম্পৰ্কীয় (কেঞ্চাৰ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_can_lep">NCD সম্পৰ্কীয় (কেঞ্চাৰ, কুষ্ঠ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_all_display">NCD সম্পৰ্কীয় (মুখ কেঞ্চাৰ, TB), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_hyper_stk_display">NCD সম্পৰ্কীয় (উচ্চ ৰক্তচাপ, ষ্ট্ৰোক), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_tb_can">NCD সম্পৰ্কীয় (TB, কেঞ্চাৰ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_hyper_only">NCD সম্পৰ্কীয় (উচ্চ ৰক্তচাপ), অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_sus_valid"> সন্দেহযুক্ত NCD কেছ, অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="hrpncd_sus_valid"> সন্দেহযুক্ত HRP আৰু NCD কেছ, অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা ১০৪ কলে কৰক।</string>
+    <string name="ncd_hyperstroke">NCD সম্পৰ্কীয় (উচ্চ ৰক্তচাপ, ষ্ট্ৰোক), অনুগ্ৰহ কৰি চিকিৎসকৰ সৈতে পৰামৰ্শ লওক বা ১০৪ কলে কৰক</string>
+    <string name="ncd_tbcancer">NCD সম্পৰ্কীয় (TB, কেঞ্চাৰ), অনুগ্ৰহ কৰি চিকিৎসকৰ সৈতে পৰামৰ্শ লওক বা ১০৪ কলে কৰক</string>
+    <string name="ncd_cansthyroid">NCD সম্পৰ্কীয় (কেঞ্চাৰ, থাইৰয়ড), অনুগ্ৰহ কৰি চিকিৎসকৰ সৈতে পৰামৰ্শ লওক বা ১০৪ কলে কৰক</string>
+    <string name="ncd_diabcancer">NCD সম্পৰ্কীয় (মধুমেহ, কেঞ্চাৰ), অনুগ্ৰহ কৰি চিকিৎসকৰ সৈতে পৰামৰ্শ লওক বা ১০৪ কলে কৰক</string>
+    <string name="ncd_mentalhealth">NCD সম্পৰ্কীয় (মানসিক স্বাস্থ্য বিকাৰ), অনুগ্ৰহ কৰি চিকিৎসকৰ সৈতে পৰামৰ্শ লওক বা ১০৪ কলে কৰক</string>
+    <string name="cbac_tbcase">সন্দেহযুক্ত TB কেছ, অনুগ্ৰহ কৰি থুথুৰ নমুনা সংগ্ৰহ কৰক আৰু ওচৰৰ TB পৰীক্ষা কেন্দ্ৰলৈ পঠাওক। সকলো পৰিয়ালৰ সদস্যৰ ট্ৰেচিংও কৰিব লাগিব।</string>
+    <string name="cbac_tb_collect_sputum">সন্দেহযুক্ত TB কেছ, অনুগ্ৰহ কৰি থুথুৰ নমুনা সংগ্ৰহ কৰক আৰু ওচৰৰ TB পৰীক্ষা কেন্দ্ৰলৈ পঠাওক।</string>
+    <string name="cbac_tv_moic_treat">চিকিৎসাৰ বাবে ৰোগীক ওচৰৰ স্বাস্থ্য কেন্দ্ৰৰ MOIC ৰ ওচৰলৈ পঠাওক</string>
+    <string name="cbac_unsteady">থিয় হ\'ব বা খোজ কাঢ়িবলৈ অস্থিৰ অনুভৱ</string>
+    <string name="cbac_pd_rm">যিকোনো শাৰীৰিক অক্ষমতা যিয়ে চলাচল সীমাবদ্ধ কৰে</string>
+    <string name="cbac_nhop">খোৱা, কাপোৰ পিন্ধা, সজোৱা, গা ধোৱা, খোজ কাঢ়া বা শৌচালয় ব্যৱহাৰ আদি দৈনন্দিন কামৰ বাবে অন্যৰ সহায়ৰ প্ৰয়োজন</string>
+    <string name="cbac_forget_names">আপোনাৰ ওচৰীয়াসকলৰ বা আপোনাৰ ঘৰৰ ঠিকনাৰ নাম পাহৰি যোৱা</string>
+
+    <string name="cbac_validation_your_age">\"অনুগ্ৰহ কৰি বয়স বাছক\"</string>
+    <string name="cbac_validation_smoke">\"অনুগ্ৰহ কৰি ধূমপান আৰু ধূমপানবিহীন সামগ্ৰী গ্ৰহণ বাছক\"</string>
+    <string name="cbac_validation_consume_alcohol">\"অনুগ্ৰহ কৰি মদ গ্ৰহণ বাছক\"</string>
+    <string name="cbac_validation_waist">\"অনুগ্ৰহ কৰি কঁকালৰ মাপ বাছক\"</string>
+    <string name="cbac_validation_physical_activities">\"অনুগ্ৰহ কৰি শাৰীৰিক কাৰ্য্য বাছক\"</string>
+    <string name="cbac_validation_heart_disease">\"অনুগ্ৰহ কৰি পৰিয়ালৰ ইতিহাস বাছক\"</string>
+
+    <string name="cbac_validation_plsst">অনুগ্ৰহ কৰি বাছক পৰিয়ালত কাৰোবাক বৰ্তমান TB আছে</string>
+    <string name="cbac_validation_plsatb">অনুগ্ৰহ কৰি বাছক আপুনি বৰ্তমান এণ্টি-TB গ্ৰহণ কৰিছে নেকি</string>
+    <string name="cbac_validation_plshtb">অনুগ্ৰহ কৰি TB ৰ ইতিহাস বাছক</string>
+    <string name="cbac_validation_plscoughh">অনুগ্ৰহ কৰি ২ সপ্তাহতকৈ বেছি কাহ বাছক</string>
+    <string name="cbac_validation_plbls">অনুগ্ৰহ কৰি থুথুত তেজ বাছক</string>
+    <string name="cbac_validation_plsfever">অনুগ্ৰহ কৰি ২ সপ্তাহতকৈ বেছি জ্বৰ বাছক</string>
+    <string name="cbac_validation_plslweight">অনুগ্ৰহ কৰি ওজন হ্ৰাস বাছক</string>
+    <string name="cbac_validation_plsnsw">অনুগ্ৰহ কৰি ৰাতি ঘাম বাছক</string>
+    <string name="cbac_validation_rul">অনুগ্ৰহ কৰি পুনৰাবৃত্তি ঘা বাছক</string>
+    <string name="cbac_validation_rtps">অনুগ্ৰহ কৰি হাতৰ তলুৱা বা ভৰিৰ তলুৱাত জ্বলন বাছক</string>
+    <string name="cbac_validation_cbv">অনুগ্ৰহ কৰি ঢলুৱা দৃষ্টি বাছক</string>
+    <string name="cbac_validation_dr">অনুগ্ৰহ কৰি পঢ়াত অসুবিধা বাছক</string>
+    <string name="cbac_validation_pie">অনুগ্ৰহ কৰি এক সপ্তাহতকৈ বেছি চকুত বিষ বাছক</string>
+    <string name="cbac_validation_rie">অনুগ্ৰহ কৰি এক সপ্তাহতকৈ বেছি চকু ৰঙা বাছক</string>
+    <string name="cbac_validation_dih">অনুগ্ৰহ কৰি শুনাত অসুবিধা বাছক</string>
+    <string name="cbac_validation_sob">অনুগ্ৰহ কৰি হাঁপনি বাছক</string>
+    <string name="cbac_validation_hif">অনুগ্ৰহ কৰি Convulsion ৰ ইতিহাস বাছক</string>
+    <string name="cbac_validation_diom">অনুগ্ৰহ কৰি মুখ খোলাত অসুবিধা বাছক</string>
+    <string name="cbac_validation_upgm">অনুগ্ৰহ কৰি মুখত ঘা/প্যাচ/বৃদ্ধি বাছক</string>
+    <string name="cbac_validation_tov">অনুগ্ৰহ কৰি মাতৰ সূৰৰ পৰিৱৰ্তন বাছক</string>
+    <string name="cbac_validation_gimh">অনুগ্ৰহ কৰি মুখত বৃদ্ধি বাছক যি ২ সপ্তাহত ভাল হোৱা নাই</string>
+    <string name="cbac_validation_wrp">অনুগ্ৰহ কৰি মুখত বগা বা ৰঙা প্যাচ বাছক যি ২ সপ্তাহত ভাল হোৱা নাই</string>
+    <string name="cbac_validation_pwh">অনুগ্ৰহ কৰি চোবোতে বিষ বাছক</string>
+    <string name="cbac_validation_hpds">অনুগ্ৰহ কৰি ছালত হাইপাৰ পিগমেণ্টেড প্যাচ বা বৰণ সলনি বাছক</string>
+    <string name="cbac_validation_ts">অনুগ্ৰহ কৰি ঘন ছাল বাছক</string>
+    <string name="cbac_validation_ns">অনুগ্ৰহ কৰি ছালত নডিউল বাছক</string>
+    <string name="cbac_validation_rnps">অনুগ্ৰহ কৰি হাতৰ তলুৱা বা ভৰিৰ তলুৱাত সুন্নতা বাছক</string>
+    <string name="cbac_validation_cfhf">অনুগ্ৰহ কৰি হাত বা ভৰিত আঙুলি নখ বাছক</string>
+    <string name="cbac_validation_tnhf">অনুগ্ৰহ কৰি হাত বা ভৰিত জ্বলন বা সুন্নতা বাছক</string>
+    <string name="cbac_validation_ice">অনুগ্ৰহ কৰি চকুৰ পতা বন্ধ কৰিব নোৱৰা বাছক</string>
+    <string name="cbac_validation_dhof">অনুগ্ৰহ কৰি আঙুলিৰে বস্তু ধৰাত অসুবিধা বাছক</string>
+    <string name="cbac_validation_wfdw">অনুগ্ৰহ কৰি ভৰিত দুৰ্বলতা বাছক যিয়ে খোজ কাঢ়াত অসুবিধা কৰে</string>
+    <string name="cbac_validation_lb">অনুগ্ৰহ কৰি স্তনত গাঁঠি বাছক</string>
+    <string name="cbac_validation_bsdfn">অনুগ্ৰহ কৰি স্তনবৃন্তৰ পৰা তেজযুক্ত নিঃসৰণ বাছক</string>
+    <string name="cbac_validation_csb">অনুগ্ৰহ কৰি স্তনৰ আকাৰৰ পৰিৱৰ্তন বাছক</string>
+    <string name="cbac_validation_bbp">অনুগ্ৰহ কৰি মাহেকীয়াৰ মাজত ৰক্তস্ৰাৱ বাছক</string>
+    <string name="cbac_validation_bam">অনুগ্ৰহ কৰি ৰজোনিবৃত্তিৰ পিছত ৰক্তস্ৰাৱ বাছক</string>
+    <string name="cbac_validation_bai">অনুগ্ৰহ কৰি সম্ভোগৰ পিছত ৰক্তস্ৰাৱ বাছক</string>
+    <string name="cbac_validation_fsvd">অনুগ্ৰহ কৰি দুৰ্গন্ধযুক্ত যোনি নিঃসৰণ বাছক</string>
+    <string name="cbac_validation_fuwsw">অনুগ্ৰহ কৰি থিয় হ\'ব বা খোজ কাঢ়িবলৈ অস্থিৰ অনুভৱ বাছক</string>
+    <string name="cbac_validation_sapd">অনুগ্ৰহ কৰি চলাচল সীমাবদ্ধ কৰা শাৰীৰিক অক্ষমতা বাছক</string>
+    <string name="cbac_validation_nhpa">অনুগ্ৰহ কৰি খোৱা, কাপোৰ পিন্ধা, সজোৱা, গা ধোৱা, খোজ কাঢ়া বা শৌচালয় আদি দৈনন্দিন কামৰ বাবে অন্যৰ সহায় বাছক</string>
+    <string name="cbac_validation_fn">অনুগ্ৰহ কৰি আপোনাৰ, ওচৰীয়াসকলৰ নাম বা আপোনাৰ ঘৰৰ ঠিকনা পাহৰি যোৱা বাছক</string>
+    <string name="cbac_validation_fu">অনুগ্ৰহ কৰি ৰান্ধনিৰ বাবে ব্যৱহৃত ইন্ধন বাছক</string>
+    <string name="cbac_validation_ox">অনুগ্ৰহ কৰি বৃত্তিমূলক এক্সপোজাৰ বাছক</string>
+    <string name="cbac_validation_li">অনুগ্ৰহ কৰি অলপ আগ্ৰহ ফিল্ড বাছক!</string>
+    <string name="cbac_validation_fd">অনুগ্ৰহ কৰি নিম্ন অনুভৱ ফিল্ড বাছক!</string>
+    <string name="cbac_Question">প্ৰশ্ন</string>
+    <string name="cbac_score">স্কোৰ</string>
+    <string name="cbac_type_of_fuel">ৰান্ধনিৰ বাবে ব্যৱহৃত ইন্ধনৰ প্ৰকাৰ</string>
+    <string name="cbac_remarks">মন্তব্য</string>
+    <string name="cbac_risk_assessment_tv">ভাগ A: ঝুঁকি মূল্যায়ন</string>
+    <string name="cbac_tv_bl_menopause">আশা সহায়কক জনাওক</string>
+    <string name="cbac_form">CBAC ফৰ্ম</string>
+    <string name="alert">সতৰ্কবাণী!</string>
+    <string name="missing_field">ফিল্ড নাই</string>
+    <string name="suspected_hrp_and_ncd_case">সন্দেহযুক্ত HRP আৰু NCD কেছ!</string>
+    <string name="ok">ঠিক আছে</string>
+    <string name="suspected_hrp_case">সন্দেহযুক্ত HRP কেছ!</string>
+    <string name="suspected_ncd_case_please_visit_nearest_hwc_or_call">সন্দেহযুক্ত NCD কেছ, অনুগ্ৰহ কৰি ওচৰৰ HWC লৈ যাওক বা কলে কৰক\n ১০৪।</string>
+    <string name="refer_to_ncd_screening_day_vhsnd_hwc_for_ncd_screening_priority">NCD স্ক্ৰীনিংৰ বাবে NCD স্ক্ৰীনিং দিৱস/VHSND/HWC ক পৰামৰ্শ দিয়ক (অগ্ৰাধিকাৰ)</string>
+    <string name="refer_to_ncd_screening_day_vhsnd_hwc_for_ncd_screening_less_priority">NCD স্ক্ৰীনিংৰ বাবে NCD স্ক্ৰীনিং দিৱস/VHSND/HWC ক পৰামৰ্শ দিয়ক (কম অগ্ৰাধিকাৰ)</string>
+    <string name="send_the_patient_to_moic_of_nearest_health_center_for_treatment">চিকিৎসাৰ বাবে ৰোগীক ওচৰৰ স্বাস্থ্য কেন্দ্ৰৰ MOIC ৰ ওচৰলৈ পঠাওক</string>
+    <string name="refer_to_mo_and_collect_the_sputum_sample">MO ক পৰামৰ্শ দিয়ক আৰু থুথুৰ নমুনা সংগ্ৰহ কৰক</string>
+    <string name="inform_asha_facilitator">আশা সহায়কক জনাওক।</string>
+    <string name="total_score_wihout_semi_colon">\"মুঠ স্কোৰ \"</string>
+    <string name="total_score">\"মুঠ স্কোৰ : \"</string>
+    <string name="refer_to_mo_or_inform_anm_mpw_to_tracing_of_all_family_members">MO ক পৰামৰ্শ দিয়ক বা সকলো পৰিয়ালৰ সদস্যৰ ট্ৰেচিংৰ বাবে ANM/MPW ক জনাওক</string>
+    <string name="cbac">CBAC</string>
+    <string name="tb_screening">TB স্ক্ৰীনিং</string>
+    <string name="tb_screening_submitted">TB স্ক্ৰীনিং জমা হ\'ল</string>
+    <string name="screen">স্ক্ৰীন</string>
+    <string name="tb_suspected_sputum_test">সন্দেহযুক্ত TB থুথু পৰীক্ষা</string>
+    <string name="tb_tracking_submitted">TB ট্ৰেকিং জমা হ\'ল</string>
+    <string name="track">ট্ৰেক</string>
+    <string name="filled_on">\"পূৰণ কৰা \"</string>
+    <string name="save">সংৰক্ষণ কৰক</string>
+    <string name="tb_suspected_alert">MO ক পৰামৰ্শ দিয়ক আৰু থুথুৰ নমুনা সংগ্ৰহ কৰক</string>
+    <string name="tb_suspected_alert_positive">MO ক পৰামৰ্শ দিয়ক</string>
+    <string name="tb_suspected_family_alert">MO ক পৰামৰ্শ দিয়ক বা সকলো পৰিয়ালৰ সদস্যৰ ট্ৰেচিংৰ বাবে ANM/MPW ক জনাওক</string>
+    <string name="is_sputum_sample_collected">থুথুৰ নমুনা সংগ্ৰহ কৰা হ\'ল নেকি?</string>
+    <string name="sputum_sample_submitted_at">থুথুৰ নমুনা জমা কৰা হৈছে</string>
+    <string name="nikshay_id">নিক্ষয় ID</string>
+    <string name="sputum_test_result">থুথু পৰীক্ষা ফল</string>
+    <string name="referred_to_facility">সুবিধালৈ পৰামৰ্শ দিয়া হৈছে</string>
+    <string name="facility_referral_follow_ups">সুবিধা পৰামৰ্শ অনুসৰণ</string>
+    <string-array name="tb_submitted_yet">
+        <item>DMC</item>
+        <item>SC</item>
+        <item>PHC</item>
+    </string-array>
+    <string-array name="tb_test_result">
+        <item>পজিটিভ</item>
+        <item>নেগেটিভ</item>
+    </string-array>
+    <string-array name="cbac_age">
+        <item>0-29 বছৰ</item>
+        <item>30-39 বছৰ</item>
+        <item>40-49 বছৰ</item>
+        <item>50-59 বছৰ</item>
+        <item>≥ 60 বছৰ</item>
+    </string-array>
+    <string-array name="cbac_smoke">
+        <item>কেতিয়াও নহয়</item>
+        <item>আগতে কেতিয়াবা গ্ৰহণ কৰিছিল</item>
+        <item>দৈনিক</item>
+    </string-array>
+    <string-array name="cbac_alcohol">
+        <item>নহয়</item>
+        <item>হয়</item>
+    </string-array>
+    <string-array name="cbac_waist_mes_female">
+        <item>80 চেমি বা কম</item>
+        <item>81-90 চেমি</item>
+        <item>90 চেমিতকৈ বেছি</item>
+    </string-array>
+    <string-array name="cbac_waist_mes_male">
+        <item>90 চেমি বা কম</item>
+        <item>91-100 চেমি</item>
+        <item>100 চেমিতকৈ বেছি</item>
+    </string-array>
+    <string-array name="cbac_pa">
+        <item>সপ্তাহত কমেও ১৫০ মিনিট</item>
+        <item>সপ্তাহত ১৫০ মিনিটতকৈ কম</item>
+    </string-array>
+    <string-array name="cbac_fh">
+        <item>নহয়</item>
+        <item>হয়</item>
+    </string-array>
+
+    <string-array name="cbac_type_Cooking_fuel">
+        <item>কাঠ</item>
+        <item>শস্য অৱশেষ</item>
+        <item>গোবৰ গেছ</item>
+        <item>কয়লা</item>
+        <item>কেৰাচিন তেল</item>
+        <item>LPG</item>
+    </string-array>
+    <string-array name="cbac_type_occupational_exposure">
+        <item>শস্য অৱশেষ পোৰা</item>
+        <item>আৱৰ্জনা – পাত পোৰা</item>
+        <item>ধূৱাঁ, গেছ আৰু ধূলি এক্সপোজাৰ থকা উদ্যোগত কাম যেনে ইটা ভাটা, কাঁচ কাৰখানা আদি</item>
+    </string-array>
+    <string-array name="cbac_li">
+        <item>একেবাৰে নহয়</item>
+        <item>কেইবাদিন</item>
+        <item>আধাতকৈ বেছি দিন</item>
+        <item>প্ৰায় প্ৰতিদিন</item>
+    </string-array>
+    <string-array name="cbac_fd">
+        <item>একেবাৰে নহয়</item>
+        <item>কেইবাদিন</item>
+        <item>আধাতকৈ বেছি দিন</item>
+        <item>প্ৰায় প্ৰতিদিন</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 000000000..94c7ee9ca
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,1852 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">AAM</string>
+    <string name="all_td_doses_message"> सभी TD खुराक दी जा चुकी हैं</string>
+    <string name="PREF_NAME" translatable="false">cho-pref-1</string>
+    <string name="PREF_D2D_API_KEY" translatable="false">JWT-Token_A</string>
+    <string name="PREF_primary_API_KEY" translatable="false">JWT-Token_B</string>
+    <string name="PREF_primary_JWT_API_KEY" translatable="false">JWT-Token_N</string>
+    <string name="USER_ROLES" translatable="false">User_Roles</string>
+    <string name="WORK_LOCATION_ID" translatable="false">Working_Location_Id</string>
+    <string name="SECOND_USER_ROLES" translatable="false">Second_User_Roles</string>
+    <string name="SWITCH_USER_ROLES" translatable="false">Switch_User_Roles</string>
+    <string name="title_activity_login">लॉगिन एक्टिविटी</string>
+    <string name="prompt_email">ईमेल</string>
+    <string name="prompt_password">पासवर्ड</string>
+    <string name="action_sign_in">पंजीयन</string>
+    <string name="action_sign_in_short">दाखिल करना</string>
+    <string name="welcome">स्वागत है!</string>
+    <string name="invalid_username">यह मान्य उपयोगकर्ता नाम नहीं है</string>
+    <string name="invalid_password">पासवर्ड 5 से अधिक अक्षर का होना चाहिए</string>
+    <string name="PREF_current_saved_language" translatable="false">Locale.Helper.Selected.Language</string>
+    <string name="til_username_hint_text">उपयोगकर्ता नाम</string>
+    <string name="login_failed">लॉगिन विफल</string>
+    <string name="hello_blank_fragment">हैलो ब्लैंक फ्रैगमेंट</string>
+    <string name="next">अगला</string>
+    <string name="til_password_hint_text">पासवर्ड</string>
+    <string name="login">लॉग इन करें</string>
+    <string name="app_title">एचडब्ल्यूसी मोबाइल ऐप</string>
+    <string name="hwc">एचडब्ल्यूसी</string>
+    <string name="facility">सुविधा केंद्र</string>
+    <string name="outreach">आउटरीच</string>
+    <string name="system_issue">सिस्टम संबंधी समस्या</string>
+    <string name="manual_issue">मैनुअल समस्या</string>
+    <string name="wellness_activity">स्वास्थ्य गतिविधि</string>
+    <string name="training">प्रशिक्षण</string>
+    <string name="health_mela">स्वास्थ्य मेला</string>
+    <string name="vhsnc_vhsnd">VHSNC/VHSND</string>
+    <string name="add_patient">रोगी जोड़ें\n</string>
+    <string name="query_hint_patient_search">खोजने के लिए यहां टैप करें</string>
+    <string name="title_patient_list">पंजीकृत मरीज़</string>
+    <string name="login_settings">लॉगिन_सेटिंग्स</string>
+    <string name="last_sync_time">last_sync_time</string>
+    <string name="last_patient_sync_time">last_patient_sync_time</string>
+    <string name="last_benflow_sync_time">last_benflow_sync_time</string>
+    <string name="last_cbac_sync_time">last_benflow_sync_time</string>
+    <string name="personal_details">व्यक्तिगत विवरण</string>
+    <string name="first_name">पहला नाम</string>
+    <string name="village_hint">गांव <font color="#FF0000">*</font></string>
+    <string name="last_name_surname">उपनाम/उपनाम </string>
+    <string name="contact_no">संपर्क नंबर</string>
+    <string name="gender">लिंग <font color="#FF0000">*</font></string>
+    <string name="age">आयु</string>
+    <string name="select_subcategory">उपश्रेणी का चयन करें</string>
+    <string-array name="subcategories_array">
+        <item>सामान्य संचारी रोगों का प्रबंधन</item>
+        <item>तीव्र साधारण बीमारियों और मामूली बीमारियों के लिए आउट पेशेंट केयर</item>
+    </string-array>
+    <string name="select_category">श्रेणी चुनना</string>
+    <string-array name="categories_array">
+        <item>सामान्य OPD केयर</item>
+    </string-array>
+    <string name="select_reason_for_visit">यात्रा का कारण चुनें</string>
+    <string-array name="reason_for_visit_array">
+        <item>नई मुख्य शिकायत(एं)</item>
+        <item>फॉलो अप</item>
+    </string-array>
+    <string name="select_unit_of_duration">अवधि की इकाई का चयन करें</string>
+    <string name="visit_details">यात्रा विवरण</string>
+    <string name="duration">अवधि</string>
+    <string name="duration2">अवधि:</string>
+    <string name="dispensed">वितरित: </string>
+    <string-array name="unit_of_duration_array">
+        <item>घंटा</item>
+    </string-array>
+    <string name="abha_number">आभा संख्या</string>
+    <string name="name">नाम</string>
+    <string name="phone_no">फोन नंबर</string>
+    <string name="registration">पंजीकरण</string>
+    <string name="advance_search">आधुनिक खोज</string>
+    <string name="household_search">खोज</string>
+    <string name="do_you_want_to_go_back">क्या आप वापस जाना चाहते हैं?</string>
+    <string name="offline">ऑफलाइन</string>
+    <string name="something_went_wrong_nunable_to_connect_to_server_ntry_again_later">कुछ गलत हो गया !\nसर्वर से कनेक्ट नहीं हो पा रहा !\nबाद में पुनः प्रयास करें!</string>
+    <string name="try_again">पुनः प्रयास करें!</string>
+    <string name="go_to_home">होम पेज पर जाएं</string>
+    <string name="tv_ben_name_ph">लाभार्थी का नाम</string>
+    <string name="otp_resent">ओटीपी पुनः भेजा गया</string>
+    <string name="medication_form">फॉर्म</string>
+    <string name="medicine_text">दवा</string>
+    <string name="dosage_text">मात्रा बनाने की विधि</string>
+    <string name="submit_btn_text">जमा करना</string>
+    <string name="frequency_text">आवृत्ति</string>
+    <string name="vitals_text">नब्ज</string>
+    <string name="location_details">स्थान विवरण</string>
+    <string name="personal_info">व्यक्तिगत जानकारी</string>
+    <string name="revisit_details_text">विवरणों पर दोबारा नज़र डालें</string>
+    <string name="case_record_text">केस रिकॉर्ड</string>
+    <string name="lab_record_text">प्रयोगशाला रिकॉर्ड</string>
+    <string name="pharmacist_record_text">फार्मासिस्ट रिकॉर्ड</string>
+    <string name="anc">एएनसी</string>
+    <string name="pnc">पीएनसी</string>
+    <string name="immunization">टीकाकरण</string>
+    <string name="weight_kg_text">वजन (किलोग्राम)</string>
+    <string name="temperature_f_text">तापमान (फ़ारेनहाइट)</string>
+    <string name="bp_mmhg_diastolic_text">रक्तचाप (mmHg) डायस्टोलिक</string>
+    <string name="bp_mmhg_systolic_text">रक्तचाप (mmHg) सिस्टोलिक</string>
+    <string name="submit_to_doctor_text">डॉक्टर को प्रस्तुत करें</string>
+    <string name="prescription_text">दवा पर्ची</string>
+    <string name="investigation">जाँच पड़ताल</string>
+    <string name="examination_text">परीक्षा</string>
+    <string name="other_info">अन्य सूचना</string>
+    <string name="info">जानकारी</string>
+    <string name="want_care_context">डेटा सफलतापूर्वक सहेज लिया गया है। क्या आप केयर कॉन्टेक्स्ट को लिंक D76करना चाहते हैं?</string>
+    <string name="cancel_care_context">क्या आप केयर कॉन्टेक्स्ट को रद्द करना चाहते हैं?</string>
+    <string name="abha_care_context">ABHA केयर कॉन्टेक्स्ट मैपिंग</string>
+    <string name="generate_abha_otp">ओटीपी जनरेट करें</string>
+    <string name="created_date">निर्माण दिनांक</string>
+    <string name="otp_sent">आपके पंजीकृत मोबाइल नंबर पर OTP भेजा गया है</string>
+    <string name="add_text">जोड़ना</string>
+    <string name="stock_warning_text">स्टॉक उपलब्ध नहीं है</string>
+    <string name="view_prescription_text">दवा पर्चा को देखें</string>
+    <string name="submit">जमा करना</string>
+    <string name="categories_heading">वर्ग</string>
+    <string name="categories_subcategory">उपश्रेणी</string>
+    <string name="categories_reasonFV">भ्रमण का कारण</string>
+    <string name="DurationInUnit">इकाई में अवधि</string>
+    <string name="cancel">रद्द करना</string>
+    <string name="previous">पहले का</string>
+    <string name="anthropometry">एन्थ्रोपोमेट्री</string>
+    <string name="benificiary_list">लाभार्थियों की सूची</string>
+    <string name="title_activity_visit_details">भ्रमण विवरण</string>
+    <string name="esanjeevni">ई-संजीवनी</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="first_fragment_label">पहला अंश</string>
+    <string name="second_fragment_label">दूसरा अंश</string>
+    <string name="title_activity_abha_id">आभाआईडीएक्टिविटी</string>
+    <string name="aadhar_disclaimer_consent_disclaimer">ABHA नंबर बनाने के लिए सहमति</string>
+    <string name="aadhar_disclaimer_consent_text">मैं इसके द्वारा घोषणा करता/करती हूं कि मैं UIDAI द्वारा जारी अपना आधार नंबर और जनसांख्यिकीय जानकारी राष्ट्रीय स्वास्थ्य प्राधिकरण (NHA) के साथ केवल ABHA नंबर निर्माण के उद्देश्य से स्वेच्छा से साझा कर रहा/रही हूं। मैं समझता/समझती हूं कि मेरा ABHA नंबर ABDM द्वारा समय-समय पर अधिसूचित उद्देश्यों के लिए स्वास्थ्य सेवा प्रावधान सहित उपयोग और साझा किया जा सकता है। \n\nFurther,I am aware that my personal identifiable information (Name, Address, Age, Date of Birth, Gender and Photograph) may be made available to the entities working in the NationalDigital Health Ecosystem (NDHE)which inter alia includes stakeholders and entities such as healthcare professionals (e.g. doctors), facilities (e.g. hospitals, laboratories) and data fiduciaries (e.g. health programmers), which are registered with or linked to the Ayushman Bharat Digital Mission (ABDM), and various processes there under. I authorize NHA to use myAadhaar number for performing Aadhaar based authentication with UIDAI as per the provisions of the Aadhaar (Targeted Delivery of Financial and other Subsidies, Benefits and Services) Act, 2016 for the aforesaid purpose.I understand that UIDAI will share my e-KYC details, or response of “Yes” with NHA upon successful authentication. I have been duly informed about the option of using other IDs apart from Aadhaar; however,I consciously choose to use Aadhaar number for the purpose of availing benefits across the NDHE.I am aware that my personal identifiable information excluding Aadhaar number can be used and shared for purposes as mentioned above.I reserve the right to revoke the given consent at any point of time as per provisions of Aadhar Act and Regulations.</string>
+    <string name="generate_abha_id">ABHA नंबर बनाएं</string>
+    <string name="aadhar_consent_text">मैं इसके द्वारा पुष्टि करता/करती हूं कि मैंने व्यक्ति को ABHA नंबर निर्माण के लिए उसके आधार नंबर का उपयोग करते हुए नीचे दी गई सहमति प्रक्रिया समझाई है</string>
+    <string name="title_activity_nav">नेव एक्टिविटी</string>
+    <string name="navigation_drawer_open">नेविगेशन ड्रॉअर खोलें</string>
+    <string name="navigation_drawer_close">नेविगेशन ड्रॉअर बंद करें</string>
+    <string name="nav_header_title">Android Studio</string>
+    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_desc">नेविगेशन हेडर</string>
+    <string name="action_settings">सेटिंग्स</string>
+    <string name="menu_home">मुख्य पृष्ठ</string>
+    <string name="menu_gallery">गैलरी</string>
+    <string name="menu_slideshow">स्लाइड शो</string>
+    <string name="error_while_logging_in">लॉग इन करते समय त्रुटि हुई!!</string>
+    <string name="invalid_username_entered">अमान्य उपयोगकर्ता नाम!!</string>
+    <string name="confirm_go_back">क्या आप वापस जाना चाहते हैं?</string>
+    <string name="downloading_abha_card">आभा कार्ड डाउनलोड हो रहा है</string>
+    <string name="downloading">डाउनलोड हो रहा है</string>
+    <string name="downloading_percentage">डाउनलोड हो रहा है %d%</string>
+    <string name="download_failed_retry">डाउनलोड विफल रहा, कृपया पुनः प्रयास करें</string>
+    <string name="otp_was_resent">ओटीपी दोबारा भेजा गया।</string>
+    <string name="please_confirm_to_logout">कृपया लॉगआउट की पुष्टि करें।</string>
+    <string name="logout">लॉग आउट</string>
+    <string name="select_yes">हाँ</string>
+    <string name="select_no">नहीं</string>
+    <string name="history_text">इतिहास</string>
+    <string name="previous_comorbidity_conditions">पूर्व सह-रुग्णता स्थितियाँ</string>
+    <string name="time_period_ago">कुछ समय पहले</string>
+    <string name="fever">बुखार</string>
+    <string name="_3_days">3 दिन</string>
+    <string name="_1_month_ago">1 महीने पहले</string>
+    <string name="close">बंद करना</string>
+    <string name="illness">बीमारी</string>
+    <string name="previous_alcohol_history">शराब के सेवन का पिछला इतिहास</string>
+    <string name="previous_allergic_history">एलर्जी का पूर्व इतिहास</string>
+    <string name="previous_illness">पिछली बीमारी</string>
+    <string name="previous_medication_history">पहले की दवाइयों का इतिहास</string>
+    <string name="previous_tobacco_history">तंबाकू का पूर्व इतिहास</string>
+    <string name="associated_ailments">संबंधित बीमारियाँ</string>
+    <string name="select_associated_ailments">संबंधित बीमारियों का चयन करें</string>
+    <string name="enter_duration">अवधि दर्ज करें  <font color="#FF0000">*</font></string>
+    <string name="enter_inspection">निरीक्षण</string>
+    <string name="duration_unit">अवधि इकाई</string>
+    <string name="select_duration_unit">अवधि इकाई का चयन करें</string>
+    <string name="f_h_of_member">सदस्य का एफ/एच</string>
+    <string name="select_f_h_of_member">सदस्य के परिवार/परिवार का चयन करें</string>
+    <string name="inactive_for_future_visit">भविष्य में आने के लिए निष्क्रिय</string>
+    <string name="add">जोड़ना</string>
+    <string name="reset">रीसेट करें</string>
+    <string name="delete">मिटाना</string>
+    <string name="alcohol_use_status">शराब के सेवन की स्थिति</string>
+    <string name="select_alcohol_use_status">शराब के सेवन की स्थिति चुनें</string>
+    <string name="allergy_name">एलर्जी का नाम</string>
+    <string name="enter_allergy_name">एलर्जी का नाम दर्ज करें</string>
+    <string name="type_of_allergic_reaction">एलर्जी प्रतिक्रिया का प्रकार</string>
+    <string name="select_type_of_allergic_reaction">एलर्जी प्रतिक्रिया का प्रकार चुनें</string>
+    <string name="genetic_disorder">आनुवंशिक विकार</string>
+    <string name="enter_genetic_disorder">आनुवंशिक विकार में प्रवेश करें</string>
+    <string name="select_illness">बीमारी का चयन करें</string>
+    <string name="select_time_period_ago">कुछ समय पहले का समय चुनें</string>
+    <string name="current_medication">वर्तमान दवा</string>
+    <string name="enter_medication">दवा दर्ज करें</string>
+    <string name="h_o_surgery">सर्जरी का इतिहास</string>
+    <string name="select_h_o_surgery">सर्जरी का इतिहास चुनें</string>
+    <string name="tobacco_use_status">तंबाकू सेवन की स्थिति</string>
+    <string name="select_tobacco_use_status">तंबाकू सेवन की स्थिति चुनें</string>
+    <string name="past_history">अतीत का इतिहास</string>
+    <string name="previous_history">पिछला इतिहास</string>
+    <string name="past_illness">पिछली बीमारी</string>
+    <string name="past_h_o_surgery">पहले सर्जरी का इतिहास रहा है</string>
+    <string name="covid_vaccination_status">कोविड टीकाकरण की स्थिति</string>
+    <string name="age_group">आयु वर्ग</string>
+    <string name="vaccination_status">टीकाकरण की स्थिति</string>
+    <string name="select_vaccination_status">टीकाकरण की स्थिति चुनें</string>
+    <string name="vaccination_type">टीकाकरण का प्रकार</string>
+    <string name="select_vaccination_type">टीकाकरण का प्रकार चुनें</string>
+    <string name="dose_taken">ली गई खुराक</string>
+    <string name="select_dose_taken">ली गई खुराक का चयन करें</string>
+    <string name="medication_history">दवाओं का इतिहास</string>
+    <string name="personal_history_habit_risk_factor">व्यक्तिगत इतिहास (आदत/जोखिम कारक)</string>
+    <string name="personal_tobacco_history">व्यक्तिगत तंबाकू सेवन का इतिहास</string>
+    <string name="personal_alcohol_history">व्यक्तिगत शराब का इतिहास</string>
+    <string name="personal_alergy_history">व्यक्तिगत एलर्जी का इतिहास</string>
+    <string name="choose_abha_gen_mode">आभा जन मोड चुनें</string>
+    <string name="abha_gen_mode">आभा जन मोड</string>
+    <string name="state">राज्य</string>
+    <string name="choose_state">राज्य चुनें</string>
+    <string name="district_town_city">जिला/कस्बा/नगर</string>
+    <string name="choose_district">जिला चुनें</string>
+    <string name="taluk_tehsil">तालुक/तहसील</string>
+    <string name="choose_taluk">तालुक चुनें</string>
+    <string name="street_panchayat_village">गली/पंचायत/गाँव</string>
+    <string name="choose_panchayat">पंचायत चुनें</string>
+    <string name="select_sub_category">उपश्रेणी</string>
+    <string name="select_chief_complaint">मुख्य शिकायतें</string>
+    <string name="select_chief_complaint_without_astrict">मुख्य शिकायतें</string>
+    <string name="enter_your_description">विवरण दर्ज करें</string>
+    <string name="select_file">फ़ाइल का चयन करें</string>
+    <string name="upload_file">फ़ाइल अपलोड करें</string>
+    <string name="category"> </string>
+    <string name="sub_category"> </string>
+    <string name="select_and_upload_file">फ़ाइल अपलोड करें</string>
+    <string name="selected_file">चयनित फ़ाइल</string>
+    <string name="chief_complaint"> </string>
+    <string name="unit_of_duration"> </string>
+    <string name="description">विवरण</string>
+    <string name="enter_other_associated_ailments">अन्य संबंधित बीमारियों को दर्ज करें</string>
+    <string name="select_allergy_status">एलर्जी की स्थिति चुनें</string>
+    <string name="allergy_type">एलर्जी का प्रकार</string>
+    <string name="select_allergy_type">एलर्जी का प्रकार चुनें</string>
+    <string name="enter_other_type_of_allergic_reaction">अन्य प्रकार की एलर्जी प्रतिक्रिया दर्ज करें</string>
+    <string name="allergy_status">एलर्जी की स्थिति</string>
+    <string name="enter_weight">वज़न दर्ज करें</string>
+    <string name="height_cm">ऊंचाई (सेमी)</string>
+    <string name="bmi">बीएमआई</string>
+    <string name="waist_circumference_cm">कमर की परिधि (सेमी)</string>
+    <string name="temperature_f">तापमान (फ़ारेनहाइट)</string>
+    <string name="pulse_rate_min">नाड़ी की दर (बीपीएम)</string>
+    <string name="spo2">एसपीओ2(%)</string>
+    <string name="respiratory_per_min">श्वसन दर (प्रति मिनट)</string>
+    <string name="rbs_mg_dl">आरबीएस परिणाम (मिलीग्राम/डेसीलीटर)</string>
+    <string name="previous_allergy_history">एलर्जी का पूर्व इतिहास</string>
+    <string name="outpatient_care">बाह्य रोगी देखभाल</string>
+    <string name="file_type">Upload File(Size limit :5 MB)\nSupported File Formats \n(.msg,.pdf,.png,.jpeg,.doc,.docx,.xlsx,.xls,.csv,.txt)</string>
+    <string name="lonic_url">http://loinc.org</string>
+    <string name="vital_signs_panel">Vital signs panel</string>
+    <string name="vital_signs_panel_code_text">Vital signs Panel</string>
+    <string name="observation_category_url">http://terminology.hl7.org/CodeSystem/observation-category</string>
+    <string name="vital_signs">जीवन के संकेत</string>
+    <string name="vital_signs_code">vital-signs</string>
+    <string name="height_cm_text">ऊंचाई_सेमी</string>
+    <string name="weight_kg">वजन_किलोग्राम</string>
+    <string name="bmi_text">बीएमआई</string>
+    <string name="waistcircumference_cm">कमर की परिधि (सेमी में)</string>
+    <string name="temperature">तापमान</string>
+    <string name="pulserate">नब्ज़ दर</string>
+    <string name="spo2_text">sPO2</string>
+    <string name="systolicbp_1streading">सिस्टोलिकबीपी_पहलीरीडिंग</string>
+    <string name="diastolicbp_1streading">डायस्टोलिक बीपी_पहली रीडिंग</string>
+    <string name="respiratoryrate">श्वसन दर</string>
+    <string name="rbstestresult">rbsTestResult</string>
+    <string name="vitals_information_is_saved">महत्वपूर्ण जानकारी सुरक्षित रखी जाती है।</string>
+    <string name="overweight_txt">*Overweight</string>
+    <string name="obese_txt">*Obese</string>
+    <string name="normal_txt">*Normal</string>
+    <string name="higher_center">उच्च केंद्र</string>
+    <string name="reason_for_referral">प्रेषण का कारण</string>
+    <string name="linkage_with_other_health_services">अन्य स्वास्थ्य सेवाओं के साथ संपर्क</string>
+    <string name="date_of_birth">जन्मतिथि<font color="#FF0000">*</font></string>
+    <string name="age_in_unit">यूनिट में आयु <font color="#FF0000">*</font></string>
+    <string name="phone_number">फ़ोन नंबर</string>
+    <string name="registration_date">पंजीकरण की तारीख</string>
+    <string name="marital_status">वैवाहिक स्थिति <font color="#FF0000">*</font></string>
+    <string name="spouse_name">जीवनसाथी का नाम <font color="#FF0000">*</font></string>
+    <string name="wife_name">पत्नी का नाम <font color="#FF0000">*</font></string>
+    <string name="husband_s_name">पति का नाम <font color="#FF0000">*</font></string>
+    <string name="wife_s_name">पत्नी का नाम <font color="#FF0000">*</font></string>
+    <string name="age_at_marriage">विवाह के समय आयु <font color="#FF0000">*</font></string>
+    <string name="revisit_date">पुनः भ्रमण की तिथि</string>
+    <string name="saved">सफलतापूर्वक सहेजा गया (</string>
+    <string name="error_in_saving_refer_and_revisit_information">प्रेषण और पुनः भ्रमण की जानकारी सहेजने में त्रुटि</string>
+    <string name="error">System.Xml.XmlElement</string>
+    <string name="toast_msg_duration_unit">कृपया अवधि इकाई का चयन करें</string>
+    <string name="toast_msg_duration">कृपया अवधि दर्ज करें</string>
+    <string name="toast_msg_chief">कृपया मुख्य शिकायत का चयन करें</string>
+    <string name="toast_upload_file">कृपया चयनित फ़ाइल अपलोड करें</string>
+    <string name="toast_sub_cat_select">कृपया उपश्रेणी चुनें</string>
+    <string name="toast_cat_select">कृपया श्रेणी चुनें</string>
+    <string name="toast_file_uploaded">आपने फ़ाइल अपलोड कर दी है</string>
+    <string name="toast_file_size_max">कृपया 5MB से कम आकार की फ़ाइल चुनें</string>
+    <string name="nav_item_1_text">नाम : <b>%s</b></string>
+    <string name="nav_item_2_text">उपयोगकर्ता नाम : <b>%s</b></string>
+    <string name="nav_item_3_text">उपयोगकर्ता आईडी : <b>%d</b></string>
+    <string name="nav_item_5_text">सुविधा का नाम : <b>%s</b></string>
+    <string name="nav_item_6_text">कर्मचारी आईडी : <b>%s</b></string>
+    <string name="nav_item_7_text">सुविधा आईडी : <b>%s</b></string>
+    <string name="nav_item_8_text">स्थान प्रकार : <b>%s</b></string>
+    <string name="nav_item_4_text">मोबाइल नंबर : <b>%s</b></string>
+    <string name="individual_s_consent_for_creation_of_abha_number">ABHA नंबर बनाने के लिए व्यक्ति की सहमति।</string>
+    <string name="exit">बाहर निकलना</string>
+    <string name="timer">घड़ी</string>
+    <string name="yes">हाँ</string>
+    <string name="no">नहीं</string>
+    <string name="fp_tv">आगे बढ़ने के लिए कृपया अपनी उंगली को फिंगरप्रिंट सेंसर पर रखें।</string>
+    <string name="fp_try_again">उंगली पहचानी नहीं गई। पुनः प्रयास करें!</string>
+    <string name="fingerprint_captured">फिंगरप्रिंट कैप्चर हो गया!</string>
+    <string name="parent_gurdian_name">माता-पिता/अभिभावक का नाम</string>
+    <string name="religion">धर्म</string>
+    <string name="community">समुदाय</string>
+    <string name="select_test_name">जांच का नाम</string>
+    <string name="diagnosis">निदान</string>
+    <string name="provisional_diagnosis">Provisional/Final Diagnosis <font color="#FF0000">*</font></string>
+    <string name="dosage">मात्रा बनाने की विधि</string>
+    <string name="dose">Dose: </string>
+    <string name="frequency">आवृत्ति</string>
+    <string name="frequency2">आवृत्ति:</string>
+    <string name="batch_no">दल संख्या:</string>
+    <string name="instructions">निर्देश</string>
+    <string name="unit">इकाई</string>
+    <string name="route">मार्ग</string>
+    <string name="route2">मार्ग</string>
+    <string name="external_investigation">बाह्य जांच</string>
+    <string name="save_successful">सफलतापूर्वक सहेजा गया\n</string>
+    <string name="success">सफलता</string>
+    <string name="something_wend_wong">कुछ गलत हो गया</string>
+    <string name="loading_form">फॉर्म लोड हो रहा है</string>
+    <string name="loading">लोड हो रहा है कृपया प्रतीक्षा करें....</string>
+    <string name="personal_information">रोगी पंजीकरण</string>
+    <string name="location_information">स्थान की जानकारी</string>
+    <string name="other_information">अन्य सूचना</string>
+    <string name="invalid_phone_number">एक वैध फ़ोन नंबर दर्ज करें</string>
+    <string name="enter_a_valid_phone_number">एक वैध फ़ोन नंबर दर्ज करें</string>
+    <string name="enter_your_first_name">अपना पहला नाम दर्ज करें</string>
+    <string name="enter_last_name">अपना अंतिम नाम दर्ज करें</string>
+    <string name="fill_dob">अपनी जन्मतिथि भरें</string>
+    <string name="enter_your_age">अपनी उम्र दर्ज करें</string>
+    <string name="select_age_in_unit">यूनिट में आयु का चयन करें</string>
+    <string name="select_marital_status">वैवाहिक स्थिति का चयन करें</string>
+    <string name="enter_spouse_name">जीवनसाथी का नाम दर्ज करें</string>
+    <string name="enter_husband_name">पति का नाम दर्ज करें</string>
+    <string name="enter_wife_name">पत्नी का नाम दर्ज करें</string>
+    <string name="enter_age_at_marriage">विवाह के समय आयु दर्ज करें</string>
+    <string name="select_gender">लिंग का चयन करें</string>
+    <string name="select_village">गाँव चुनें</string>
+    <string name="enter_father_s_name_error">पिता का वैध नाम दर्ज करें</string>
+    <string name="are_you_sure">क्या आपको यकीन है?</string>
+    <string name="cancel_confirmation_message">क्या आप रद्द करना चाहते हैं? जो डेटा सेव नहीं किया गया है, वह खो जाएगा।</string>
+    <string name="patient_registered_successfully_title">रोगी का पंजीकरण सफलतापूर्वक हो गया है।</string>
+    <string name="patient_edited_successfully_title">मरीज का विवरण सफलतापूर्वक संपादित हो गया।</string>
+    <string name="network_error">नेटवर्क त्रुटि!!</string>
+    <string name="linked_to_beneficiary">लाभार्थी से जुड़ा हुआ</string>
+    <string name="duration_tv">अवधि</string>
+    <string name="url_uat_esanjeevani">https://uat.esanjeevani.in/#/external-provider-signin/</string>
+    <string name="something_went_wrong">कुछ गलत हो गया !</string>
+    <string name="beneficiary_abha_number">लाभार्थी का ABHA नंबर।</string>
+    <string name="no_records_found">कोई रिकॉर्ड नहीं मिला!!</string>
+    <string name="patients_cnt_display">मरीजों</string>
+    <string name="subtractSign">-</string>
+    <string name="addSign">+</string>
+    <string name="_1">1</string>
+    <string name="form_medicine_dosage">प्रारूप / दवा / मात्रा</string>
+    <string name="councilling_advice">परामर्श/सलाह</string>
+    <string name="refer">संदर्भ देना</string>
+    <string name="instruction">Nirdesh</string>
+    <string name="Unit">इकाई</string>
+    <string name="Frequency">आवृत्ति</string>
+    <string name="Prescription">दवा पर्ची</string>
+    <string name="nurseDataNotSaved">इस रिकॉर्ड के लिए नर्स का डेटा सहेजा नहीं गया है।</string>
+    <string name="dataSavedCaseRecord">केस रिकॉर्ड डेटा सहेजा गया</string>
+    <string name="pendingForLabtech">प्रयोगशाला परिणाम प्रतीक्षित</string>
+    <string name="flowCompleted">प्रवाह पूर्ण हुआ</string>
+    <string name="unsyncedNurseData">नर्सों का डेटा सिंक्रोनाइज़ नहीं हुआ है। कृपया सिंक्रोनाइज़ करके पुनः प्रयास करें।</string>
+    <string name="diagnosisCannotBeEmpty">कृपया अनंतिम मान दर्ज करें</string>
+    <string name="note_ben_reg">टिप्पणी!</string>
+    <string name="please_search_for_beneficiary">पंजीकरण से पहले लाभार्थी की खोज अवश्य करें।</string>
+    <string name="no_patient_found">कोई मेल खाने वाला मरीज नहीं मिला। कृपया नीचे दिए गए विकल्पों में से एक चुनें।</string>
+    <string name="chief_complaint2">मुख्य शिकायत सूची</string>
+    <string name="beneficiary_name">लाभार्थी का नाम:</string>
+    <string name="abha_no">आभा क्रमांक:</string>
+    <string name="ben_id">लाभार्थी आईडी</string>
+    <string name="ben_age">आयु:</string>
+    <string name="quantity_prescribed">निर्धारित मात्रा:</string>
+    <string name="quantity_in_hand">उपलब्ध मात्रा:</string>
+    <string name="quantity_dispensed">वितरित मात्रा:</string>
+    <string name="special_instructions">विशेष निर्देश:</string>
+    <string name="dispensed_quantity">वितरित मात्रा:</string>
+    <string name="expiry_date">समाप्ति तिथि:</string>
+    <string name="ben_phone_no">फोन नंबर:</string>
+    <string name="ben_gender">लिंग:</string>
+    <string name="abha">आभा</string>
+    <string name="view_batch">बैच देखें</string>
+    <string name="ok_button">ठीक है</string>
+    <string name="change_role">भूमिका बदलें</string>
+    <string name="remember_me">मुझे याद करो</string>
+    <string name="other_cphc_services">अन्य सीपीएचसी सेवाएं</string>
+    <string name="reason_for_visit">भ्रमण का कारण</string>
+    <string name="ben_card_name">नाम:</string>
+    <string name="beneficiary_id">लाभार्थी आईडी:</string>
+    <string name="beneficiary_id_format">लाभार्थी आईडी: %s</string>
+    <string name="beneficiary_id_label">लाभार्थी आईडी:</string>
+    <string name="master_longitude">मुख्य देशांतर</string>
+    <string name="get_location">स्थान प्राप्त करें</string>
+    <string name="master_latitude">मुख्य अक्षांश</string>
+    <string name="get_gps_location">जीपीएस लोकेशन प्राप्त करें</string>
+    <string name="retry">पुन: प्रयास करें</string>
+    <string name="please_select_your_language">कृपया अपनी भाषा चुनें</string>
+    <string name="please_select_your_language_kannada">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+
+    <string name="english_lang">English</string>
+    <string name="kannada_lang">ಕನ್ನಡ</string>
+    <string name="hindi_lang">हिंदी</string>
+    <string name="assamese">অসমীয়া</string>
+    <string name="registrar_role">रजिस्ट्रार</string>
+    <string name="nurse_role">नर्स</string>
+    <string name="doctor_role">चिकित्सक</string>
+    <string name="pharmacist_role">फार्मेसिस्ट</string>
+    <string name="lab_technician_role">प्रयोगशाला तकनीशियन</string>
+    <string name="patient_successfully_registered">रोगी का पंजीकरण सफलतापूर्वक हो गया है।</string>
+    <string name="tap_to_take_photo">फोटो लेने के लिए टैप करें</string>
+    <string name="photo">तस्वीर</string>
+    <string name="permission_to_access_the_camera_denied">कैमरा एक्सेस करने की अनुमति नहीं दी गई!</string>
+    <string name="User_Login_Type">उपयोगकर्ता_लॉगिन_प्रकार</string>
+    <string name="pwr_by_text" translatable="false">Powered by\n <b>Piramal Foundation</b></string>
+    <string name="opd_count">ओपीडी संख्या:</string>
+    <string name="female_opd">महिला:</string>
+    <string name="others_opd">अन्य:</string>
+    <string name="ncd_count">एनसीडी की संख्या:</string>
+    <string name="anc_count">एएनसी\nगणना:</string>
+    <string name="pnc_count">पीएनसी की संख्या</string>
+    <string name="family_count">परिवार\nसंख्या:</string>
+    <string name="immunization_tv">टीकाकरण\nसंख्या:</string>
+    <string name="count_imm">गिनती करना:</string>
+    <string name="hbnc_count">एचबीएनसी गणना</string>
+    <string name="hbyc_count">एचबीवाईसी\nगणना:</string>
+    <string name="select_menu">चुनना</string>
+    <string name="male_opd">पुरुष:</string>
+    <string name="consultant_name">सलाहकार का नाम:</string>
+    <string name="visit_code">विज़िट कोड:</string>
+    <string name="prescription_id">प्रिस्क्रिप्शन आईडी:</string>
+    <string name="form_label">फॉर्म</string>
+    <string name="prescribed_label">निर्धारित:</string>
+    <string name="prescribed_label_qt">निर्धारित मात्रा:</string>
+    <string name="patient_registered_successfully">रोगी का पंजीकरण सफलतापूर्वक हो गया है।</string>
+    <string name="father_s_name">Father\'s Name <font color="#FF0000">*</font></string>
+    <string name="exit_application">एप्लिकेशन से बाहर निकलें</string>
+    <string name="do_you_want_to_exit_application">क्या आप एप्लिकेशन से बाहर निकलना चाहते हैं?</string>
+    <string name="patient_cnt_display">" मरीज़"</string>
+    <string name="alert_popup">चेतावनी</string>
+    <string name="phone_no_not_found">फ़ोन नंबर नहीं मिला।</string>
+    <string name="esanjeevaniusername_local_saved" translatable="false">esanjeevaniUsername-local-saved</string>
+    <string name="esanjeevanipassword_local_saved" translatable="false">esanjeevaniPassword-local-saved</string>
+    <string name="new_chief_complaint_str">नई मुख्य शिकायत</string>
+    <string name="follow_up_str">पालन ​​करें</string>
+    <string name="title_activity_user_master_loc">उपयोगकर्ता मास्टरलोक गतिविधि</string>
+    <string name="report">प्रतिवेदन</string>
+    <string name="component_name">घटक का नाम</string>
+    <string name="result">परिणाम</string>
+    <string name="meas_unit">मापन इकाई</string>
+    <string name="remarks">टिप्पणी</string>
+    <string name="select_test_name_date">जांच का नाम (दिनांक)</string>
+    <string name="result_meas_unit">परिणाम -मापन इकाई</string>
+    <string name="date_time">तिथि और समय</string>
+    <string name="Use_Previous_data">पुरानी मुख्य शिकायतों और महत्वपूर्ण डेटा जमा करें</string>
+    <string name="save_template">टेम्पलेट सहेजें</string>
+    <string name="enter_temp_name">टेम्पलेट का नाम दर्ज करें</string>
+    <string name="select_temp_to_fill">भरने के लिए टेम्पलेट का नाम चुनें</string>
+    <string name="template_save">Template Name saved </string>
+    <string name="form_name">फ़ार्म का नाम</string>
+    <string name="Sync_state">सिंक स्थिति</string>
+    <string name="patient_form">पंजीकरण</string>
+    <string name="sync">सिंक</string>
+    <string name="pharmacy_form">फार्मेसी फॉर्म</string>
+    <string name="lab_form">प्रयोगशाला तकनीशियन प्रपत्र</string>
+    <string name="doctor_form">केस रिकॉर्ड</string>
+    <string name="nurse_form">भ्रमण और जीवन संकेत</string>
+    <string name="Yes_state">हाँ</string>
+    <string name="No_state">नहीं</string>
+    <string name="duration_prescription">अवधि</string>
+    <string name="form_input_empty_error">आवश्यक फ़ील्ड खाली नहीं हो सकता!</string>
+    <string name="form_input_upper_case_error">केवल बड़े अक्षरों में लिखे गए अक्षर ही स्वीकार्य हैं!</string>
+    <string name="form_input_missing_entry_error">फ़ील्ड में %1d अंक होने चाहिए।</string>
+    <string name="form_input_alphabet_space_only_error">केवल अक्षर और खाली स्थान ही अनुमत हैं!</string>
+    <string name="form_input_alphabet_special_only_error">केवल अक्षर और विशेष वर्ण ही अनुमत हैं!</string>
+    <string name="form_input_min_limit_error">%1s, %2d से बड़ा या बराबर होना चाहिए</string>
+    <string name="form_input_alph_numeric_space_only_error">केवल अक्षर और अंक ही स्वीकार्य हैं!</string>
+    <string name="form_input__no_alpha_space_error">अक्षर या रिक्त स्थान की अनुमति नहीं है!</string>
+    <string name="form_input_digit_only_error">केवल अंक ही मान्य हैं!</string>
+    <string name="form_input_min_limit_error_decimal">%1s, %2.1f से बड़ा या बराबर होना चाहिए।</string>
+    <string name="form_input_max_limit_error">%1s, %2d से कम या उसके बराबर होना चाहिए</string>
+    <string name="form_input_max_limit_error_decimal">%1s, %2.1f से कम या उसके बराबर होना चाहिए।</string>
+    <string name="form_input_error_invalid_mobile">अमान्य मोबाइल नंबर!</string>
+    <string name="form_input_error_invalid_rch">अमान्य आरसीएच आईडी!</string>
+    <string name="form_input_error_invalid_mcp">अमान्य एमसीपी नंबर!</string>
+    <string name="form_input_error_invalid_aadhar">आधार नंबर अमान्य है!</string>
+    <string name="view">देखना</string>
+    <string name="back">पीछे</string>
+    <string name="something_wend_wong_contact_testing">कुछ गड़बड़ हो गई! संपर्क परीक्षण!</string>
+    <string name="iv_sync_state_tv">सिंक स्टेट</string>
+    <string name="high_risk">भारी जोखिम</string>
+    <string name="tv_required_text_asterisk">*</string>
+    <string name="btn_submit">जमा करना</string>
+    <string name="edit">संपादन करना</string>
+    <string name="radio_title_ds">%s<span> **</span></string>
+    <string name="radio_title">%s<span> *</span></string>
+    <string name="anc_visit_number">एएनसी विज़िट %1d</string>
+    <string name="anc_visits">एएनसी दौरे</string>
+    <string name="pnc_visit_number">दिन %1d पर पीएनसी का दौरा</string>
+    <string name="pnc_visits">पीएनसी भ्रमण</string>
+    <string name="view_visits">भ्रमण देखें</string>
+    <string name="icon_title_pmr">गर्भवती महिलाओं का पंजीकरण</string>
+    <string name="title_register_pregnancy">गर्भवती महिला का पंजीकरण</string>
+    <string name="title_view_pregnancy_registration">गर्भावस्था पंजीकरण देखें</string>
+    <string name="pwr_eligibility_error">Pregnancy Registration form is not available </string>
+    <!--  Post Natal Care  -->
+    <string name="pnc_period">पीएनसी अवधि</string>
+    <string name="pnc_visit_date">पीएनसी भ्रमण की तिथि</string>
+    <string name="pnc_ifa_tabs_given">दी गई आईएफए टैबलेट की संख्या</string>
+    <string name="pnc_contraception_method">गर्भनिरोध की विधि</string>
+    <string name="pnc_any_contraception_method">गर्भनिरोध की कोई भी विधि</string>
+    <string name="pnc_other_ppc_method">Other Contraception Method</string>
+    <string name="pnc_mother_danger_sign">माँ के लिए खतरे का संकेत</string>
+    <string name="pnc_other_danger_sign">अन्य खतरे के संकेत</string>
+    <string name="pnc_referral_facility">रेफरल सुविधा</string>
+    <string name="pnc_mother_death">माँ की मृत्यु</string>
+    <string name="pnc_death_date">मृत्यु तिथि</string>
+    <string name="pnc_death_cause">Cause of Maternal Death</string>
+    <string name="pnc_other_death_cause">मृत्यु के अन्य कारण</string>
+    <string name="pnc_death_place">मृत्यु स्थल</string>
+    <string name="pnc_remarks">टिप्पणी</string>
+    <string name="pnc_calcium_supplementation">कैल्शियम अनुपूरण</string>
+    <string name="pnc_maternal_symptoms">मातृ लक्षण</string>
+    <string name="pnc_other_maternal_symptoms">अन्य मातृ लक्षण</string>
+    <string name="pnc_pallor">पीलापन (एनीमिया की जांच)</string>
+    <string name="pnc_vaginal_bleeding">योनि से रक्तस्राव</string>
+    <string name="pnc_date_of_sterilization">नसबंदी की तिथि</string>
+    <string name="pnc_any_danger_sign">क्या कोई खतरे के संकेत हैं? क्या कोई उच्च जोखिम की पहचान की गई है?</string>
+    <string name="other_place_of_death">मृत्यु का अन्य स्थान</string>
+    <string name="pnc_ifa_max_error">आईएफए टैबलेट की संख्या 400 से अधिक नहीं हो सकती।</string>
+    <string name="pnc_calcium_max_error">कैल्शियम सप्लीमेंट की मात्रा 400 से अधिक नहीं होनी चाहिए।</string>
+    <string name="pnc_referral_alert_multiple_symptoms">रेफरल आवश्यक: मां में 2 या अधिक लक्षण पाए गए</string>
+    <string name="pnc_referral_alert_severe_pallor">रेफरल आवश्यक: गंभीर पीलापन पाया गया</string>
+    <string name="pnc_referral_alert_vaginal_bleeding">रेफरल आवश्यक: अत्यधिक रक्तस्राव या दुर्गंधयुक्त स्राव का पता चला</string>
+    <string name="tracking_form_filled_successfully">ट्रैकिंग फॉर्म सफलतापूर्वक भर गया</string>
+    <string name="form_save_failed">फॉर्म सेव करने में विफल। कृपया पुनः प्रयास करें।</string>
+    <string name="tracking_date">भ्रमण की तिथि</string>
+    <string name="visit_history_title">भ्रमण इतिहास</string>
+    <string name="no_visits_found">कोई भ्रमण नहीं मिला</string>
+    <string name="visit_count_icon">भ्रमण संख्या आइकन</string>
+    <string name="error_loading_visits">भ्रमण लोड करने में त्रुटि। कृपया पुनः प्रयास करें।</string>
+    <string name="long_to_string">%d</string>
+    <string-array name="pnc_period_array">
+        <item>1st Day</item>
+        <item>3rd Day</item>
+        <item>7th Day</item>
+        <item>14th Day</item>
+        <item>21st Day</item>
+        <item>28th Day</item>
+        <item>42nd Day</item>
+    </string-array>
+    <string-array name="pnc_confirmation_array">
+        <item>Yes</item>
+        <item>No</item>
+    </string-array>
+    <string-array name="pnc_contraception_method_array">
+        <item>POST PARTUM IUCD (PPIUCD) WITHIN 48 HRS OF DELIVERY</item>
+        <item>CONDOM</item>
+        <item>MALE STERILIZATION</item>
+        <item>FEMALE STERILIZATION</item>
+        <item>POST PARTUM STERILIZATION (PPS)</item>
+        <item>Minilap</item>
+        <item>None</item>
+        <item>OTHER</item>
+    </string-array>
+    <string-array name="pnc_mother_danger_sign_array">
+        <item>PPH</item>
+        <item>FEVER</item>
+        <item>SEPSIS</item>
+        <item>SEVERE ABDOMINAL PAIN</item>
+        <item>SEVERE HEADACHE OR BLURRED VISION</item>
+        <item>DIFFICULT BREATHING</item>
+        <item>Any Other</item>
+    </string-array>
+    <string-array name="pnc_referral_facility_array">
+        <item>Primary Health Centre</item>
+        <item>Community Health Centre</item>
+        <item>District Hospital</item>
+        <item>Other Private Hospital</item>
+        <item>Any Other (Specify)</item>
+    </string-array>
+    <string-array name="pnc_death_cause_array">
+        <item>Eclampsia</item>
+        <item>Hemorrhage (PPH)</item>
+        <item>Anaemia</item>
+        <item>High fever</item>
+        <item>Sepsis</item>
+        <item>Accident</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="pnc_death_place_array">
+        <item>Home</item>
+        <item>Subcenter</item>
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>District Hospital</item>
+        <item>Medical College Hospital</item>
+        <item>Private Hospital</item>
+        <item>In Transit</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="pnc_maternal_symptoms_array">
+        <item>Excessive bleeding</item>
+        <item>Foul-smelling discharge</item>
+        <item>Fever</item>
+        <item>Severe abdominal pain</item>
+        <item>Breast pain</item>
+        <item>Painful urination</item>
+        <item>Severe headache</item>
+        <item>Dizziness</item>
+        <item>Difficulty breathing</item>
+        <item>Swelling</item>
+        <item>Wound pain</item>
+        <item>Mood changes</item>
+        <item>None</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="pnc_pallor_array">
+        <item>None</item>
+        <item>Mild</item>
+        <item>Moderate</item>
+        <item>Severe</item>
+    </string-array>
+    <string-array name="pnc_vaginal_bleeding_array">
+        <item>Normal</item>
+        <item>Heavy bleeding</item>
+        <item>Foul-smelling discharge</item>
+        <item>Scanty</item>
+        <item>Stopped</item>
+    </string-array>
+    <string-array name="sterilization_methods_array">
+        <item>MALE STERILIZATION</item>
+        <item>FEMALE STERILIZATION</item>
+        <item>POST PARTUM STERILIZATION (PPS)</item>
+        <item>Minilap</item>
+    </string-array>
+    <string-array name="female_sterilization_methods_array">
+        <item>FEMALE STERILIZATION</item>
+        <item>POST PARTUM STERILIZATION (PPS)</item>
+        <item>Minilap</item>
+    </string-array>
+    <string-array name="visit_months">
+        <item>Jan</item>
+        <item>Feb</item>
+        <item>Mar</item>
+        <item>Apr</item>
+        <item>May</item>
+        <item>Jun</item>
+        <item>Jul</item>
+        <item>Aug</item>
+        <item>Sep</item>
+        <item>Oct</item>
+        <item>Nov</item>
+        <item>Dec</item>
+    </string-array>
+    <string-array name="method_of_contraception">
+        <item>Self</item>
+        <item>ANTRA Injection</item>
+        <item>Copper T (IUCD)</item>
+        <item>Condom</item>
+        <item>Mala N</item>
+        <item>Chaya</item>
+        <item>ECP</item>
+        <item>Male Sterilization</item>
+        <item>Female Sterilization</item>
+        <item>MiniLap</item>
+        <item>Any Other Method</item>
+    </string-array>
+    <string-array name="antra_doses">
+        <item>1st Dose</item>
+        <item>2nd Dose</item>
+        <item>3rd Dose</item>
+        <item>4th Dose</item>
+        <item>5th Dose</item>
+        <item>6th Dose</item>
+        <item>7th Dose</item>
+        <item>8th Dose</item>
+        <item>9th Dose</item>
+        <item>10th Dose</item>
+    </string-array>
+    <string name="template_null">टेम्पलेट का नाम दर्ज करें</string>
+    <string name="templte_exists">टेम्पलेट का नाम पहले से मौजूद है</string>
+    <string name="delete_temp">टेम्पलेट हटाएं</string>
+    <string name="temp_name">टेम्पलेट नाम</string>
+    <string name="villageName">गाँव का नाम:</string>
+    <string name="required">आवश्यक</string>
+    <string name="version">संस्करण 6.0.0</string>
+    <string name="str_duration">अवधि:</string>
+    <string name="edd_date">ईडीडी तिथि</string>
+    <string name="update_btn">अद्यतन</string>
+    <!-- EC Tracking Form -->
+    <string name="ec_tracking_title">लक्ष्य दंपत्ति ट्रैकिंग</string>
+    <string name="status_of_woman_eligible_couple_name">योग्य दंपत्ति</string>
+    <string name="status_of_woman_eligible_couple_code">EC</string>
+    <string name="status_of_woman_pregnant_woman_name">गर्भवती महिला</string>
+    <string name="status_of_woman_pregnant_woman_code">PW</string>
+    <string name="status_of_woman_postnatal_name">प्रसवोत्तर</string>
+    <string name="status_of_woman_postnatal_code">PN</string>
+    <string name="status_of_woman_elderly_name">वृद्ध</string>
+    <string name="status_of_woman_elderly_code">EL</string>
+    <string name="status_of_woman_adolescent_name">किशोरी</string>
+    <string name="status_of_woman_adolescent_code">AD</string>
+    <string name="status_of_woman_permanent_sterilization_name">स्थायी नसबंदी</string>
+    <string name="status_of_woman_permanent_sterilization_code">ST</string>
+    <string name="status_of_woman_not_applicable_name">लागू नहीं</string>
+    <string name="status_of_woman_not_applicable_code">NA</string>
+    <string name="is_pregnancy_test_done">क्या गर्भावस्था परीक्षण किया गया है?</string>
+    <string name="pregnancy_test_result">गर्भावस्था परीक्षण का परिणाम</string>
+    <string name="is_woman_pregnant">क्या महिला गर्भवती है?</string>
+    <string name="using_family_planning">क्या आप परिवार नियोजन की किसी विधि का उपयोग कर रहे हैं / क्या आप ऐसी किसी विधि का उपयोग करना चाहते हैं?</string>
+    <string name="method_of_contraception_label">गर्भनिरोध की विधि</string>
+    <string name="any_other_method">कोई अन्य विधि</string>
+    <string name="antra_dose">अंतरा खुराक</string>
+    <string name="antra_injection_date">ANTRA इंजेक्शन की तिथि</string>
+    <string name="antra_due_date">अगले इंजेक्शन की नियत तिथि</string>
+    <string name="date_of_sterilization">नसबंदी की तिथि</string>
+    <string name="incentive_alert_title">प्रोत्साहन संबंधी जानकारी</string>
+    <string name="antra_incentive_alert">प्रोत्साहन राशि प्राप्त करने के लिए कृपया एमसीए कार्ड की फोटो अपलोड करें।</string>
+    <string name="sterilization_incentive_alert">प्रोत्साहन राशि प्राप्त करने के लिए कृपया डिस्चार्ज समरी की फोटो अपलोड करें।</string>
+    <string name="one_visit_per_month_error">महीने में केवल एक बार आने की अनुमति है।</string>
+    <string name="visit_date_before_registration_error">यात्रा की तिथि ईसी पंजीकरण तिथि से पहले नहीं हो सकती।</string>
+    <string name="lmp_backdated_limit_error">अंतिम मासिक धर्म अवधि (एलएमपी) की तारीख को अधिकतम 6 महीने तक ही पीछे किया जा सकता है।</string>
+    <string name="sterilization_backdated_limit_error">नसबंदी की तिथि को अधिकतम 2 महीने तक ही पीछे किया जा सकता है।</string>
+    <string name="antra_backdated_limit_error">ANTRA इंजेक्शन की तिथि को अधिकतम 2 महीने तक ही पीछे किया जा सकता है।</string>
+    <string name="antra_dose_restart_alert">अंतराल 120 दिनों से अधिक है। पहली खुराक से पुनः शुरू करना होगा।</string>
+    <string name="not_available">उपलब्ध नहीं है</string>
+    <!-- RMNCHA+ Dashboard Module Strings -->
+    <string name="all_beneficiaries">सभी लाभार्थी</string>
+    <string name="eligible_couple_list">लक्ष्य दंपति सूची</string>
+    <string name="maternal_health">मातृ स्वास्थ्य</string>
+    <string name="child_care">बाल देखभाल</string>
+    <string name="disease_control">रोग नियंत्रण</string>
+    <string name="communicable_diseases">संक्रामक रोग</string>
+    <string name="routine_immunization">नियमित टीकाकरण</string>
+    <string name="high_risk_assessment">उच्च जोखिम मूल्यांकन</string>
+    <string name="general_opd_care_list">सामान्य ओपीडी देखभाल सूची</string>
+    <string name="death_reports">मृत्यु की रिपोर्ट</string>
+    <string name="village_level_forms">ग्राम स्तरीय प्रपत्र</string>
+    <string name="cd_icon_grid_icon">आइकन ग्रिड आइटम</string>
+    <!-- Maternal Health Sub-modules -->
+    <string name="pregnant_women_registration">गर्भवती महिलाओं का पंजीकरण</string>
+    <string name="delivery_outcome">प्रसव परिणाम</string>
+    <string name="pnc_mother_list">पीएनसी माताओं की सूची</string>
+    <string name="infant_registration">शिशु पंजीकरण</string>
+    <string name="child_registration">बाल पंजीकरण</string>
+    <string name="abortion_list">गर्भपात सूची</string>
+    <string name="e_pmsma_list">ई-पीएमएसएमए सूची</string>
+    <!-- Child Care Sub-modules -->
+    <string name="infant_list">Infant Registration List</string>
+    <string name="child_list">बच्चों की सूची</string>
+    <string name="adolescent_list">किशोर सूची</string>
+    <string name="children_under_5_years">5 वर्ष से कम आयु के बच्चे</string>
+    <!-- Eligible Couple Sub-modules -->
+    <string name="eligible_couple_registration">लक्ष्य दंपत्ति पंजीकरण</string>
+    <string name="eligible_couple_tracking">लक्ष्य दंपत्ति ट्रैकिंग</string>
+    <!-- Eligible Couple List Strings -->
+    <string name="husband_name">Husband Name </string>
+    <string name="lmp_date">एलएमपी तिथि</string>
+    <string name="missed_period">मासिक धर्म छूट गया</string>
+    <string name="under_review">समीक्षा के अंतर्गत</string>
+    <string name="register">पंजीकरण करवाना</string>
+    <string name="no_eligible_couples_found">कोई पात्र दंपत्ति नहीं मिली</string>
+    <string name="no_registered_couples_found">कोई पंजीकृत जोड़े नहीं मिले</string>
+    <string name="call">बुलाना</string>
+    <string name="no_data">N/A</string>
+    <string name="search">खोज</string>
+    <string name="status">स्थिति</string>
+    <string name="age_ben">आयु</string>
+    <string name="tv_mob_no_ph">मोबाइल नंबर</string>
+    <string name="tv_rch_id">आरसीएच आईडी</string>
+    <!-- Pregnant Women Registration Strings -->
+    <string name="no_pregnant_women_found">कोई गर्भवती महिला नहीं मिली</string>
+    <!-- ANC Visits Strings -->
+    <string name="weeks_of_pregnancy">गर्भावस्था के सप्ताह</string>
+    <string name="edd">ईडीडी</string>
+    <string name="last_visit_date">अंतिम भ्रमण तिथि</string>
+    <string name="add_anc_visit">एएनसी भ्रमण तिथि</string>
+    <string name="add_pmsma">पीएमएसएमए जोड़ें</string>
+    <string name="no_anc_eligible_women_found">कोई भी एएनसी योग्य महिला नहीं मिली</string>
+    <!-- Delivery Outcome Strings -->
+    <string name="no_delivered_women_found">प्रसव कराने वाली कोई महिला नहीं मिली</string>
+    <string name="do_mother_condition">प्रसव के तुरंत बाद माँ की स्थिति</string>
+    <string name="do_maternal_complications">मातृ संबंधी जटिलताएँ</string>
+    <string name="do_mother_currently_admitted">क्या माता वर्तमान में अस्पताल में भर्ती हैं?</string>
+    <string name="do_discharge_date">छुट्टी की तिथि</string>
+    <string name="do_discharge_time">छुट्टी का समय</string>
+    <string name="do_delivery_outcome">प्रसव के परिणाम</string>
+    <string name="do_live_birth">जीवित जन्म</string>
+    <string name="do_still_birth">मृत जन्म</string>
+    <string name="do_next">अगला</string>
+    <string name="do_inform_district_nodal_officer">जिला नोडल अधिकारी को सूचित करें</string>
+    <string name="do_alert_intensive_pnc">इस मां के लिए गहन प्रसवोत्तर देखभाल निगरानी की सिफारिश की जाती है।</string>
+    <string name="do_hysterectomy_note">गर्भाशय निकालने की सर्जरी के लिए परिवार नियोजन की स्थिति और पात्र दंपत्तियों की जानकारी अपडेट की जाएगी।</string>
+    <string name="do_maternal_death_audit">मातृ मृत्यु लेखापरीक्षा प्रपत्र खोला जाएगा।</string>
+    <string name="do_discharge_date_before_delivery">प्रसव की तारीख से पहले डिस्चार्ज की तारीख नहीं हो सकती।</string>
+    <string name="do_vitals_and_prescription">महत्वपूर्ण जानकारी एवं पर्ची</string>
+    <string-array name="do_mother_condition_array">
+        <item>Healthy / Stable</item>
+        <item>Complication (specify)</item>
+        <item>Critical / ICU admission</item>
+        <item>Maternal Death</item>
+    </string-array>
+    <string-array name="do_maternal_complications_array">
+        <item>Post-Partum Hemorrhage (PPH)</item>
+        <item>Retained placenta</item>
+        <item>Perineal tear (1st/2nd degree)</item>
+        <item>Perineal tear (3rd/4th degree)</item>
+        <item>Uterine rupture</item>
+        <item>Sepsis/ Infection</item>
+        <item>Pre-eclampsia/Eclampsia</item>
+        <item>Blood transfusion required</item>
+        <item>Hysterectomy performed</item>
+        <item>Anesthesia complication</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="do_mother_admitted_array">
+        <item>Yes (Still in hospital)</item>
+        <item>No (Discharged)</item>
+    </string-array>
+    <string name="do_woman_name">महिला का नाम</string>
+    <string name="do_woman_age">आयु</string>
+    <string name="do_case_id">मामले आईडी:</string>
+    <string name="do_view_anc_history">एएनसी का इतिहास देखें</string>
+    <string name="do_delivery_date">प्रसव की तारीख</string>
+    <string name="do_delivery_time">प्रसव का समय</string>
+    <string name="do_gestational_age_at_delivery">प्रसव के समय गर्भकालीन आयु</string>
+    <string name="do_place_of_delivery">प्रसव का स्थान</string>
+    <string name="do_private_hospital_name">यदि निजी अस्पताल है, तो नाम निर्दिष्ट करें</string>
+    <string name="do_delivery_conducted_by">प्रसव कराया गया</string>
+    <string name="do_mode_of_delivery">प्रसव का तरीका</string>
+    <string name="do_indication_for_lscs">एलएससीएस/आपातकालीन एलएससीएस/सहायता प्राप्त एलएससीएस के लिए संकेत</string>
+    <string name="do_indication_for_lscs_other">अन्य (निर्दिष्ट करे)</string>
+    <string name="do_error_future_date">भविष्य की तिथि नहीं हो सकती</string>
+    <string name="do_error_date_range">तिथि 1% और 2% के बीच होनी चाहिए।</string>
+    <string name="do_alert_post_term_delivery">प्रसवोत्तर प्रसव</string>
+    <string name="do_alert_preterm_delivery">समयपूर्व प्रसव</string>
+    <string name="do_alert_home_delivery">Home delivery occurred. Provide counselling on risks. Ensure immediate PNC visit within 24 hours.</string>
+    <string name="do_alert_on_the_way">प्रसव के 24 घंटे के भीतर तुरंत पीएनसी घर भ्रमण आवश्यक है</string>
+    <string name="do_alert_unskilled_delivery">अकुशल प्रसव सहायक। उच्च जोखिम वाली प्रसवोत्तर देखभाल की आवश्यकता है।</string>
+    <string name="do_alert_extremely_preterm">अत्यधिक समय से पहले जन्मा (&lt;28 सप्ताह)</string>
+    <string name="do_alert_very_preterm">बहुत समयपूर्व जन्म (28-32 सप्ताह)</string>
+    <string name="do_alert_moderate_preterm">मध्यम से देर से समय से पहले जन्म (32-37 सप्ताह)</string>
+    <string name="do_alert_term">अवधि (37-42 सप्ताह)</string>
+    <string name="do_alert_post_term">प्रसवोत्तर (&gt;42 सप्ताह)</string>
+    <string name="do_error_indication_required">कृपया कम से कम एक संकेत चुनें</string>
+    <string name="do_error_indication_other_required">कृपया संकेत स्पष्ट करें</string>
+    <string-array name="do_place_of_delivery_array">
+        <item>Sub-Centre</item>
+        <item>Primary Health Centre (PHC)</item>
+        <item>Community Health Centre (CHC)</item>
+        <item>District Hospital (DH)</item>
+        <item>Medical College Hospital</item>
+        <item>Referral/Tertiary Hospital</item>
+        <item>Private Hospital</item>
+        <item>Home delivery</item>
+        <item>On the way to facility</item>
+    </string-array>
+    <string-array name="do_delivery_conducted_by_array">
+        <item>Doctor (MBBS/Specialist)</item>
+        <item>Nurse/ANM</item>
+        <item>CHO</item>
+        <item>Skilled Birth Attendant (SBA)</item>
+        <item>Dai/TBA (Traditional Birth Attendant)</item>
+        <item>Family member</item>
+        <item>Self/Unassisted</item>
+    </string-array>
+    <string-array name="do_mode_of_delivery_array">
+        <item>Normal Vaginal Delivery (NVD)</item>
+        <item>Vacuum/ Forceps Assisted</item>
+        <item>Lower Segment Cesarean Section (LSCS)</item>
+        <item>Emergency LSCS</item>
+        <item>Vaginal Birth After Cesarean (VBAC)</item>
+    </string-array>
+    <string-array name="do_indication_for_lscs_array">
+        <item>Fetal distress</item>
+        <item>Cephalopelvic disproportion (CPD)</item>
+        <item>Previous LSCS</item>
+        <item>Malpresentation (Breech/Transverse)</item>
+        <item>Prolonged/Obstructed labor</item>
+        <item>Antepartum hemorrhage (APH)</item>
+        <item>Pre-eclampsia/Eclampsia</item>
+        <item>Cord prolapse</item>
+        <item>Failed induction</item>
+        <item>Multiple pregnancies</item>
+        <item>Maternal request</item>
+        <item>Other (specify)</item>
+    </string-array>
+    <!-- PNC Mother List Strings -->
+    <string name="delivery_date">प्रसव की तारीख</string>
+    <string name="days_since_delivery">प्रसव के बाद से दिन</string>
+    <string name="no_pnc_mothers_found">कोई प्रसवोत्तर देखभाल करने वाली माताएँ नहीं मिलीं</string>
+    <string name="no_e_pmsma_women_found">कोई ई-पीएमएसएमए महिला नहीं मिली</string>
+    <!-- Infant Registration Strings -->
+    <string name="infant_reg_list">शिशु पंजीकरण सूची</string>
+    <string name="mother_name">मां का नाम</string>
+    <string name="no_infants_found">कोई शिशु नहीं मिला</string>
+    <!-- Child Registration Strings -->
+    <string name="child_reg_list">Child Registration List</string>
+    <string name="no_children_found">कोई बच्चा नहीं मिला</string>
+    <!-- Abortion List Strings -->
+    <string name="abortion_date">गर्भपात की तिथि</string>
+    <string name="no_abortion_records_found">गर्भपात से संबंधित कोई रिकॉर्ड नहीं मिला</string>
+    <!-- e-PMSMA List Strings -->
+    <string name="no_pmsma_women_found">कोई पीएमएसएमए महिला नहीं मिली</string>
+    <!-- Adolescent List Strings -->
+    <string name="no_adolescents_found">कोई किशोर नहीं मिला</string>
+    <!-- Children under 5 Years List Strings -->
+    <string name="no_children_under_5_found">5 वर्ष से कम आयु के कोई बच्चे नहीं मिले</string>
+    <string name="check_sam">एसएएम की जाँच करें</string>
+    <string name="ors">ओआरएस</string>
+    <string name="ifa">यदि एक</string>
+    <string name="add_visit">भ्रमण जोड़े</string>
+    <string name="view_visit">भ्रमण देखे</string>
+    <string name="visit_history">भ्रमण इतिहास</string>
+    <string name="no_of_children">बच्चों की संख्या</string>
+    <string name="select_mariital_status">वैवाहिक स्थिति का चयन करें</string>
+    <string name="select_status_of_woman">महिला की स्थिति का चयन करें</string>
+    <string name="duplicate_face_detected">डुप्लिकेट चेहरा पाया गया</string>
+    <string name="duplicate_face_message">सिस्टम में एक मिलता-जुलता चेहरा मिला है। क्या आप मौजूदा रिकॉर्ड का उपयोग करना चाहते हैं या नया पंजीकरण कराना चाहते हैं?</string>
+    <string name="use_existing">मौजूदा का उपयोग करें</string>
+    <string name="continue_new">नया जारी रखें</string>
+    <!-- Status of Woman -->
+    <string name="status_of_woman">Status of Woman <font color="#FF0000">*</font></string>
+    <string name="does_beneficiary_have_abha">क्या लाभार्थी के पास ABHA आईडी है?</string>
+    <string name="abha_id_number">ABHA आईडी नंबर (14 अंक)</string>
+    <string name="abha_enrollment_alert">कृपया लाभार्थी को ABHA ID के पंजीकरण के लिए परामर्श दें</string>
+    <string name="patient_details_edited_successfully">मरीज का विवरण सफलतापूर्वक संपादित हो गया।</string>
+    <string name="invalid_abha_format">ABHA आईडी 14 अंकों की होनी चाहिए।</string>
+    <!-- Beneficiary Card -->
+    <string name="beneficiary_card_title">लाभार्थी कार्ड</string>
+    <string name="age_gender_label">आयु / लिंग</string>
+    <string name="phone_number_label">फ़ोन नंबर</string>
+    <string name="village_name_label">गाँव का नाम</string>
+    <string name="abha_id_label">आभा आईडी</string>
+    <string name="generate_abha_id_btn">ABHA आईडी जनरेट करें</string>
+    <string name="continue_btn">जारी रखना</string>
+    <string name="view_beneficiary_card">कार्ड देखें</string>
+    <!-- Edit Beneficiary Details -->
+    <string name="edit_beneficiary_details">लाभार्थी विवरण संपादित करें</string>
+    <string name="last_name_optional">अंतिम नाम (वैकल्पिक)</string>
+    <string name="phone_number_optional">फ़ोन नंबर (वैकल्पिक)</string>
+    <string name="age_mandatory">आयु</string>
+    <string name="years_mandatory">Years <font color="#FF0000">*</font></string>
+    <string name="months_optional">महीने</string>
+    <string name="days_optional">दिन</string>
+    <string name="save_btn">सहेजें</string>
+    <string name="cancel_btn">रद्द करना</string>
+    <string name="edit_btn">संपादन करना</string>
+    <string name="age_years_required">आयु (वर्षों में) आवश्यक है</string>
+    <string name="beneficiary_updated_successfully">लाभार्थी का विवरण सफलतापूर्वक अपडेट हो गया है।</string>
+    <string name="status_of_woman_required">महिला का दर्जा आवश्यक है</string>
+    <string name="speak_now">अब बोलो...</string>
+    <string name="speech_recognition_error">वाक् पहचान उपलब्ध नहीं है</string>
+    <string name="beneficiary_photo_content_description">%s की तस्वीर</string>
+    <string name="desc_patient_photo">मरीज की तस्वीर</string>
+    <!-- Neonatal Outcome Strings -->
+    <string name="neonatal_outcome">नवजात शिशु का परिणाम</string>
+    <string name="baby_number">शिशु %1d</string>
+    <string name="no_outcome_at_birth">जन्म के समय परिणाम</string>
+    <string name="no_sex">लिंग</string>
+    <string name="no_cried_immediately">क्या जन्म के तुरंत बाद बच्चा रोया था?</string>
+    <string name="no_type_of_resuscitation">पुनर्जीवन का प्रकार</string>
+    <string name="no_birth_weight">जन्म के समय वजन (ग्राम में)</string>
+    <string name="no_congenital_anomaly_detected">क्या कोई जन्मजात असामान्यता पाई गई है?</string>
+    <string name="no_type_of_congenital_anomaly">जन्मजात विकृति का प्रकार</string>
+    <string name="no_other_congenital_anomaly">अन्य जन्मजात असामान्यता (स्पष्ट करें)</string>
+    <string name="no_newborn_complications">नवजात शिशु संबंधी जटिलताएं</string>
+    <string name="no_current_status_of_baby">बच्चे की वर्तमान स्थिति</string>
+    <string name="no_cause_of_death">मृत्यु का कारण</string>
+    <string name="no_other_cause_of_death">मृत्यु का अन्य कारण (स्पष्ट करें)</string>
+    <string name="no_birth_dose_vaccines_given">जन्म के समय टीके की खुराक दी गई</string>
+    <string name="no_reason_for_no_vaccines">जन्म के समय टीके की खुराक न देने का कारण</string>
+    <string name="no_vitamin_k_injection_given">क्या विटामिन K का इंजेक्शन दिया गया?</string>
+    <string name="no_reason_for_no_vitamin_k">विटामिन K का इंजेक्शन न देने का कारण</string>
+    <string name="no_birth_certificate_issued">क्या जन्म प्रमाण पत्र जारी किया गया है?</string>
+    <!-- Alerts -->
+    <string name="no_alert_lbw">कम जन्म भार (एलबीडब्ल्यू): 1500-2499 ग्राम। गहन निगरानी आवश्यक है।</string>
+    <string name="no_alert_vlbw">अत्यंत कम जन्म भार (VLBW): 1000-1499 ग्राम। तत्काल एसएनसीयू रेफरल की सिफारिश की जाती है।</string>
+    <string name="no_alert_elbw">अत्यंत कम जन्म भार (ELBW): 1000 ग्राम। गंभीर - NICU देखभाल आवश्यक है।</string>
+    <string name="no_alert_macrosomia">Macrosomia (flag for maternal GDM screening)</string>
+    <string name="no_alert_ambiguous_sex">Ambiguous genitalia detected. Pediatric specialist referral required.</string>
+    <string name="no_alert_stillbirth">मृत जन्म दर्ज किया गया है। मृत जन्म ऑडिट फॉर्म प्रारंभ किया जाएगा</string>
+    <string name="no_alert_neonatal_death">नवजात मृत्यु दर्ज की गई है। नवजात मृत्यु ऑडिट फॉर्म प्रारंभ किया जाएगा</string>
+    <string name="no_alert_complications">जटिलताओं की स्थिति में तत्काल बाल रोग विशेषज्ञ/विशेषज्ञ से परामर्श आवश्यक है।</string>
+    <string name="no_alert_pnc_counseling">नवजात शिशु की देखभाल के संबंध में मां को उचित प्रसवोत्तर परामर्श सुनिश्चित करें।</string>
+    <!-- Validation -->
+    <string name="no_error_birth_weight_range">जन्म के समय शिशु का वजन 500 ग्राम से 6000 ग्राम के बीच होना चाहिए।</string>
+    <string name="no_error_birth_weight_required">कृपया जन्म के समय का वजन दर्ज करें</string>
+    <string name="no_error_outcome_required">कृपया जन्म के समय परिणाम का चयन करें</string>
+    <string name="no_error_sex_required">कृपया लिंग चुनें</string>
+    <string name="no_error_crying_status_required">कृपया रोने की स्थिति चुनें</string>
+    <string name="no_error_resuscitation_required">कृपया पुनर्जीवन का प्रकार चुनें</string>
+    <string name="no_error_current_status_required">कृपया बच्चे की वर्तमान स्थिति का चयन करें</string>
+    <string name="no_error_cause_of_death_required">कृपया मृत्यु का कारण चुनें</string>
+    <string name="no_error_vaccines_required">कृपया दिए गए टीकों का चयन करें</string>
+    <string name="no_error_vitamin_k_required">कृपया बताएं कि क्या विटामिन K दिया गया था</string>
+    <string-array name="no_outcome_at_birth_array">
+        <item>Live Birth</item>
+        <item>Still Birth (Fresh)</item>
+        <item>Still Birth (Macerated)</item>
+        <item>Diedrelative during delivery</item>
+    </string-array>
+    <string-array name="no_sex_array">
+        <item>Male</item>
+        <item>Female</item>
+        <item>Ambiguous</item>
+    </string-array>
+    <string-array name="no_cried_immediately_array">
+        <item>Immediate cry</item>
+        <item>Cried after resuscitation</item>
+        <item>Did not cry</item>
+    </string-array>
+    <string-array name="no_type_of_resuscitation_array">
+        <item>Stimulation</item>
+        <item>Suctioning</item>
+        <item>Bag and mask ventilation</item>
+        <item>Oxygen</item>
+        <item>Intubation</item>
+        <item>Chest compressions</item>
+        <item>Medications</item>
+    </string-array>
+    <string-array name="no_congenital_anomaly_array">
+        <item>Yes</item>
+        <item>No</item>
+        <item>Suspected (under evaluation)</item>
+    </string-array>
+    <string-array name="no_type_of_congenital_anomaly_array">
+        <item>Neural tube defect</item>
+        <item>Cleft lip/palate</item>
+        <item>Club foot</item>
+        <item>Down syndrome</item>
+        <item>Congenital heart defect</item>
+        <item>Hydrocephalus</item>
+        <item>Spina bifida</item>
+        <item>Polydactyly/Syndactyly</item>
+        <item>Gastroschisis/Omphalocele</item>
+        <item>Other</item>
+        <item>None</item>
+    </string-array>
+    <string-array name="no_newborn_complications_array">
+        <item>Birth asphyxia</item>
+        <item>Respiratory distress</item>
+        <item>Neonatal jaundice</item>
+        <item>Sepsis</item>
+        <item>Hypothermia</item>
+        <item>Hypoglycemia</item>
+        <item>Feeding difficulties</item>
+        <item>Convulsions/Seizures</item>
+        <item>None</item>
+    </string-array>
+    <string-array name="no_current_status_array">
+        <item>Healthy and with mother</item>
+        <item>Admitted (SNCU/NICU)</item>
+        <item>Admitted (General ward)</item>
+        <item>Died</item>
+    </string-array>
+    <string-array name="no_cause_of_death_array">
+        <item>Birth asphyxia</item>
+        <item>Prematurity</item>
+        <item>Low birth weight complications</item>
+        <item>Sepsis</item>
+        <item>Respiratory distress syndrome</item>
+        <item>Congenital anomalies</item>
+        <item>Meconium aspiration</item>
+        <item>Unknown</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="no_birth_dose_vaccines_array">
+        <item>BCG</item>
+        <item>Hepatitis B (Birth dose)</item>
+        <item>OPV-0</item>
+        <item>None</item>
+    </string-array>
+    <string-array name="no_birth_certificate_array">
+        <item>Yes</item>
+        <item>In process</item>
+        <item>No (Not applied)</item>
+    </string-array>
+    <string name="antra_next_due_date">ANTRA की अगली देय तिथि</string>
+    <string name="tab_dashboard">डैशबोर्ड</string>
+    <string name="cho_role">सामुदायिक स्वास्थ्य अधिकारी</string>
+    <string name="proceed_with_registration">पंजीकरण की प्रक्रिया आगे बढ़ाएं</string>
+    <string name="no_face_detected">कोई चेहरा नहीं पहचाना गया</string>
+    <string name="multiple_faces_detected">कई चेहरे पहचाने गए</string>
+    <string name="invalid_face_detection">चेहरे की पहचान अमान्य है</string>
+    <string name="failed_to_generate_face_embeddings">चेहरे के एम्बेडिंग उत्पन्न करने में विफल</string>
+    <string name="face_embeddings_generated">चेहरे के एम्बेडिंग उत्पन्न हुए</string>
+    <string name="face_detection_failed">चेहरे की पहचान विफल: %1$s</string>
+    <string name="unable_to_fetch_details">विवरण प्राप्त करने में असमर्थ</string>
+    <string name="na">उपलब्ध नहीं है</string>
+    <string name="previous_activity">पिछली गतिविधि</string>
+    <string name="activity_details">गतिविधि विवरण</string>
+    <string name="activity_form">गतिविधि प्रपत्र</string>
+    <string name="medicine_not_available">दवा उपलब्ध नहीं है</string>
+    <string name="login_failed_toast">लॉगिन विफल</string>
+    <string name="processing">प्रक्रिया जारी है…</string>
+    <string name="invalid_input">अमान्य निवेश</string>
+    <string name="delivery_record_not_found">डिलीवरी रिकॉर्ड नहीं मिला</string>
+    <string name="save_successful_toast">सफलतापूर्वक सहेजा गया</string>
+    <string name="invalid_data_entered">गलत डेटा दर्ज किया गया</string>
+    <string name="please_wait_master_location">कृपया प्रतीक्षा करें जब तक कि मुख्य स्थान निर्देशांक प्राप्त नहीं हो जाते।</string>
+    <string name="data_saved">डेटा सुरक्षित है!</string>
+    <string name="error_saving_master_location">मुख्य लोकेशन को सहेजते समय त्रुटि हुई</string>
+    <string name="please_fill_all_details">कृपया सभी विवरण भरें</string>
+    <string name="all_pnc_visits_completed">सभी प्रसवपूर्व स्वास्थ्य देखभाल (PNC) भ्रमण पूरे हो गए हैं</string>
+    <string name="all_4_anc_visits_completed">सभी 4 ANC भ्रमण पूरे हो गए हैं</string>
+    <string name="verify_abha_otp">ABHA OTP सत्यापित करें</string>
+    <string name="events_for_date_already_exist">इस तिथि के लिए कार्यक्रम पहले से मौजूद हैं</string>
+    <string name="proceed_to_home">होम पेज पर जाएं</string>
+    <string name="invalid_image_try_again">अमान्य छवि! पुनः प्रयास करें</string>
+    <string name="exception_image_processing_failed">अपवाद! छवि प्रसंस्करण विफल रहा</string>
+    <string name="eyes_closed_try_again">आंखें बंद! फिर से कोशिश करो</string>
+    <string name="home_visit">घर भ्रमण</string>
+    <string name="please_capture_image_to_continue">आगे बढ़ने के लिए कृपया छवि कैप्चर करें।</string>
+    <string name="loading_patient_data_please_wait">मरीज का डेटा लोड हो रहा है, कृपया प्रतीक्षा करें…</string>
+    <string name="please_enter_beneficiary_name">कृपया लाभार्थी का नाम दर्ज करें</string>
+    <string name="batch_selection">बैच चयन</string>
+    <string name="template_deleted">टेम्पलेट हटा दिया गया</string>
+    <string name="max_duration_allowed_6">अवधि के लिए अधिकतम अनुमत मान 6 है।</string>
+    <string name="location_update_message">आप निर्धारित बिंदु से 2 मीटर से अधिक दूर चले गए हैं। क्या आप अपना स्थान अपडेट करना चाहते हैं?</string>
+    <string name="beneficiary_abha_mapping">लाभार्थी ABHA मैपिंग।</string>
+    <string name="alert_title">चेतावनी</string>
+    <string name="please_confirm_logout_exit">कृपया लॉगआउट करने और बाहर निकलने की पुष्टि करें।</string>
+    <string name="login_away_from_facility">आप अपने कार्यालय से बाहर रहकर लॉग इन करने का प्रयास कर रहे हैं। क्या आप पुनः प्रयास करना चाहेंगे?</string>
+    <string name="patient_already_exists">रोगी पहले से मौजूद है</string>
+    <string name="error_saving_patient">मरीज को बचाने में त्रुटि</string>
+    <string name="esanjeevani_login">ई-संजीवनी लॉगिन</string>
+    <string name="update_ready_to_install">अपडेट इंस्टॉल करने के लिए तैयार है।</string>
+    <string name="restart">पुनः आरंभ करें</string>
+    <string name="applytxt">आवेदन करना</string>
+    <string name="choose_application_language">आवेदन की भाषा चुनें</string>
+    <string name="update_canceled_or_failed">अपडेट रद्द कर दिया गया या असफल रहा।</string>
+    <string name="try_again_btn">पुनः प्रयास करें</string>
+    <string name="permission_denied">अनुमति नहीं मिली</string>
+    <string name="not_scheduled">निर्धारित नहीं</string>
+    <string name="location_provider_gps_disabled">स्थान प्रदाता/जीपीएस अक्षम</string>
+    <string name="invalid_image_multiple_faces">अमान्य छवि! एकाधिक चेहरे पाए गए</string>
+    <string name="linking_abha_to_beneficiary">ABHA को लाभार्थी से जोड़ना</string>
+    <string name="error_saving_patient_message">डेटा अपर्याप्त होने के कारण मरीज़ को सहेजने में विफलता मिली। कृपया सुनिश्चित करें कि सभी डेटा सिंक हो गए हैं।</string>
+    <string name="case_closure_yes">हाँ</string>
+    <string name="case_closure_no">नहीं</string>
+    <string name="anc_visit_number_format">एएनसी विज़िट %1d</string>
+    <string name="completed_with_date">पूर्ण</string>
+    <string name="nav_error">नेविगेशन त्रुटि:</string>
+    <string name="ben_visit_date">भ्रमण तिथि:</string>
+    <string name="ben_visit_num">विज़िट संख्या:</string>
+
+    <!-- Mental Health Screening Strings - Hindi -->
+    <!-- Initial Screening Questions -->
+    <string name="emotional_behavioural_concerns">मानसिक या व्यवहार संबंधी समस्याएं मौजूद हैं</string>
+    <string name="substance_use_concerns">पदार्थों के उपयोग से संबंधित समस्याएं मौजूद हैं</string>
+    <string name="self_harm_suicide_thoughts">आत्महत्या या आत्मक्षति के विचार मौजूद हैं</string>
+    <string name="memory_loss_confusion">स्मृति हानि या भ्रम मौजूद है</string>
+    <string name="seizures_fits_loc">दौरे, मिर्गी, या चेतना का नुकसान मौजूद है</string>
+    <string name="postpartum_woman">प्रसव के बाद की महिला (≤12 महीने बाद)</string>
+
+    <!-- PHQ-9 Depression Screening -->
+    <string name="phq9_section_title">PHQ-9 अवसाद स्क्रीनिंग</string>
+    <string name="phq9_little_interest">चीजों में रुचि या खुशी की कमी</string>
+    <string name="phq9_feeling_down">उदास, निराश, या असहाय महसूस करना</string>
+    <string name="phq9_sleep_trouble">सोने में परेशानी, या बहुत अधिक नींद आना</string>
+    <string name="phq9_feeling_tired">थकान या ऊर्जा की कमी महसूस करना</string>
+    <string name="phq9_appetite">भूख में कमी या अधिक भोजन करना</string>
+    <string name="phq9_feeling_bad">अपने बारे में बुरा महसूस करना या असफल महसूस करना</string>
+    <string name="phq9_concentration">ध्यान केंद्रित करने में कठिनाई</string>
+    <string name="phq9_moving_slowly">धीरे-धीरे हिलना-डुलना या सुस्त दिखना</string>
+    <string name="phq9_self_harm_thoughts">आत्महत्या या आत्मक्षति के विचार</string>
+    <string name="phq9_total_score">PHQ-9 कुल स्कोर</string>
+
+    <string-array name="phq9_options">
+        <item>0 - बिल्कुल नहीं</item>
+        <item>1 - कई दिन</item>
+        <item>2 - आधे से अधिक दिन</item>
+        <item>3 - लगभग हर दिन</item>
+    </string-array>
+
+    <!-- Substance Use Screening & Brief Intervention -->
+    <string name="substance_section_title">पदार्थ उपयोग स्क्रीनिंग और संक्षिप्त हस्तक्षेप</string>
+    <string name="substance_alcohol_use">शराब का उपयोग</string>
+    <string name="substance_tobacco_use">तंबाकू का उपयोग</string>
+    <string name="substance_other_use">अन्य पदार्थों का उपयोग</string>
+    <string name="substance_other_specify">अन्य पदार्थ निर्दिष्ट करें</string>
+    <string name="substance_frequency">पदार्थ उपयोग की आवृत्ति</string>
+    <string name="brief_intervention_given">संक्षिप्त हस्तक्षेप दिया गया</string>
+
+    <string-array name="substance_frequency_options">
+        <item>रोज</item>
+        <item>साप्ताहिक</item>
+        <item>मासिक</item>
+        <item>कभी-कभार</item>
+    </string-array>
+
+    <!-- Suicide Risk Screening -->
+    <string name="suicide_section_title">आत्महत्या के जोखिम की स्क्रीनिंग</string>
+    <string name="suicide_current_thoughts">आत्महत्या या आत्मक्षति के वर्तमान विचार</string>
+    <string name="suicide_plan">आत्मक्षति की विशिष्ट योजना है</string>
+    <string name="suicide_previous_attempt">पहले आत्महत्या का प्रयास</string>
+    <string name="suicide_hopelessness">निराशा या बोझ होने की भावना व्यक्त की गई</string>
+    <string name="suicide_risk_level">आत्महत्या का जोखिम स्तर</string>
+
+    <string-array name="suicide_risk_options">
+        <item>कम</item>
+        <item>मध्यम</item>
+        <item>उच्च</item>
+    </string-array>
+
+    <!-- Dementia Screening Checklist -->
+    <string name="dementia_section_title">मनोभ्रंश स्क्रीनिंग चेकलिस्ट</string>
+    <string name="dementia_progressive_memory_loss">प्रगतिशील स्मृति हानि</string>
+    <string name="dementia_forgetting_recent">हाल की घटनाएं भूल जाना</string>
+    <string name="dementia_disorientation">समय/स्थान के प्रति भ्रम</string>
+    <string name="dementia_daily_activities">दैनिक गतिविधियों को प्रबंधित करने में कठिनाई</string>
+    <string name="dementia_behavioural_changes">व्यवहार परिवर्तन</string>
+
+    <!-- Epilepsy Screening Checklist -->
+    <string name="epilepsy_section_title">मिर्गी स्क्रीनिंग चेकलिस्ट</string>
+    <string name="epilepsy_recurrent_seizures">बार-बार दौरे/मिर्गी</string>
+    <string name="epilepsy_jerky_movements">एपिसोड के दौरान झटकेदार गतिविधि</string>
+    <string name="epilepsy_tongue_bite">एपीसोड के दौरान जीभ में कटौती या असंयम</string>
+    <string name="epilepsy_confusion_after">एपिसोड के बाद भ्रम</string>
+    <string name="epilepsy_loc_duration">चेतना हानि की अवधि</string>
+
+    <string-array name="epilepsy_duration_options">
+        <item>5 मिनट से कम</item>
+        <item>5–15 मिनट</item>
+        <item>15 मिनट से अधिक</item>
+    </string-array>
+
+    <!-- Mental Health Referral Reasons -->
+    <string name="mental_health_reason_for_referral">रेफरल का कारण</string>
+    <string-array name="mental_health_referral_reasons">
+        <item>अवसाद (PHQ-9 स्कोर ≥10)</item>
+        <item>आत्महत्या का जोखिम पहचाना गया</item>
+        <item>पदार्थ उपयोग विकार</item>
+        <item>मनोभ्रंश संदिग्ध</item>
+        <item>मिर्गी संदिग्ध</item>
+        <item>प्रसवोत्तर अवसाद</item>
+        <item>गंभीर मानसिक विकार संदिग्ध</item>
+        <item>अन्य</item>
+    </string-array>
+
+    <!-- Yes/No Options Array -->
+    <string-array name="yes_no_options">
+        <item>हाँ</item>
+        <item>नहीं</item>
+    </string-array>
+    <string name="cd_camera_search">कैमरा खोलें</string>
+
+    <!-- Ear Diagnosis Dataset -->
+    <string name="ear_difficulty_hearing">सुनने में कठिनाई</string>
+    <string name="ear_whisper_test_response">फुसफुसाहट परीक्षण प्रतिक्रिया</string>
+    <string name="ear_whisper_correct">सही</string>
+    <string name="ear_whisper_incorrect">गलत</string>
+    <string name="ear_hearing_test_outcome">श्रवण परीक्षण परिणाम</string>
+    <string name="ear_hearing_normal">सामान्य</string>
+    <string name="ear_hearing_slight_loss">हल्की हानि</string>
+    <string name="ear_hearing_moderate">मध्यम</string>
+    <string name="ear_hearing_severe">गंभीर</string>
+    <string name="ear_hearing_deaf">बधिर</string>
+    <string name="ear_pain">कान का दर्द</string>
+    <string name="ear_discharge_present">कान से स्राव</string>
+    <string name="ear_foreign_body">कान में विदेशी शरीर</string>
+    <string name="ear_foreign_body_superficial">हाँ (सतही)</string>
+    <string name="ear_foreign_body_deep">हाँ (गहरा)</string>
+    <string name="ear_condition_type">कान की स्थिति का प्रकार</string>
+    <string name="ear_otomycosis">ओटोमाइकोसिस</string>
+    <string name="ear_otitis_externa">ओटिटिस एक्सटर्ना</string>
+    <string name="ear_acute_discharge">तीव्र कान स्राव</string>
+    <string name="ear_chronic_discharge">दीर्घकालिक कान स्राव</string>
+    <string name="ear_wax">कान का मैल</string>
+    <string name="ear_congenital_malformation">जन्मजात कान की विकृति</string>
+    <string name="ear_alert_abnormal_hearing">असामान्य श्रवण पाया गया। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="ear_alert_deep_foreign_body">गहरा विदेशी वस्तु पाया गया। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="ear_alert_congenital_malformation">जन्मजात कान की विकृति पाई गई। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+
+    <!-- Ophthalmic Screening -->
+    <string name="ophthalmic_screening_title">नेत्र जांच</string>
+    <string name="ophthalmic_symptomatic_title">नेत्र रोग लक्षण</string>
+    <string name="ophthalmic_screening_section_title">अंधापन और अपवर्तक त्रुटियों की जांच</string>
+    <string name="ophthalmic_is_diabetic">क्या रोगी मधुमेह से पीड़ित है? <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_screening_performed">मधुमेह रोगी के लिए जांच की गई <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_right">दूर दृष्टि तीक्ष्णता \u2013 दाहिनी आँख <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_left">दूर दृष्टि तीक्ष्णता \u2013 बाईं आँख <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_visual_impairment_alert">संदिग्ध दृष्टि दोष</string>
+    <string name="ophthalmic_reason_for_visit">भेंट का कारण <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_near_va">निकट दृष्टि तीक्ष्णता <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_chart_used">दृष्टि तीक्ष्णता चार्ट उपयोग किया गया <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_case_identification_title">केस पहचान</string>
+    <string name="ophthalmic_case_id_alert">संदिग्ध दृष्टि दोष पहचाना गया। कृपया नीचे केस पहचान पूरी करें।</string>
+    <string name="ophthalmic_case_id_conditions">केस पहचान और स्थिति(याँ)</string>
+    <string name="ophthalmic_case_id_conditions_mandatory">केस पहचान और स्थिति(याँ) <font color="#FF0000">*</font></string>
+    <string name="select_conditions">स्थिति(याँ) चुनें</string>
+    <string name="ophthalmic_vitamin_a_deficiency">विटामिन ए की कमी / ज़ेरोफ्थैल्मिया</string>
+    <string name="ophthalmic_cataract_symptoms">मोतियाबिंद के लक्षण <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_glaucoma_symptoms">ग्लूकोमा के लक्षण <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dr_symptoms">मधुमेह रेटिनोपैथी के लक्षण <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_presbyopia_symptoms">प्रेसबायोपिया के लक्षण <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_trachoma_status">ट्रेकोमा स्थिति <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_corneal_disease_type">कॉर्नियल रोग का प्रकार <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_vitamin_a_deficiency_label">विटामिन ए की कमी के लक्षण / बिटॉट\'s स्पॉट पहचाना गया <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_trachoma_status">ट्रेकोमा स्थिति चुनें</string>
+    <string name="ophthalmic_select_corneal_disease_type">कॉर्नियल रोग का प्रकार चुनें</string>
+    <string name="ophthalmic_alert_ophthalmologist_referral">रोगी को द्वितीय स्तर पर नेत्र विशेषज्ञ के पास भेजें।</string>
+    <string name="ophthalmic_alert_presbyopia_management">रोगी प्रेसबायोपिया प्रबंधन (जैसे, पढ़ने का चश्मा) के लिए योग्य हो सकता है।</string>
+    <string name="ophthalmic_alert_vitamin_a">विटामिन ए की रोकथाम दी जाए। रोगी को द्वितीय स्तर पर नेत्र विशेषज्ञ के पास भेजें।</string>
+    <string name="ophthalmic_injury_trauma_title">चोट और आघात फॉर्म</string>
+    <string name="ophthalmic_injury_type_label">चोट का प्रकार <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_injury_type">चोट का प्रकार चुनें</string>
+    <string name="ophthalmic_foreign_body_removal_attempted">विदेशी वस्तु निकालने का प्रयास किया गया</string>
+    <string name="ophthalmic_chemical_exposure_wash_performed">रासायनिक जोखिम \u2013 अच्छी तरह धोया गया</string>
+
+    <string-array name="ophthalmic_reason_for_visit_options">
+        <item>जांच</item>
+        <item>रोग लक्षण</item>
+        <item>नेत्र चोट/आघात के लिए प्राथमिक उपचार</item>
+    </string-array>
+
+    <string-array name="ophthalmic_chart_options">
+        <item>स्नेलेन दूरी चार्ट</item>
+        <item>निकट दृष्टि चार्ट</item>
+    </string-array>
+
+    <string-array name="ophthalmic_case_id_options">
+        <item>मोतियाबिंद</item>
+        <item>ग्लूकोमा</item>
+        <item>मधुमेह रेटिनोपैथी</item>
+        <item>प्रेसबायोपिया</item>
+        <item>ट्रेकोमा</item>
+        <item>कॉर्नियल रोग</item>
+        <item>कंजंक्टिवाइटिस/आंखों का लाल होना</item>
+        <item>सूखी आंखें / ज़ेरोफ्थैल्मिया</item>
+        <item>आंखों की एलर्जी</item>
+    </string-array>
+
+    <string-array name="ophthalmic_injury_type_options">
+        <item>मैकेनिक बाहरी वस्तु</item>
+        <item>ब्लंट ट्रॉमा</item>
+        <item>संदिग्ध वेधन चोट</item>
+        <item>रासायनिक (एसिड/क्षार/अन्य)</item>
+    </string-array>
+
+    <string-array name="ophthalmic_foreign_body_options">
+        <item>प्रयास नहीं किया गया</item>
+        <item>कंजंक्टिवल सैक से प्रयास किया गया</item>
+        <item>कॉर्निया में फंसी बाहरी वस्तु</item>
+    </string-array>
+
+    <string-array name="ophthalmic_trachoma_options">
+        <item>संदिग्ध सक्रिय ट्रेकोमा</item>
+        <item>संदिग्ध टीटी/टीआई</item>
+        <item>कोई ट्रेकोमा नहीं</item>
+    </string-array>
+
+    <string-array name="ophthalmic_corneal_disease_options">
+        <item>कॉर्नियल ओपेसिटी</item>
+        <item>संदिग्ध कॉर्नियल अल्सर</item>
+        <item>अन्य कॉर्नियल पैथोलॉजी</item>
+    </string-array>
+    <string name="saved_successfully">सफलतापूर्वक सहेजा गया</string>
+    <string name="save_failed_retry">सहेजना विफल रहा। कृपया पुनः प्रयास करें।</string>
+    <string name="please_complete_field">कृपया पूरा करें: %s</string>
+
+    <!-- Oral Health Dataset -->
+    <string name="oral_tooth_decay_present">दाँत में सड़न</string>
+    <string name="oral_tooth_decay_symptoms">दाँत की सड़न के लक्षण</string>
+    <string name="oral_symptom_black_spot">काला धब्बा</string>
+    <string name="oral_symptom_discoloration">दाँत के गड्ढे में रंग बदलना</string>
+    <string name="oral_symptom_hole">दाँत में छेद</string>
+    <string name="oral_symptom_sensitivity">गर्म और ठंडे, मीठे और खट्टे के प्रति संवेदनशीलता</string>
+    <string name="oral_symptom_food_lodgment">गड्ढे/दाँतों के बीच भोजन का फंसना</string>
+    <string name="oral_symptom_pain">दर्द</string>
+    <string name="oral_symptom_swelling">सूजन</string>
+    <string name="oral_symptom_pus_discharge">मवाद का स्राव</string>
+    <string name="oral_gum_disease_present">मसूड़े के रोग</string>
+    <string name="oral_gum_disease_symptoms">मसूड़े के रोगों के लक्षण</string>
+    <string name="oral_gum_foul_smell">दुर्गंध</string>
+    <string name="oral_gum_bleeding">मसूड़ों से रक्तस्राव</string>
+    <string name="oral_gum_deposits">दाँतों पर जमाव और रंग बदलना</string>
+    <string name="oral_gum_loose_teeth">ढीले दाँत</string>
+    <string name="oral_gum_widening_gap">दाँतों के बीच बढ़ता अंतर</string>
+    <string name="oral_gum_swollen">सूजे हुए मसूड़े</string>
+    <string name="oral_irregular_teeth_jaws">अनियमित दाँत/जबड़े</string>
+    <string name="oral_abnormal_growth_ulcer">असामान्य वृद्धि/अल्सर</string>
+    <string name="oral_cleft_lip_palate">कटा होंठ/तालू</string>
+    <string name="oral_dental_fluorosis">दंत फ्लोरोसिस</string>
+    <string name="oral_dental_emergency">दंत आपातकाल</string>
+    <string name="oral_emergency_pain">दर्द</string>
+    <string name="oral_emergency_abscess">फोड़ा</string>
+    <string name="oral_emergency_swelling">सूजन</string>
+    <string name="oral_emergency_tooth_injury">दाँत की चोट</string>
+    <string name="oral_emergency_avulsion">दाँत का उखड़ना</string>
+    <string name="oral_emergency_non_healing_ulcer">न भरने वाला अल्सर</string>
+    <string name="oral_emergency_uncontrolled_bleeding">अनियंत्रित रक्तस्राव</string>
+    <string name="oral_emergency_trauma">आघात (टूटा हुआ जबड़ा/हिलते दाँत)</string>
+    <string name="oral_health_referral_alert">रोगी को द्वितीय स्तर पर दंत चिकित्सक के पास भेजें।</string>
+
+    <!-- Elderly Health Assessment Dataset -->
+    <string name="elderly_geriatric_complaints">सामान्य वृद्धावस्था संबंधी शिकायतें मौजूद हैं?</string>
+    <string name="elderly_multiple_chronic">एकाधिक दीर्घकालिक स्थितियाँ</string>
+    <string name="elderly_recent_falls">हाल में गिरना</string>
+    <string name="elderly_difficulty_walking">चलने या संतुलन में कठिनाई</string>
+    <string name="elderly_visual_hearing">दृष्टि या श्रवण संबंधी कठिनाई</string>
+    <string name="elderly_functional_decline">कार्यात्मक गिरावट / दैनिक गतिविधियों में कठिनाई (ADL)</string>
+    <string name="elderly_functional_assessment_headline">कार्यात्मक मूल्यांकन अनुभाग</string>
+    <string name="elderly_bathing">स्नान</string>
+    <string name="elderly_dressing">कपड़े पहनना</string>
+    <string name="elderly_toileting">शौचालय जाना</string>
+    <string name="elderly_transferring">स्थानांतरण</string>
+    <string name="elderly_continence">मूत्र नियंत्रण</string>
+    <string name="elderly_feeding">खाना खाना</string>
+    <string name="elderly_independent">स्वतंत्र (1)</string>
+    <string name="elderly_dependent">निर्भर (0)</string>
+    <string name="elderly_total_score">कुल स्कोर</string>
+    <string name="elderly_functional_status">कार्यात्मक स्थिति</string>
+    <string name="elderly_functional_decline_flag">कार्यात्मक गिरावट संकेत</string>
+    <string name="elderly_status_no_decline">कोई गिरावट नहीं</string>
+    <string name="elderly_status_partial_dependence">आंशिक निर्भरता</string>
+    <string name="elderly_status_functional_dependence">कार्यात्मक निर्भरता</string>
+    <string name="elderly_status_highly_dependent">अत्यधिक निर्भर</string>
+    <string name="elderly_status_unknown">अज्ञात</string>
+    <string name="elderly_memory_loss">स्मृति हानि या भ्रम</string>
+    <string name="elderly_dementia_headline">मनोभ्रंश जांच सूची</string>
+    <string name="elderly_dementia_memory_loss">प्रगतिशील स्मृति हानि</string>
+    <string name="elderly_dementia_disorientation">भटकाव (समय/स्थान/व्यक्ति)</string>
+    <string name="elderly_dementia_behavioural">व्यवहार में परिवर्तन</string>
+    <string name="elderly_dementia_self_care">आत्म-देखभाल / दिनचर्या में गिरावट</string>
+    <string name="elderly_screening_outcome">जांच परिणाम</string>
+    <string name="elderly_referral_required">रेफरल आवश्यक</string>
+    <string name="elderly_outcome_suspected">संदिग्ध</string>
+    <string name="elderly_outcome_not_suspected">संदिग्ध नहीं</string>
+    <string name="elderly_alert_functional_decline">रोगी में कार्यात्मक गिरावट है। आवश्यकता होने पर उच्च सुविधा में भेजें।</string>
+    <string name="elderly_alert_memory_loss">रोगी में स्मृति हानि है। आवश्यकता होने पर उच्च सुविधा में भेजें।</string>
+
+    <!-- Psychosocial Caregiver Support Dataset -->
+    <string name="psychosocial_counselling_provided">मनोसामाजिक परामर्श प्रदान किया गया</string>
+    <string name="psychosocial_caregiver_counselling">देखभालकर्ता परामर्श प्रदान किया गया</string>
+    <string name="psychosocial_caregiver_distress">देखभालकर्ता में तनाव पहचाना गया</string>
+    <string name="psychosocial_counselling_remarks">परामर्श टिप्पणी</string>
+
+    <!-- Mental Health Screening – remaining hardcoded strings -->
+    <string name="mh_depression_severity">अवसाद की गंभीरता</string>
+    <string name="mh_system_action">प्रणाली कार्रवाई</string>
+    <string name="mh_current_tobacco_use">वर्तमान तंबाकू उपयोग</string>
+    <string name="mh_tobacco_type">तंबाकू उपयोग का प्रकार</string>
+    <string name="mh_tobacco_smoking">धूम्रपान</string>
+    <string name="mh_tobacco_smokeless">धूम्ररहित</string>
+    <string name="mh_tobacco_both">दोनों</string>
+    <string name="mh_tobacco_frequency">तंबाकू उपयोग की आवृत्ति</string>
+    <string name="mh_tobacco_occasional">कभी-कभी</string>
+    <string name="mh_tobacco_daily">दैनिक</string>
+    <string name="mh_tobacco_outcome">तंबाकू उपयोग परिणाम</string>
+    <string name="mh_tobacco_system_action">प्रणाली कार्रवाई</string>
+    <string name="mh_intervention_psychoeducation">मनोशिक्षा</string>
+    <string name="mh_intervention_counselling">परामर्श</string>
+    <string name="mh_intervention_stress_mgmt">तनाव प्रबंधन</string>
+    <string name="mh_intervention_family_counselling">पारिवारिक परामर्श</string>
+    <!-- Nose Diagnosis Dataset -->
+    <string name="difficulty_in_breathing">सांस लेने में कठिनाई</string>
+    <string name="open_mouth_breathing">मुंह खोलकर सांस लेना</string>
+    <string name="nose_bleed_title">नकसीर (नाक से खून आना)</string>
+    <string name="systolic_bp_title">सिस्टोलिक बीपी (mmHg)</string>
+    <string name="diastolic_bp_title">डायस्टोलिक बीपी (mmHg)</string>
+    <string name="foreign_body_nose_title">नाक में बाहरी वस्तु</string>
+    <string name="foreign_body_anterior">हाँ (आगे की तरफ दिखाई दे रहा है)</string>
+    <string name="foreign_body_posterior">हाँ (पीछे की तरफ दिखाई दे रहा है)</string>
+    <string name="sinusitis_title">साइनसाइटिस</string>
+    <string name="sinusitis_with_pain">हाँ (चेहरे में दर्द/संवेदनशीलता)</string>
+
+    <!-- Nose Diagnosis Alert Messages -->
+    <string name="difficulty_in_breathing_alert">सांस लेने में कठिनाई। URI / Rhinitis / Sinusitis का निदान करें। यदि HWC में प्रबंधन योग्य नहीं है तो विशेषज्ञ के पास भेजें।</string>
+    <string name="open_mouth_breathing_alert">मुंह खोलकर सांस लेना। URI / Rhinitis / Sinusitis का निदान करें। यदि HWC में प्रबंधन योग्य नहीं है तो विशेषज्ञ के पास भेजें।</string>
+    <string name="nose_bleed_alert_systolic_bp">सिस्टोलिक BP &gt; 120 mmHg। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="nose_bleed_alert_diastolic_bp">डायस्टोलिक BP &gt; 80 mmHg। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="foreign_body_posterior_alert">पीछे बाहरी वस्तु दिखाई दी। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="sinusitis_alert">क्रोनिक साइनसाइटिस का संदेह। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+
+    <string-array name="nose_foreign_body_options">
+        <item>हाँ (आगे की तरफ दिखाई दे रहा है)</item>
+        <item>हाँ (पीछे की तरफ दिखाई दे रहा है)</item>
+        <item>नहीं</item>
+    </string-array>
+    <!-- Throat Diagnosis Dataset -->
+    <string name="throat_diagnosis_symptoms">लक्षण</string>
+    <string name="throat_symptom_pain">दर्द</string>
+    <string name="throat_symptom_soreness">खराश / जलन</string>
+    <string name="throat_symptom_cold">सर्दी</string>
+    <string name="throat_symptom_itching">खुजली</string>
+    <string name="throat_symptom_hoarseness">आवाज़ का भारीपन</string>
+    <string name="throat_diagnosis_neck_swelling">गर्दन में सूजन</string>
+    <string name="throat_diagnosis_difficulty_swallowing">निगलने में कठिनाई</string>
+    <string name="throat_diagnosis_tonsillitis">टॉन्सिलाइटिस</string>
+    <string name="throat_diagnosis_pharyngitis">ग्रसनीशोथ (Pharyngitis)</string>
+    <string name="throat_diagnosis_laryngitis">स्वरयंत्रशोथ (Laryngitis)</string>
+    <string name="throat_diagnosis_sinusitis">साइनसाइटिस</string>
+    <string name="throat_diagnosis_cleft_lip">कटे हुए होंठ</string>
+    <string name="throat_diagnosis_cleft_palate">कटा हुआ तालु</string>
+
+    <string name="throat_alert_neck_swelling">गर्दन में सूजन पाई गई। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="throat_alert_difficulty_swallowing">निगलने में कठिनाई पाई गई। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="throat_alert_cleft_lip">कटे हुए होंठ पाए गए। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+    <string name="throat_alert_cleft_palate">कटा हुआ तालु पाया गया। रोगी को द्वितीय स्तर पर विशेषज्ञ के पास भेजें।</string>
+
+    <!-- Palliative Care / Pain and Symptom Assessment -->
+    <string name="palliative_care_identification_headline">प्रशामक देखभाल की पहचान (Palliative Care)</string>
+    <string name="pain_symptom_assessment_palliative">दर्द और लक्षण मूल्यांकन</string>
+    
+    <string name="persistent_pain_present">लगातार दर्द मौजूद है</string>
+    <string name="pain_severity">दर्द की गंभीरता</string>
+    <string name="pain_duration">दर्द की अवधि</string>
+    <string name="pain_duration_less_than_one_month">&lt; 1 महीना</string>
+    <string name="pain_duration_one_to_six_months">1–6 महीने</string>
+    <string name="pain_duration_more_than_six_months">&gt; 6 महीने</string>
+    <string name="mild">हल्का</string>
+    <string name="moderate">मध्यम</string>
+    <string name="severe">गंभीर</string>
+
+    <string name="other_symptoms_present">अन्य लक्षण मौजूद हैं</string>
+    <string name="other_symptoms_severity">अन्य लक्षणों की गंभीरता</string>
+    <string name="immediate_relief_provided">तत्काल राहत प्रदान की गई</string>
+    
+    <string name="symptom_assessment_basic_title">लक्षण मूल्यांकन</string>
+    <string name="symptom_assessment_basic_field_title">लक्षण</string>
+    <string name="symptom_nausea_vomiting">मतली / उल्टी</string>
+    <string name="symptom_constipation">कब्ज़</string>
+    <string name="symptom_anxiety_restlessness">चिंता / बेचैनी</string>
+    <string name="symptom_sleep_disturbance">नींद में गड़बड़ी</string>
+    <string name="breathlessness">सांस लेने में तकलीफ</string>
+    <string name="nausea">मतली</string>
+    <string name="fatigue">थकान</string>
+    <string name="weakness">कमज़ोरी</string>
+    <string name="other">अन्य</string>
+    
+    <string name="basic_management_cho_level_title">बेसिक प्रबंधन</string>
+    <string name="basic_symptom_relief_provided">बुनियादी लक्षण राहत प्रदान की गई</string>
+    <string name="basic_psychosocial_support_provided">मनोसामाजिक सहायता प्रदान की गई</string>
+    <string name="basic_caregiver_counselling_provided">देखभालकर्ता को परामर्श दिया गया</string>
+    <string name="basic_management_remarks">टिप्पणी</string>
+    
+    <string name="distressing_symptoms_present">परेशान करने वाले लक्षण मौजूद हैं</string>
+    <string name="bedridden_or_severely_dependent">बिस्तर पर या पूरी तरह से निर्भर</string>
+    <string name="life_limiting_illness_known">जीवन को सीमित करने वाली बीमारी का ज्ञान</string>
+    <string name="caregiver_support_required">देखभालकर्ता की सहायता आवश्यक है</string>
+
+    <string name="severe_pain_referral_alert">गंभीर दर्द। कृपया उच्च सुविधा केंद्र में भेजें।</string>
+    <string name="severe_symptoms_referral_alert">गंभीर लक्षण। कृपया उच्च सुविधा केंद्र में भेजें।</string>
+
+    <!-- Generic Referral & Follow Up Fields -->
+    <string name="referral_required_title">क्या रेफरल की आवश्यकता है?</string>
+    <string-array name="referral_required_options">
+        <item>हाँ</item>
+        <item>नहीं</item>
+    </string-array>
+    
+    <string name="referral_level_title">रेफरल स्तर</string>
+    <string-array name="referral_level_options">
+        <item>प्राथमिक स्वास्थ्य केंद्र</item>
+        <item>सामुदायिक स्वास्थ्य केंद्र</item>
+        <item>ज़िला अस्पताल</item>
+        <item>प्रशामक देखभाल इकाई</item>
+    </string-array>
+    
+    <string name="reason_for_referral_title">रेफरल का कारण</string>
+    <string-array name="reason_for_referral_options">
+        <item>गंभीर दर्द</item>
+        <item>कार्यात्मक निर्भरता</item>
+        <item>डिमेंशिया की आशंका</item>
+        <item>जीवन के अंत की देखभाल</item>
+    </string-array>
+    
+    <string name="follow_up_required_title">क्या फॉलो-अप की आवश्यकता है?</string>
+    <string-array name="follow_up_required_options">
+        <item>हाँ</item>
+        <item>नहीं</item>
+    </string-array>
+    
+    <string name="follow_up_date_title">फॉलो-अप तिथि</string>
+    
+    <string name="case_status_title">केस की स्थिति</string>
+    <string-array name="case_status_options">
+        <item>स्वस्थ</item>
+        <item>इलाज के तहत</item>
+        <item>मृत्यु</item>
+    </string-array>
+    
+    <string name="date_of_death_title">मृत्यु की तिथि</string>
+    <string name="yes_option">हाँ</string>
+    <string name="no_option">नहीं</string>
+
+    <!-- Mental Health Screening -->
+    <string name="mh_suicide_immediate_assess">सीएचओ तत्काल जोखिम का आकलन करता है</string>
+    <string name="mh_suicide_risk_alert_moderate">मध्यम आत्महत्या जोखिम: तत्काल परामर्श आवश्यक है। रेफरल पर विचार करें।</string>
+    <string name="mh_suicide_risk_alert_high">उच्च आत्महत्या जोखिम: आपातकालीन हस्तक्षेप आवश्यक है। तुरंत रेफर करें।</string>
+    <string name="mh_date_format_pattern">dd/MM/yyyy</string>
+    <string name="mh_suspected">संदिग्ध</string>
+    <string name="mh_de_addiction">नशामुक्ति</string>
+    <string name="mh_de_addiction_centre">नशामुक्ति केंद्र</string>
+
+    <string-array name="phq9_severity_options">
+        <item>न्यूनतम</item>
+        <item>हल्का</item>
+        <item>मध्यम</item>
+        <item>मध्यम रूप से गंभीर</item>
+        <item>गंभीर</item>
+    </string-array>
+
+    <string-array name="phq9_system_action_options">
+        <item>मनोशिक्षा</item>
+        <item>परामर्श - एमओ/पीएचसी को रेफर करें</item>
+        <item>रेफरल - तत्काल रेफरल</item>
+        <item>रेफरल - आपातकालीन रेफरल</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_outcome_options">
+        <item>उपयोग की पहचान की गई</item>
+        <item>किसी उपयोग की पहचान नहीं हुई</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_system_action_options">
+        <item>संक्षिप्त परामर्श</item>
+        <item>रेफरल</item>
+    </string-array>
+
+    <string-array name="mh_alcohol_classification_options">
+        <item>कोई समस्याग्रस्त शराब उपयोग की पहचान नहीं हुई</item>
+        <item>समस्याग्रस्त शराब उपयोग का संदेह</item>
+    </string-array>
+
+    <string-array name="mh_ed_outcome_options">
+        <item>संदिग्ध मिर्गी</item>
+        <item>संदिग्ध डिमेंशिया</item>
+        <item>संदिग्ध</item>
+        <item>संदिग्ध नहीं</item>
+    </string-array>
+
+    <string name="mh_ed_reason_neurological">न्यूरोलॉजिकल स्थिति का संदेह</string>
+
+    <string-array name="mh_referral_level_dmhp_options">
+        <item>प्राथमिक स्वास्थ्य केंद्र (PHC)</item>
+        <item>सामुदायिक स्वास्थ्य केंद्र (CHC)</item>
+        <item>जिला अस्पताल</item>
+        <item>जिला मानसिक स्वास्थ्य कार्यक्रम (DMHP)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_alcohol_options">
+        <item>पीएचसी (PHC)</item>
+        <item>नशामुक्ति केंद्र</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_rbsk_options">
+        <item>आरबीएसके डीईआईसी (RBSK DEIC)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_child_options">
+        <item>पीएचसी (PHC)</item>
+        <item>सीएचसी (CHC)</item>
+        <item>जिला अस्पताल (DH)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_adult_options">
+        <item>पीएचसी (PHC)</item>
+        <item>सीएचसी (CHC)</item>
+        <item>जिला अस्पताल (DH)</item>
+        <item>डीएमएचपी (DMHP)</item>
+        <item>नशामुक्ति केंद्र</item>
+    </string-array>
+    
+    <string-array name="mh_referral_level_standard_mh_options">
+        <item>प्राथमिक स्वास्थ्य केंद्र (PHC)</item>
+        <item>जिला मानसिक स्वास्थ्य कार्यक्रम (DMHP)</item>
+    </string-array>
+
+    <!-- Missing Mental Health Strings -->
+    <string-array name="alcohol_system_action_options">
+        <item>संक्षिप्त हस्तक्षेप</item>
+        <item>रेफरल</item>
+    </string-array>
+    <string-array name="mh_case_closure_reason_options">
+        <item>स्वस्थ</item>
+        <item>रेफर किया गया</item>
+        <item>फॉल-अप छूट गया</item>
+        <item>मृत्यु</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options">
+        <item>आत्महत्या का जोखिम / आत्म-हानि</item>
+        <item>मध्यम से गंभीर अवसाद</item>
+        <item>गंभीर मानसिक विकार का संदेह</item>
+        <item>मादक द्रव्य पर निर्भरता / वापसी लक्षण</item>
+        <item>कार्यात्मक हानि</item>
+        <item>न्यूरोलॉजिकल स्थिति का संदेह</item>
+        <item>बच्चे से संबंधित व्यवहार संबंधी चिंता</item>
+        <item>स्वयं या दूसरों के लिए जोखिम</item>
+        <item>कोई सुधार नहीं / खराब होना</item>
+        <item>विशेषज्ञ देखभाल की आवश्यकता है</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options_under_11">
+        <item>मानसिक स्वास्थ्य संबंधी शिकायत</item>
+        <item>चिकित्सा संबंधी जटिलता</item>
+    </string-array>
+    <string-array name="mh_referral_level_options">
+        <item>पीएचसी (PHC)</item>
+        <item>डीएमएचपी (DMHP)</item>
+        <item>नशामुक्ति केंद्र</item>
+    </string-array>
+
+    <string name="ed_age_60_years">आयु ≥ 60 वर्ष</string>
+    <string name="ed_confusion_disorientation">भटकाव या भ्रम</string>
+    <string name="ed_duration_minutes">अवधि (मिनट)</string>
+    <string name="ed_edConfusionordrowsiness">एपिसोड के बाद भ्रम या उनींदापन</string>
+    <string name="ed_edRecurrentEpisodeloss">चेतना खोने के एपिसोड</string>
+    <string name="ed_functional_decline">दैनिक कामकाज में गिरावट (स्वयं की देखभाल, दिनचर्या के कार्य)</string>
+    <string name="ed_intervention_type">हस्तक्षेप का प्रकार</string>
+    <string name="ed_progressive_memory_loss">प्रगतिशील स्मृति हानि</string>
+    <string name="ed_psychosocial_intervention_provided">मनोसामाजिक हस्तक्षेप प्रदान किया गया</string>
+    <string name="ed_reason">कारण</string>
+    <string name="ed_recurrent_jerky_movements">बार-बार झटकेदार हरकतें / दौरे</string>
+    <string name="ed_referral_required">रेफरल आवश्यक है</string>
+    <string name="ed_remarks">टिप्पणियाँ</string>
+    <string name="ed_screening_outcome">स्क्रीनिंग परिणाम</string>
+    <string name="ed_session_date">सत्र की तारीख</string>
+    <string name="epilepsy_dementia_checklist_title">मिर्गी और डिमेंशिया स्क्रीनिंग चेकलिस्ट</string>
+
+    <string name="mh_adherence_to_advice_title">सलाह का पालन</string>
+    <string name="mh_case_closure_reason_title">मामले को बंद करने का कारण</string>
+    <string name="mh_follow_up_date_title">फॉलो-अप की तारीख</string>
+    <string name="mh_follow_up_required_title">फॉलो-अप आवश्यक है</string>
+    <string name="mh_improvement_noted_title">सुधार देखा गया</string>
+    <string name="mh_reason_for_referral_title">रेफरल का कारण</string>
+    <string name="mh_referral_date_title">रेफरल की तारीख</string>
+    <string name="mh_referral_escalation_title">एस्केलेशन (उच्च स्तर पर भेजना) आवश्यक है</string>
+    <string name="mh_referral_level_title">रेफरल स्तर</string>
+    <string name="mh_referral_required_title">रेफरल आवश्यक है</string>
+    <string name="mh_repeat_phq9_title">PHQ-9 दोहराएं</string>
+
+    <string name="phq9_alert_emergency"><font color="#FF0000">आपातकालीन रेफरल (PHQ-9 स्कोर ≥ 20)</font></string>
+    <string name="phq9_alert_referral_mo_phc"><font color="#FF0000">MO/PHC को रेफर करें (PHQ-9 स्कोर ≥ 10)</font></string>
+    <string name="phq9_alert_urgent"><font color="#FF0000">तत्काल रेफरल (PHQ-9 स्कोर ≥ 15)</font></string>
+
+    <string name="substance_alcohol_classification">शराब के उपयोग का वर्गीकरण</string>
+    <string name="substance_alcohol_frequency">शराब के उपयोग की आवृत्ति</string>
+    <string name="substance_alcohol_impact">दैनिक कामकाज पर प्रभाव (स्वास्थ्य, परिवार, कार्य)</string>
+    <string name="substance_alcohol_loss">पीने पर नियंत्रण खोना</string>
+    <string name="substance_alcohol_problematic">समस्याग्रस्त शराब के उपयोग का सीएचओ आकलन</string>
+    <string name="substance_alcohol_system_action">सिस्टम कार्रवाई</string>
+    <string name="substance_alcohol_title">शराब के उपयोग की पहचान</string>
+    <string name="substance_alcohol_withdrawal">वापसी (withdrawal) के सुझाव देने वाले लक्षण</string>
+    <string name="substance_tobacco_title">तंबाकू के उपयोग की पहचान</string>
+    <string name="mental_health_screening_saved">मानसिक स्वास्थ्य स्क्रीनिंग सफलतापूर्वक सेव की गई</string>
+    <string name="elderly_health_assessment_saved">बुजुर्ग स्वास्थ्य मूल्यांकन सफलतापूर्वक सेव किया गया</string>
+    <string name="ear_diagnosis_saved">कान का निदान सेव किया गया</string>
+    <string name="throat_diagnosis_saved">गले का निदान सेव किया गया</string>
+    <string name="nose_diagnosis_saved">नाक का निदान सफलतापूर्वक सुरक्षित किया गया</string>
+    <string name="title_mental_health_screening">मानसिक स्वास्थ्य परीक्षण</string>
+    <string name="title_nose_diagnosis">नाक निदान फॉर्म</string>
+    <string name="title_ear_diagnosis">कान निदान फॉर्म</string>
+    <string name="title_throat_diagnosis">गला निदान फॉर्म</string>
+    <string name="oral_health_saved">मौखिक स्वास्थ्य विवरण सफलतापूर्वक सहेजे गए</string>
+    <string name="title_oral_health">दंत स्वास्थ्य फॉर्म</string>
+    <string name="title_pain_symptom_assessment">उपशामक देखभाल पहचान प्रपत्र</string>
+    <string name="title_elderly_health_assessment">वृद्ध स्वास्थ्य मूल्यांकन</string>
+    <string name="title_psychosocial_caregiver_support">मनोसामाजिक एवं देखभालकर्ता सहायता</string>
+
+    <!--
+      Localized labels for chief complaint and duration unit dropdowns.
+      Order MUST match values/strings.xml chief_complaint_en_keys and
+      duration_units_en_keys exactly. MasterDataLocalizer pairs by index.
+    -->
+    <string-array name="chief_complaint_localized">
+        <item>बुखार</item>
+        <item>खांसी</item>
+        <item>सिरदर्द</item>
+        <item>सर्दी</item>
+        <item>उल्टी</item>
+        <item>दस्त</item>
+        <item>शरीर में दर्द</item>
+        <item>पेट दर्द</item>
+        <item>सीने में दर्द</item>
+        <item>सांस लेने में तकलीफ</item>
+        <item>थकान</item>
+        <item>भूख न लगना</item>
+        <item>मोतियाबिंद</item>
+        <item>काला मोतिया</item>
+        <item>मधुमेह संबंधी रेटिनोपैथी</item>
+        <item>निकट दृष्टि दोष</item>
+        <item>ट्रेकोमा</item>
+        <item>कॉर्निया रोग</item>
+        <item>आंख आना / लाल आंख</item>
+        <item>सूखी आंखें</item>
+        <item>सूखी आंखें</item>
+        <item>आंख की एलर्जी</item>
+        <item>आंख की चोट (कुंठित आघात / भेदक चोट)</item>
+        <item>आंख की चोट (कुंठित आघात / भेदक चोट)</item>
+        <item>रासायनिक संपर्क (अम्ल / क्षार / अन्य)</item>
+        <item>रासायनिक संपर्क (अम्ल / क्षार / अन्य)</item>
+        <item>आंख में बाहरी वस्तु</item>
+        <item>दांत में सड़न</item>
+        <item>मसूड़ों के रोग</item>
+        <item>दांतों और जबड़ों की अनियमित व्यवस्था</item>
+        <item>असामान्य वृद्धि, धब्बे या छाले</item>
+        <item>कटा होंठ / तालु</item>
+        <item>डेंटल फ्लोरोसिस</item>
+        <item>दंत आपातकाल</item>
+        <item>गर्दन में सूजन</item>
+        <item>निगलने में कठिनाई</item>
+        <item>कटा होंठ</item>
+        <item>कटा तालु</item>
+        <item>टॉन्सिल का संक्रमण</item>
+        <item>ग्रसनीशोथ</item>
+        <item>स्वरयंत्रशोथ</item>
+        <item>साइनसाइटिस</item>
+        <item>सुनने में कठिनाई</item>
+        <item>कान का मैल</item>
+        <item>जन्मजात कान की विकृति</item>
+        <item>कान में बाहरी वस्तु</item>
+        <item>मुंह खोलकर सांस लेना</item>
+        <item>नकसीर</item>
+        <item>नाक में बाहरी वस्तु</item>
+    </string-array>
+
+    <string-array name="duration_units_localized">
+        <item>घंटे</item>
+        <item>दिन</item>
+        <item>सप्ताह</item>
+        <item>महीने</item>
+        <item>साल</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values-hi/strings_abha.xml b/app/src/main/res/values-hi/strings_abha.xml
new file mode 100644
index 000000000..e5657f8c2
--- /dev/null
+++ b/app/src/main/res/values-hi/strings_abha.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="verify_aadhaar_number">आधार नंबर सत्यापित करें</string>
+    <string name="verify_aadhaar_otp">आधार OTP सत्यापित करें</string>
+    <string name="verify_mobile_number">मोबाइल नंबर सत्यापित करें</string>
+    <string name="enter_otp">OTP दर्ज करें</string>
+    <string name="verify_otp">OTP सत्यापित करें</string>
+    <string name="resend_otp">OTP पुनः भेजें</string>
+    <string name="full_name">पूरा नाम</string>
+    <string name="male">पुरुष</string>
+    <string name="female">महिला</string>
+    <string name="district">जिला</string>
+    <string name="aadhaar">आधार</string>
+    <string name="asha">आशा</string>
+    <string name="ashaname">आशा का नाम</string>
+    <string name="gov">सरकार</string>
+    <string name="enter_aadhaar_number">आधार नंबर दर्ज करें</string>
+    <string name="aadhaar_number">आधार नंबर</string>
+    <string name="verified">सत्यापित</string>
+    <string name="generate_otp">OTP भेजें</string>
+    <string name="send_otp">OTP भेजें</string>
+    <string name="select_abha">नाम चुनें</string>
+    <string name="pid">PID</string>
+    <string name="generate_abha">ABHA</string>
+    <string name="_30">30</string>
+    <string name="abha_number_generated_successfully">ABHA नंबर सफलतापूर्वक जनरेट हुआ</string>
+    <string name="abha_id">ABHA ID</string>
+    <string name="linked_toO_beneficiary">लाभार्थी से लिंक किया गया</string>
+    <string name="do_you_want_to_download_the_abha_card">क्या आप ABHA कार्ड डाउनलोड करना चाहते हैं?</string>
+    <string name="enter_mobile_number">मोबाइल नंबर दर्ज करें</string>
+    <string name="enter_number_for_abha">ABHA पंजीकरण के लिए आधार नंबर</string>
+    <string name="aadhaar_linked_mobile">आधार से लिंक मोबाइल नंबर या अन्य मोबाइल नंबर</string>
+    <string name="mobile_number">मोबाइल नंबर</string>
+    <string name="check_and_generate_otp">जांचें और OTP जनरेट करें</string>
+    <string name="textview">TextView</string>
+    <string name="download_abha_channel_id">ABHA कार्ड डाउनलोड हो रहा है</string>
+    <string name="create_abha_number">ABHA नंबर बनाएं</string>
+    <string name="d_o_b">जन्म तिथि</string>
+    <string name="check_circle">चेक सर्कल</string>
+    <string name="name_">नाम :</string>
+    <string name="abha_number_">ABHA नंबर :</string>
+    <string name="aadhaar_linked_mobile_number_or_other_mobile_number">आधार से लिंक मोबाइल नंबर या अन्य मोबाइल नंबर</string>
+    <string name="validate_fp">फिंगरप्रिंट सत्यापित करें</string>
+    <string name="generating_abha_for">दर्ज करें</string>
+    <string name="otp_sent_to">\"आधार से लिंक मोबाइल नंबर पर OTP भेजा गया\"</string>
+    <string name="str_create_abha">ABHA बनाएं</string>
+    <string name="str_search_abha">ABHA खोजें</string>
+    <string name="str_invalid_aadhaar_no">कृपया वैध आधार नंबर दर्ज करें</string>
+    <string name="str_invalid_mobile_no">कृपया वैध मोबाइल नंबर दर्ज करें</string>
+    <string name="str_invalid_ben_name">कृपया वैध लाभार्थी का नाम दर्ज करें</string>
+    <string name="str_here_abha_no">यह है आपका ABHA नंबर!</string>
+    <string name="str_abha_already_exist">यह ABHA पहले से मौजूद है!</string>
+    <string name="str_abha_successfully_created">ABHA खाता सफलतापूर्वक बनाया गया!</string>
+    <string name="str_abha_card_downloaded">आप डाउनलोड फ़ोल्डर में Abha कार्ड देख सकते हैं!!</string>
+
+    <string name="str_abha_otp_note">यह OTP केवल 10 मिनट के लिए वैध है</string>
+    <string name="str_enter_otp">OTP दर्ज करें:</string>
+    <string name="str_find_abha">पहले से ABHA है?\nअभी पता करें!</string>
+    <string name="str_get_your_abha">मोबाइल नंबर का उपयोग करके ABHA नंबर प्राप्त करें।</string>
+    <string name="enter_ben_name">लाभार्थी का नाम दर्ज करें</string>
+    <string name="str_didnt_receive_otp">OTP नहीं मिला? कृपया प्रतीक्षा करें </string>
+
+    <string name="str_declaration">मैं इसके द्वारा घोषणा करता/करती हूं कि:</string>
+    <string name="str_aadhaar_consent_1">मैं भारतीय विशिष्ट पहचान प्राधिकरण (\"UIDAI\") द्वारा जारी अपना आधार नंबर/वर्चुअल ID और अपनी जनसांख्यिकीय जानकारी स्वेच्छा से साझा कर रहा/रही हूं, ताकि आयुष्मान भारत स्वास्थ्य खाता नंबर (\"ABHA नंबर\") और आयुष्मान भारत स्वास्थ्य खाता पता (\"ABHA पता\") बनाया जा सके। मैं NHA को आधार (वित्तीय और अन्य सब्सिडी, लाभ और सेवाओं की लक्षित डिलीवरी) अधिनियम, 2016 के प्रावधानों के अनुसार उक्त उद्देश्य के लिए UIDAI के साथ आधार आधारित प्रमाणीकरण करने के लिए अपना आधार नंबर/वर्चुअल ID उपयोग करने का अधिकार देता/देती हूं। मैं समझता/समझती हूं कि सफल प्रमाणीकरण पर UIDAI मेरे e-KYC विवरण या \"हां\" की प्रतिक्रिया NHA के साथ साझा करेगा।</string>
+    <string name="str_aadhaar_consent_2">मैं आधार के अलावा दस्तावेज़ का उपयोग करके आयुष्मान भारत स्वास्थ्य खाता नंबर (\"ABHA नंबर\") और आयुष्मान भारत स्वास्थ्य खाता पता (\"ABHA पता\") बनाना चाहता/चाहती हूं। (आगे बढ़ने के लिए यहां क्लिक करें)</string>
+    <string name="str_aadhaar_consent_3">मैं इस एनकाउंटर के दौरान अपने पुराने सरकारी स्वास्थ्य रिकॉर्ड और जो जनरेट होंगे, उन्हें लिंक करने के लिए अपने ABHA पते और ABHA नंबर के उपयोग की सहमति देता/देती हूं।</string>
+    <string name="str_aadhaar_consent_4">मैं इस एनकाउंटर के दौरान मुझे स्वास्थ्य सेवा प्रदान करने के उद्देश्य से स्वास्थ्य सेवा प्रदाता(ओं) के साथ अपने सभी स्वास्थ्य रिकॉर्ड साझा करने का अधिकार देता/देती हूं।</string>
+
+    <string name="str_aadhaar_consent_5">मैं सार्वजनिक स्वास्थ्य उद्देश्यों के लिए अपने सरकारी स्वास्थ्य रिकॉर्ड की गुमनामीकरण और बाद के उपयोग की सहमति देता/देती हूं।</string>
+    <string name="str_aadhaar_consent_6">मैं, @ashaName, पुष्टि करता/करती हूं कि मैंने लाभार्थी को उक्त उद्देश्यों के लिए सहमति की सामग्री के बारे में due रूप से सूचित और समझाया है।</string>
+    <string name="str_aadhaar_consent_7">मैं, @beneficiaryName, को ऊपर बताई गई सहमति के बारे में समझाया गया है और मैं उक्त उद्देश्यों के लिए अपनी सहमति प्रदान करता/करती हूं।</string>
+    <string name="str_seconds">\" सेकंड\"</string>
+    <string name="str_aadhaar_otp_number">\"आधार पंजीकृत मोबाइल नंबर पर OTP भेजा गया जो @mobileNumber पर समाप्त होता है\"</string>
+    <string name="str_abha_otp_number">\"ABHA पंजीकृत मोबाइल नंबर पर OTP भेजा गया जो @mobileNumber पर समाप्त होता है\"</string>
+    <string name="str_otp_number_message">\"@mobileNumber पर समाप्त होने वाले मोबाइल नंबर पर OTP भेजा गया है।\"</string>
+
+
+</resources>
diff --git a/app/src/main/res/values-hi/strings_ncd.xml b/app/src/main/res/values-hi/strings_ncd.xml
new file mode 100644
index 000000000..277fff32e
--- /dev/null
+++ b/app/src/main/res/values-hi/strings_ncd.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="date">तारीख</string>
+    <string name="radio_title_cbac">%1s<![CDATA[<font color="#B00020"> *</font>]]></string>
+    <string name="radio_title_cbac_ds">%1s<![CDATA[<font color="#B00020"> **</font>]]></string>
+    <string name="cbac_ask_pat">पूछें कि क्या रोगी में इनमें से कोई लक्षण हैं</string>
+    <string name="cbac_early_detection">भाग B1: शीघ्र पहचान</string>
+    <string name="cbac_early_detection_2">भाग B2: केवल महिलाएं</string>
+    <string name="cbac_early_detection_3">भाग B3: वरिष्ठ विशिष्ट</string>
+    <string name="cbac_hint_age">आपकी उम्र क्या है?</string>
+    <string name="cbac_hint_smoke">क्या आप धूम्रपान करते हैं या गुटखा या खैनी जैसे धूम्रपान रहित उत्पाद लेते हैं?</string>
+    <string name="cbac_hint_alcohol">क्या आप रोज़ शराब पीते हैं?</string>
+    <string name="cbac_hint_waist">कमर का माप (सेमी में)</string>
+    <string name="cbac_hint_pa">क्या आप सप्ताह में कम से कम 150 मिनट कोई शारीरिक गतिविधि करते हैं?</string>
+    <string name="cbac_hint_fh">क्या आपके परिवार (माता-पिता या भाई-बहनों में से कोई) में उच्च रक्तचाप, मधुमेह और हृदय रोग का इतिहास है?</string>
+
+    <string name="cbac_ask_pat_note">नोट :</string>
+    <string name="cbac_ast1">* यदि नीचे \"*\" वाले किसी प्रश्न के लिए \"हां\" चुना जाए तो पॉपअप संदेश दिखाएं \"MO को रेफर करें और थूक का नमूना लें\"</string>
+    <string name="cbac_ast2">** यदि नीचे \"**\" वाले किसी प्रश्न के लिए \"हां\" चुना जाए तो पॉपअप संदेश दिखाएं \"MO को रेफर करें या सभी परिवार के सदस्यों की ट्रेसिंग के लिए ANM/MPW को सूचित करें\"</string>
+    <string name="cbac_select">चुनें …</string>
+    <string name="cbac_fh_tb">परिवार में किसी को वर्तमान में TB है</string>
+    <string name="cbac_taking_tb_drug">क्या आप वर्तमान में एंटी-TB दवा ले रहे हैं</string>
+    <string name="cbac_histb">TB का इतिहास</string>
+    <string name="cbac_coughing">2 सप्ताह से अधिक खांसी</string>
+    <string name="cbac_blsputum">थूक में खून</string>
+    <string name="cbac_feverwks">2 सप्ताह से अधिक बुखार</string>
+    <string name="cbac_lsweight">वजन कम होना</string>
+    <string name="cbac_ntswets">रात को पसीना</string>
+    <string name="cbac_recurrent_ulceration">हथेली या तलवे पर बार-बार अल्सर</string>
+    <string name="cbac_recurrent_tingling">हथेली(यों) या तलवे(ों) में झुनझुनाहट</string>
+    <string name="cbac_recurrent_cloudy">धुंधली या धुंधली दृष्टि</string>
+    <string name="cbac_recurrent_diffculty_reading">पढ़ने में कठिनाई</string>
+    <string name="cbac_recurrent_pain_eyes">एक सप्ताह से अधिक आंखों में दर्द</string>
+    <string name="cbac_recurrent_redness_eyes">एक सप्ताह से अधिक आंखों में लाली</string>
+    <string name="cbac_recurrent_diff_hearing">सुनने में कठिनाई</string>
+    <string name="cbac_breath">सांस फूलना</string>
+    <string name="cbac_hifits">दौरे का इतिहास</string>
+    <string name="cbac_difmouth">मुंह खोलने में कठिनाई</string>
+    <string name="cbac_heald">मुंह में अल्सर/पैच/ग्रोथ जो दो सप्ताह में ठीक नहीं हुआ</string>
+    <string name="cbac_voice">आवाज के स्वर में कोई बदलाव</string>
+    <string name="cbac_Any_Growth">मुंह में कोई ग्रोथ जो 2 सप्ताह में ठीक नहीं हुई</string>
+    <string name="cbac_Any_white">मुंह में कोई सफेद या लाल पैच जो 2 सप्ताह में ठीक नहीं हुआ</string>
+    <string name="cbac_Pain_while_chewing">चबाते समय दर्द</string>
+    <string name="cbac_Any_hyper_pigmented">संवेदना की कमी के साथ त्वचा पर हाइपर पिगमेंटेड पैच या मलिनकिरण</string>
+    <string name="cbac_any_thickend_skin">कोई मोटी त्वचा</string>
+    <string name="cbac_any_nodules_skin">त्वचा पर कोई गांठ</string>
+    <string name="cbac_Recurrent_numbness">हथेली(यों) या तलवे(ों) में सुन्नता</string>
+    <string name="cbac_Clawing_of_fingers">हाथ(ों) या पैर(ों) में उंगलियों का पंजे जैसा होना</string>
+    <string name="cbac_Tingling_or_Numbness">हाथ और/या पैर में झुनझुनाहट या सुन्नता</string>
+    <string name="cbac_Inability_close_eyelid">पलक बंद करने में असमर्थता</string>
+    <string name="cbac_diff_holding_objects">उंगलियों से वस्तु पकड़ने में कठिनाई</string>
+    <string name="cbac_Weekness_in_feet">पैरों में कमजोरी जिससे चलने में कठिनाई</string>
+
+    <string name="cbac_lumpbrest">स्तन में गांठ</string>
+    <string name="cbac_nipple">निप्पल से खूनी स्राव</string>
+    <string name="cbac_breast">स्तन के आकार और आकृति में बदलाव</string>
+    <string name="cbac_blperiods">पीरियड्स के बीच रक्तस्राव</string>
+    <string name="cbac_blmenopause">रजोनिवृत्ति के बाद रक्तस्राव</string>
+    <string name="cbac_blintercorse">संभोग के बाद रक्तस्राव</string>
+    <string name="cbac_fouldis">बदबूदार योनि स्राव</string>
+
+
+    <string name="cbac_double_ast" translatable="false">**</string>
+    <string name="cbac_single_ast" translatable="false">* </string>
+    <string name="cbac_yes">हां</string>
+    <string name="cbac_no">नहीं</string>
+
+    <string name="cbac_risk_Factors_COPD">भाग C: COPD के लिए जोखिम कारक</string>
+    <string name="cbac_occupational_exposure">व्यावसायिक एक्सपोजर</string>
+    <string name="cbac_PHQ2">भाग D: PHQ2</string>
+    <string name="cbac_last_two_weeks">पिछले दो सप्ताह में आप निम्नलिखित समस्याओं से कितनी बार परेशान हुए?</string>
+    <string name="cbac_little_interest">चीज़ें करने में थोड़ी रुचि या खुशी?</string>
+    <string name="cbac_feeling_down">उदास, निराश या निराश महसूस करना?</string>
+
+
+    <string name="hrp_valid">HRP केस, कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="hrp_sug_valid"> संदिग्ध HRP केस, कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_hyper">NCD से संबंधित (उच्च रक्तचाप, DM), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_diab">NCD से संबंधित (मधुमेह), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_diabm">NCD से संबंधित (मधुमेह), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_tb">NCD से संबंधित (TB), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_oc">NCD से संबंधित (मुख कैंसर), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_bc">NCD से संबंधित (स्तन कैंसर), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_cc">NCD से संबंधित (गर्भाशय ग्रीवा कैंसर), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_lep">NCD से संबंधित (कुष्ठ रोग), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_dia_lep">NCD से संबंधित (मधुमेह, कुष्ठ रोग), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_can_thy">NCD से संबंधित (कैंसर, थायरॉइड), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_dia_can">NCD से संबंधित (कैंसर), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_can_lep">NCD से संबंधित (कैंसर, कुष्ठ रोग), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_all_display">NCD से संबंधित (मुख कैंसर, TB), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_hyper_stk_display">NCD से संबंधित (उच्च रक्तचाप, स्ट्रोक), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_tb_can">NCD से संबंधित (TB, कैंसर), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_hyper_only">NCD से संबंधित (उच्च रक्तचाप), कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_sus_valid"> संदिग्ध NCD केस, कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="hrpncd_sus_valid"> संदिग्ध HRP और NCD केस, कृपया निकटतम HWC पर जाएं या 104 पर कॉल करें।</string>
+    <string name="ncd_hyperstroke">NCD से संबंधित (उच्च रक्तचाप, स्ट्रोक), कृपया डॉक्टर से परामर्श करें या 104 पर कॉल करें</string>
+    <string name="ncd_tbcancer">NCD से संबंधित (TB, कैंसर), कृपया डॉक्टर से परामर्श करें या 104 पर कॉल करें</string>
+    <string name="ncd_cansthyroid">NCD से संबंधित (कैंसर, थायरॉइड), कृपया डॉक्टर से परामर्श करें या 104 पर कॉल करें</string>
+    <string name="ncd_diabcancer">NCD से संबंधित (मधुमेह, कैंसर), कृपया डॉक्टर से परामर्श करें या 104 पर कॉल करें</string>
+    <string name="ncd_mentalhealth">NCD से संबंधित (मानसिक स्वास्थ्य विकार), कृपया डॉक्टर से परामर्श करें या 104 पर कॉल करें</string>
+    <string name="cbac_tbcase">संदिग्ध TB केस, कृपया थूक का नमूना लें और निकटतम TB टेस्टिंग सेंटर भेजें। सभी परिवार के सदस्यों की ट्रेसिंग भी करनी होगी।</string>
+    <string name="cbac_tb_collect_sputum">संदिग्ध TB केस, कृपया थूक का नमूना लें और निकटतम TB टेस्टिंग सेंटर भेजें।</string>
+    <string name="cbac_tv_moic_treat">इलाज के लिए रोगी को निकटतम स्वास्थ्य केंद्र के MOIC के पास भेजें</string>
+    <string name="cbac_unsteady">खड़े होने या चलने में अस्थिर महसूस करना</string>
+    <string name="cbac_pd_rm">कोई शारीरिक अक्षमता जो गति को प्रतिबंधित करती है</string>
+    <string name="cbac_nhop">खाना, कपड़े पहनना, संवारना, नहाना, चलना या शौचालय जैसे रोज़मर्रा के कामों के लिए दूसरों की मदद की ज़रूरत</string>
+    <string name="cbac_forget_names">अपने करीबियों या अपने घर के पते के नाम भूल जाना</string>
+
+    <string name="cbac_validation_your_age">\"कृपया उम्र चुनें\"</string>
+    <string name="cbac_validation_smoke">\"कृपया धूम्रपान और धूम्रपान रहित उत्पादों की खपत चुनें\"</string>
+    <string name="cbac_validation_consume_alcohol">\"कृपया शराब की खपत चुनें\"</string>
+    <string name="cbac_validation_waist">\"कृपया कमर का माप चुनें\"</string>
+    <string name="cbac_validation_physical_activities">\"कृपया शारीरिक गतिविधि चुनें\"</string>
+    <string name="cbac_validation_heart_disease">\"कृपया पारिवारिक इतिहास चुनें\"</string>
+
+    <string name="cbac_validation_plsst">कृपया चुनें परिवार में किसी को वर्तमान में TB है</string>
+    <string name="cbac_validation_plsatb">कृपया चुनें क्या आप वर्तमान में एंटी-TB ले रहे हैं</string>
+    <string name="cbac_validation_plshtb">कृपया TB का इतिहास चुनें</string>
+    <string name="cbac_validation_plscoughh">कृपया 2 सप्ताह से अधिक खांसी चुनें</string>
+    <string name="cbac_validation_plbls">कृपया थूक में खून चुनें</string>
+    <string name="cbac_validation_plsfever">कृपया 2 सप्ताह से अधिक बुखार चुनें</string>
+    <string name="cbac_validation_plslweight">कृपया वजन कम होना चुनें</string>
+    <string name="cbac_validation_plsnsw">कृपया रात को पसीना चुनें</string>
+    <string name="cbac_validation_rul">कृपया बार-बार अल्सर चुनें</string>
+    <string name="cbac_validation_rtps">कृपया हथेली या तलवे पर झुनझुनाहट चुनें</string>
+    <string name="cbac_validation_cbv">कृपया धुंधली दृष्टि चुनें</string>
+    <string name="cbac_validation_dr">कृपया पढ़ने में कठिनाई चुनें</string>
+    <string name="cbac_validation_pie">कृपया एक सप्ताह से अधिक आंखों में दर्द चुनें</string>
+    <string name="cbac_validation_rie">कृपया एक सप्ताह से अधिक आंखों में लाली चुनें</string>
+    <string name="cbac_validation_dih">कृपया सुनने में कठिनाई चुनें</string>
+    <string name="cbac_validation_sob">कृपया सांस फूलना चुनें</string>
+    <string name="cbac_validation_hif">कृपया दौरे का इतिहास चुनें</string>
+    <string name="cbac_validation_diom">कृपया मुंह खोलने में कठिनाई चुनें</string>
+    <string name="cbac_validation_upgm">कृपया मुंह में अल्सर/पैच/ग्रोथ चुनें</string>
+    <string name="cbac_validation_tov">कृपया आवाज के स्वर में बदलाव चुनें</string>
+    <string name="cbac_validation_gimh">कृपया मुंह में ग्रोथ चुनें जो 2 सप्ताह में ठीक नहीं हुई</string>
+    <string name="cbac_validation_wrp">कृपया मुंह में सफेद या लाल पैच चुनें जो 2 सप्ताह में ठीक नहीं हुआ</string>
+    <string name="cbac_validation_pwh">कृपया चबाते समय दर्द चुनें</string>
+    <string name="cbac_validation_hpds">कृपया त्वचा पर हाइपर पिगमेंटेड पैच या मलिनकिरण चुनें</string>
+    <string name="cbac_validation_ts">कृपया मोटी त्वचा चुनें</string>
+    <string name="cbac_validation_ns">कृपया त्वचा पर गांठ चुनें</string>
+    <string name="cbac_validation_rnps">कृपया हथेली या तलवे पर सुन्नता चुनें</string>
+    <string name="cbac_validation_cfhf">कृपया हाथ या पैर में उंगलियों का पंजा चुनें</string>
+    <string name="cbac_validation_tnhf">कृपया हाथ या पैर में झुनझुनाहट या सुन्नता चुनें</string>
+    <string name="cbac_validation_ice">कृपया पलक बंद करने में असमर्थता चुनें</string>
+    <string name="cbac_validation_dhof">कृपया उंगलियों से वस्तु पकड़ने में कठिनाई चुनें</string>
+    <string name="cbac_validation_wfdw">कृपया पैरों में कमजोरी चुनें जिससे चलने में कठिनाई</string>
+    <string name="cbac_validation_lb">कृपया स्तन में गांठ चुनें</string>
+    <string name="cbac_validation_bsdfn">कृपया निप्पल से खूनी स्राव चुनें</string>
+    <string name="cbac_validation_csb">कृपया स्तन के आकार में बदलाव चुनें</string>
+    <string name="cbac_validation_bbp">कृपया पीरियड्स के बीच रक्तस्राव चुनें</string>
+    <string name="cbac_validation_bam">कृपया रजोनिवृत्ति के बाद रक्तस्राव चुनें</string>
+    <string name="cbac_validation_bai">कृपया संभोग के बाद रक्तस्राव चुनें</string>
+    <string name="cbac_validation_fsvd">कृपया बदबूदार योनि स्राव चुनें</string>
+    <string name="cbac_validation_fuwsw">कृपया खड़े होने या चलने में अस्थिर महसूस करना चुनें</string>
+    <string name="cbac_validation_sapd">कृपया गति को प्रतिबंधित करने वाली शारीरिक अक्षमता चुनें</string>
+    <string name="cbac_validation_nhpa">कृपया खाना, कपड़े, संवारना, नहाना, चलना या शौचालय जैसे रोज़मर्रा के कामों के लिए दूसरों की मदद चुनें</string>
+    <string name="cbac_validation_fn">कृपया अपने, करीबियों के नाम या अपना घर का पता भूलना चुनें</string>
+    <string name="cbac_validation_fu">कृपया खाना पकाने के लिए इस्तेमाल ईंधन चुनें</string>
+    <string name="cbac_validation_ox">कृपया व्यावसायिक एक्सपोजर चुनें</string>
+    <string name="cbac_validation_li">कृपया थोड़ी रुचि फ़ील्ड चुनें!</string>
+    <string name="cbac_validation_fd">कृपया उदास महसूस करना फ़ील्ड चुनें!</string>
+    <string name="cbac_Question">प्रश्न</string>
+    <string name="cbac_score">स्कोर</string>
+    <string name="cbac_type_of_fuel">खाना पकाने के लिए इस्तेमाल ईंधन का प्रकार</string>
+    <string name="cbac_remarks">टिप्पणियां</string>
+    <string name="cbac_risk_assessment_tv">भाग A: जोखिम मूल्यांकन</string>
+    <string name="cbac_tv_bl_menopause">आशा सुविधाकर्ता को सूचित करें</string>
+    <string name="cbac_form">CBAC फॉर्म</string>
+    <string name="alert">चेतावनी!</string>
+    <string name="missing_field">फ़ील्ड गायब</string>
+    <string name="suspected_hrp_and_ncd_case">संदिग्ध HRP और NCD केस!</string>
+    <string name="ok">ठीक है</string>
+    <string name="suspected_hrp_case">संदिग्ध HRP केस!</string>
+    <string name="suspected_ncd_case_please_visit_nearest_hwc_or_call">संदिग्ध NCD केस, कृपया निकटतम HWC पर जाएं या कॉल करें\n 104।</string>
+    <string name="refer_to_ncd_screening_day_vhsnd_hwc_for_ncd_screening_priority">NCD स्क्रीनिंग के लिए NCD स्क्रीनिंग दिवस/VHSND/HWC को रेफर करें (प्राथमिकता)</string>
+    <string name="refer_to_ncd_screening_day_vhsnd_hwc_for_ncd_screening_less_priority">NCD स्क्रीनिंग के लिए NCD स्क्रीनिंग दिवस/VHSND/HWC को रेफर करें (कम प्राथमिकता)</string>
+    <string name="send_the_patient_to_moic_of_nearest_health_center_for_treatment">इलाज के लिए रोगी को निकटतम स्वास्थ्य केंद्र के MOIC के पास भेजें</string>
+    <string name="refer_to_mo_and_collect_the_sputum_sample">MO को रेफर करें और थूक का नमूना लें</string>
+    <string name="inform_asha_facilitator">आशा सुविधाकर्ता को सूचित करें।</string>
+    <string name="total_score_wihout_semi_colon">\"कुल स्कोर \"</string>
+    <string name="total_score">\"कुल स्कोर : \"</string>
+    <string name="refer_to_mo_or_inform_anm_mpw_to_tracing_of_all_family_members">MO को रेफर करें या सभी परिवार के सदस्यों की ट्रेसिंग के लिए ANM/MPW को सूचित करें</string>
+    <string name="cbac">CBAC</string>
+    <string name="tb_screening">TB स्क्रीनिंग</string>
+    <string name="tb_screening_submitted">TB स्क्रीनिंग जमा हो गई</string>
+    <string name="screen">स्क्रीन</string>
+    <string name="tb_suspected_sputum_test">संदिग्ध TB थूक टेस्ट</string>
+    <string name="tb_tracking_submitted">TB ट्रैकिंग जमा हो गई</string>
+    <string name="track">ट्रैक</string>
+    <string name="filled_on">\"भरा गया \"</string>
+    <string name="save">सहेजें</string>
+    <string name="tb_suspected_alert">MO को रेफर करें और थूक का नमूना लें</string>
+    <string name="tb_suspected_alert_positive">MO को रेफर करें</string>
+    <string name="tb_suspected_family_alert">MO को रेफर करें या सभी परिवार के सदस्यों की ट्रेसिंग के लिए ANM/MPW को सूचित करें</string>
+    <string name="is_sputum_sample_collected">क्या थूक का नमूना लिया गया?</string>
+    <string name="sputum_sample_submitted_at">थूक का नमूना जमा किया गया</string>
+    <string name="nikshay_id">निक्षय ID</string>
+    <string name="sputum_test_result">थूक टेस्ट परिणाम</string>
+    <string name="referred_to_facility">सुविधा को रेफर किया गया</string>
+    <string name="facility_referral_follow_ups">सुविधा रेफरल फॉलो-अप</string>
+    <string-array name="tb_submitted_yet">
+        <item>DMC</item>
+        <item>SC</item>
+        <item>PHC</item>
+    </string-array>
+    <string-array name="tb_test_result">
+        <item>पॉजिटिव</item>
+        <item>नेगेटिव</item>
+    </string-array>
+    <string-array name="cbac_age">
+        <item>0-29 वर्ष</item>
+        <item>30-39 वर्ष</item>
+        <item>40-49 वर्ष</item>
+        <item>50-59 वर्ष</item>
+        <item>≥ 60 वर्ष</item>
+    </string-array>
+    <string-array name="cbac_smoke">
+        <item>कभी नहीं</item>
+        <item>पहले कभी लेते थे</item>
+        <item>रोज़</item>
+    </string-array>
+    <string-array name="cbac_alcohol">
+        <item>नहीं</item>
+        <item>हां</item>
+    </string-array>
+    <string-array name="cbac_waist_mes_female">
+        <item>80 सेमी या कम</item>
+        <item>81-90 सेमी</item>
+        <item>90 सेमी से अधिक</item>
+    </string-array>
+    <string-array name="cbac_waist_mes_male">
+        <item>90 सेमी या कम</item>
+        <item>91-100 सेमी</item>
+        <item>100 सेमी से अधिक</item>
+    </string-array>
+    <string-array name="cbac_pa">
+        <item>सप्ताह में कम से कम 150 मिनट</item>
+        <item>सप्ताह में 150 मिनट से कम</item>
+    </string-array>
+    <string-array name="cbac_fh">
+        <item>नहीं</item>
+        <item>हां</item>
+    </string-array>
+
+    <string-array name="cbac_type_Cooking_fuel">
+        <item>लकड़ी</item>
+        <item>फसल अवशेष</item>
+        <item>गोबर गैस</item>
+        <item>कोयला</item>
+        <item>मिट्टी का तेल</item>
+        <item>LPG</item>
+    </string-array>
+    <string-array name="cbac_type_occupational_exposure">
+        <item>फसल अवशेष जलाना</item>
+        <item>कचरा – पत्ते जलाना</item>
+        <item>ईंट भट्टे, कांच कारखाने आदि जैसे धुआं, गैस और धूल एक्सपोजर वाले उद्योगों में काम</item>
+    </string-array>
+    <string-array name="cbac_li">
+        <item>बिल्कुल नहीं</item>
+        <item>कई दिन</item>
+        <item>आधे से अधिक दिन</item>
+        <item>लगभग रोज़</item>
+    </string-array>
+    <string-array name="cbac_fd">
+        <item>बिल्कुल नहीं</item>
+        <item>कई दिन</item>
+        <item>आधे से अधिक दिन</item>
+        <item>लगभग रोज़</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 3b2b1fbf7..92a2819c8 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -15,7 +15,6 @@
     <string name="PREF_current_saved_language" translatable="false">Locale.Helper.Selected.Language</string>
     <string name="til_username_hint_text">ಬಳಕೆದಾರ ಹೆಸರು</string>
     <string name="login_failed">"Login failed"</string>
-    <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="next">ಮುಂದೆ</string>
     <string name="cancel">ರದ್ದುಮಾಡು</string>
@@ -94,8 +93,8 @@
     <string name="revisit_details_text">Revisit Details</string>
     <string name="case_record_text">ಕೇಸ್ ರೆಕಾರ್ಡ್</string>
 
-<!--    <string name="cbac">CBAC</string>-->
     <string name="anc">ANC</string>
+    <string name="anc_visits">ANC ಭೇಟಿಗಳು</string>
     <string name="pnc">PNC</string>
     <string name="immunization">Immunization</string>
     <string name="eligible_couple_tracking">Eligible Couple Tracking</string>
@@ -122,7 +121,7 @@
     <string name="benificiary_list">Benificiary List</string>
     <string name="title_activity_visit_details">VisitDetailsActivity</string>
     <string name="esanjeevni">eSanjeevani</string>
-    <string name="title_activity_web_view">WebViewActivity</string>
+
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>
@@ -133,7 +132,6 @@
     <string name="generate_abha_id">Create ABHA Number</string>
 
     <string name="aadhar_consent_text">I hereby confirm that I have explained the below mentioned consent process to the individual for the creation of the ABHA Number using he individual\'s aadhar number</string>
-    <string name="PREF_rem_me_uname">user-name-local-saved</string>
     <string name="title_activity_nav">NavActivity</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -307,7 +305,6 @@
     <string name="nav_item_1_text">Name : <b>%s</b></string>
     <string name="nav_item_2_text">Username : <b>%s</b></string>
     <string name="nav_item_3_text">User ID :  <b>%d</b></string>
-    <string name="PREF_user_entry">logged-in-user</string>
     <string name="individual_s_consent_for_creation_of_abha_number">Individual’s consent for creation of ABHA Number.</string>
     <string name="ok">Ok</string>
     <string name="exit">Exit</string>
@@ -376,7 +373,6 @@
     <string name="note_ben_reg">Note!</string>
     <string name="please_search_for_beneficiary">No matching patient found. Please choose an option from below.</string>
     <string name="no_patient_found">No matching patient found.Please select an option.</string>
-    <string name="pref_location_data">pref_location_data</string>
     <string name="chief_complaint2">Chief Complaint List</string>
     <string name="beneficiary_name">ಫಲಾನುಭವಿ ಹೆಸರು:</string>
     <string name="abha_no">ಎ.ಬಿ.ಎಚ್.ಎ ಐ.ಡಿ:</string>
@@ -390,7 +386,6 @@
     <string name="abha">ಎ.ಬಿ.ಎಚ್.ಎ</string>
     <string name="view_batch">View Batch</string>
     <string name="unsyncedNurseData">There are unsynced nurse data found. please sync and try again</string>
-    <string name="password_local_saved">password-local-saved</string>
     <string name="remember_me">ನನ್ನನ್ನು ನೆನಪಿನಲ್ಲಿ ಇಡು</string>
     <string name="ben_card_name">ಹೆಸರು:</string>
     <string name="beneficiary_id">Beneficiary ID:</string>
@@ -446,19 +441,673 @@
 
     <string name="form_input_empty_error">Required field cannot be empty !</string>
     <string name="form_input_upper_case_error">Only Alphabets in upper case allowed!</string>
-    <string name="form_input_missing_entry_error">Field must contain %1d digits.</string>
+    <string name="form_input_missing_entry_error">Field must contain %1$d digits.</string>
     <string name="form_input_alphabet_space_only_error">Only Alphabets and whitespace allowed!</string>
     <string name="form_input_alphabet_special_only_error">Only Alphabets and special characters allowed!</string>
-    <string name="form_input_min_limit_error">%1s should be greater than or equal to %2d</string>
+    <string name="form_input_min_limit_error">%1$s should be greater than or equal to %2$d</string>
     <string name="form_input_alph_numeric_space_only_error">Only Alphabets and Numerics allowed!</string>
     <string name="form_input__no_alpha_space_error">No Alphabets or spaces allowed!</string>
     <string name="form_input_digit_only_error">Only Digits allowed!</string>
-    <string name="form_input_min_limit_error_decimal">%1s should be greater than or equal to %2.1f</string>
-    <string name="form_input_max_limit_error">%1s should be lesser than or equal to %2d</string>
-    <string name="form_input_max_limit_error_decimal">%1s should be lesser than or equal to %2.1f</string>
+    <string name="form_input_min_limit_error_decimal">%1$s should be greater than or equal to %2$.1f</string>
+    <string name="form_input_max_limit_error">%1$s should be lesser than or equal to %2$d</string>
+    <string name="form_input_max_limit_error_decimal">%1$s should be lesser than or equal to %2$.1f</string>
     <string name="form_input_error_invalid_mobile">Invalid Mobile Number !</string>
     <string name="form_input_error_invalid_rch">Invalid RCH ID !</string>
     <string name="form_input_error_invalid_mcp">Invalid MCP Number !</string>
     <string name="form_input_error_invalid_aadhar">Invalid Aadhaar Number !</string>
     <string name="edd_date">EDD Date</string>
-</resources>
\ No newline at end of file
+    <string name="delivery_date">ಪ್ರಸವದ ದಿನಾಂಕ</string>
+
+    <!-- Status of Woman -->
+    <string name="status_of_woman">ಮಹಿಳೆಯ ಸ್ಥಿತಿ <font color="#FF0000">*</font></string>
+    <string name="select_status_of_woman">ಮಹಿಳೆಯ ಸ್ಥಿತಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="antra_next_due_date">ANTRA ಮುಂದಿನ ನಿಗದಿತ ದಿನಾಂಕ</string>
+
+    <!-- Mental Health Screening Strings - Kannada -->
+    <!-- Form Title and Success Message -->
+    <string name="title_mental_health_screening">ಮಾನಸಿಕ ಆರೋಗ್ಯ ಪರೀಕ್ಷೆ</string>
+    <string name="mental_health_screening_saved">ಮಾನಸಿಕ ಆರೋಗ್ಯ ಪರೀಕ್ಷೆ ಯಶಸ್ವಿಯಾಗಿ ಸಂರಕ್ಷಿತವಾಗಿದೆ</string>
+
+
+
+    <!-- Initial Screening Questions -->
+    <string name="emotional_behavioural_concerns">ಮಾನಸಿಕ ಅಥವಾ ವರ್ತನೆಶೀಲ ಕಾಳಜಿ ಇದೆ</string>
+    <string name="substance_use_concerns">ಮಾದಕ ಪದಾರ್ಥ ಬಳಕೆ ಸಂಬಂಧಿತ ಕಾಳಜಿ ಇದೆ</string>
+    <string name="self_harm_suicide_thoughts">ಸ್ವ-ಅನಿಷ್ಟ ಅಥವಾ ಆತ್ಮಹತ್ಯೆಯ ಚಿಂತನೆ ಇದೆ</string>
+    <string name="memory_loss_confusion">ಸ್ಮೃತಿ ನಷ್ಟ ಅಥವಾ ಗೊಂಬೆತನೆ ಇದೆ</string>
+    <string name="seizures_fits_loc">ಆಲೋಪ, ಫಿಟ್ಸ್ ಅಥವಾ ಪ್ರಜ್ಞೆಯ ನಷ್ಟ ಇದೆ</string>
+    <string name="postpartum_woman">ಪ್ರಸವೋತ್ತರ ಮಹಿಳೆ (≤12 ತಿಂಗಳುಗಳ ನಂತರ)</string>
+
+    <!-- PHQ-9 Depression Screening -->
+    <string name="phq9_section_title">PHQ-9 ನಿರಾಳೆಯ ಪರೀಕ್ಷೆ</string>
+    <string name="phq9_little_interest">ವಸ್ತುಗಳಲ್ಲಿ ಸ್ವಾರ್ಥ ಅಥವಾ ಆನಂದದ ಕೊರತೆ</string>
+    <string name="phq9_feeling_down">ಕೆಳಮುಖ, ನಿರಾಶ, ಅಥವಾ ನಿರಾಶಾವಾದಿ ಅನುಭವ</string>
+    <string name="phq9_sleep_trouble">ನಿದ್ರಾ ಸಮಸ್ಯೆ ಅಥವಾ ಹೆಚ್ಚು ನಿದ್ರೆ</string>
+    <string name="phq9_feeling_tired">ಆಯಾಸ ಅಥವಾ ಶಕ್ತಿಯ ಕೊರತೆ ಅನುಭವ</string>
+    <string name="phq9_appetite">ಹಸಿವೆಯ ಕೊರತೆ ಅಥವಾ ಹೆಚ್ಚು ತಿನ್ನುವುದು</string>
+    <string name="phq9_feeling_bad">ನಿಜ ಬಗ್ಗೆ ಕೇಪನೆ ಅನುಭವ ಅಥವಾ ವಿಫಲತೆ</string>
+    <string name="phq9_concentration">ವಿಷಯಗಳಿಗೆ ಗಮನ ಹರಿಸುವುದರಲ್ಲಿ ತೊಂದರೆ</string>
+    <string name="phq9_moving_slowly">ನಿಧಾನವಾಗಿ ಚಲನೆ ಅಥವಾ ತಗ್ಗುಪ್ರಿತು</string>
+    <string name="phq9_self_harm_thoughts">ಸ್ವ-ಅನಿಷ್ಟ ಅಥವಾ ಆತ್ಮಹತ್ಯೆಯ ಚಿಂತನೆ</string>
+    <string name="phq9_total_score">PHQ-9 ಒಟ್ಟು ಸ್ಕೋರ್</string>
+
+    <string-array name="phq9_options">
+        <item>0 - ಬಿಲ್ಕುಲ್ ಅಲ್ಲ</item>
+        <item>1 - ಕೆಲವು ದಿನಗಳು</item>
+        <item>2 - ಅರ್ಧಕ್ಕಿಂತ ಹೆಚ್ಚುದಿನಗಳು</item>
+        <item>3 - ಬಹುತೇಕ ಪ್ರತಿದಿನ</item>
+    </string-array>
+
+    <!-- Substance Use Screening & Brief Intervention -->
+    <string name="substance_section_title">ಮಾದಕ ಪದಾರ್ಥ ಬಳಕೆ ಪರೀಕ್ಷೆ ಮತ್ತು ಸಂಕ್ಷಿಪ್ತ ಹಸ್ತಕ್ಷೇಪ</string>
+    <string name="substance_alcohol_use">ಆಲ್ಕೋಹಾಲ್ ಬಳಕೆ</string>
+    <string name="substance_tobacco_use">ತಂಬಾಕು ಬಳಕೆ</string>
+    <string name="substance_other_use">ಇತರ ಮಾದಕ ಬಳಕೆ</string>
+    <string name="substance_other_specify">ಇತರ ಮಾದಕ ನಿರ್ದಿಷ್ಟ</string>
+    <string name="substance_frequency">ಮಾದಕ ಬಳಕೆಯ ಆವರ್ತನೆ</string>
+    <string name="brief_intervention_given">ಸಂಕ್ಷಿಪ್ತ ಹಸ್ತಕ್ಷೇಪ ನೀಡಲಾಯಿತು</string>
+
+    <string-array name="substance_frequency_options">
+        <item>ಪ್ರತಿದಿನ</item>
+        <item>ಸಾಪ್ತಾಹಿಕ</item>
+        <item>ಮಾಸಿಕ</item>
+        <item>ಯಾವಾಗಲೂ</item>
+    </string-array>
+
+    <!-- Suicide Risk Screening -->
+    <string name="suicide_section_title">ಆತ್ಮಹತ್ಯೆ ಅಪಾಯ ಪರೀಕ್ಷೆ</string>
+    <string name="suicide_current_thoughts">ಆತ್ಮಹತ್ಯೆ ಅಥವಾ ಸ್ವ-ಅನಿಷ್ಟದ ಚಿರಂತನ ಚಿಂತನೆ</string>
+    <string name="suicide_plan">ಸ್ವ-ಅನಿಷ್ಟಕ್ಕೆ ನಿರ್ದಿಷ್ಟ ಯೋಜನೆ ಇದೆ</string>
+    <string name="suicide_previous_attempt">ಹಿಂದಿನ ಆತ್ಮಹತ್ಯೆ ಪ್ರಯತ್ನ</string>
+    <string name="suicide_hopelessness">ನಿರಾಶೆ ಅಥವಾ ಬೋಝ ಎಂದು ವ್ಯಕ್ತಪಡಿಸಿದ</string>
+    <string name="suicide_risk_level">ಆತ್ಮಹತ್ಯೆ ಅಪಾಯ ಮಟ್ಟ</string>
+
+    <string-array name="suicide_risk_options">
+        <item>ಕಡಿಮೆ</item>
+        <item>ಮಧ್ಯಮ</item>
+        <item>ಹೆಚ್ಚು</item>
+    </string-array>
+
+    <!-- Dementia Screening Checklist -->
+    <string name="dementia_section_title">ಡಿಮೆನ್ಶಿಯಾ ಪರೀಕ್ಷೆ ಪಟ್ಟಿ</string>
+    <string name="dementia_progressive_memory_loss">ಪ್ರಗತಿಶೀಲ ಸ್ಮೃತಿ ನಷ್ಟ</string>
+    <string name="dementia_forgetting_recent">ಇತ್ತೀಚಿನ ಘಟನೆಗಳನ್ನು ಮರೆತುಬಿಡುವುದು</string>
+    <string name="dementia_disorientation">ಸಮಯ/ಸ್ಥಾನಕ್ಕೆ ದಿಕ್ಕುಕಳೆತ</string>
+    <string name="dementia_daily_activities">ದೈನಂದಿನ ಚಟುವಟಿಕೆ ನಿರ್ವಹಿಸಲು ತೊಂದರೆ</string>
+    <string name="dementia_behavioural_changes">ವರ್ತನೆ ಪರಿವರ್ತನೆ</string>
+
+    <!-- Epilepsy Screening Checklist -->
+    <string name="epilepsy_section_title">ಮೃಗ್ಮಟಿ ಪರೀಕ್ಷೆ ಪಟ್ಟಿ</string>
+    <string name="epilepsy_recurrent_seizures">ಪುನರಾವರ್ತಿತ ಆಲೋಪ/ಫಿಟ್ಸ್</string>
+    <string name="epilepsy_jerky_movements">ಎಪಿಸೋಡ್ ಸಮಯದಲ್ಲಿ ಜೆರ್ಕಿ ಚಲನೆ</string>
+    <string name="epilepsy_tongue_bite">ಎಪಿಸೋಡ್ ಸಮಯದಲ್ಲಿ ನಾಲಿಗೆ ಕಚ್ಚುವುದು ಅಥವಾ ಅಸಂಬದ್ಧತೆ</string>
+    <string name="epilepsy_confusion_after">ಎಪಿಸೋಡ್ ನಂತರ ಗೊಂಬೆತನೆ</string>
+    <string name="epilepsy_loc_duration">ಚೇತನ್ಯ ನಷ್ಟದ ಅವಧಿ</string>
+
+    <string-array name="epilepsy_duration_options">
+        <item>5 ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ</item>
+        <item>5–15 ನಿಮಿಷಗಳು</item>
+        <item>15 ನಿಮಿಷಕ್ಕಿಂತ ಹೆಚ್ಚು</item>
+    </string-array>
+
+    <!-- Mental Health Referral Reasons -->
+    <string name="mental_health_reason_for_referral">ನಿರ್ದೇಶನದ ಕಾರಣ</string>
+    <string-array name="mental_health_referral_reasons">
+        <item>ನಿರಾಳೆ (PHQ-9 ಸ್ಕೋರ್ ≥10)</item>
+        <item>ಆತ್ಮಹತ್ಯೆ ಅಪಾಯವನ್ನು ಗುರುತಿಸಲಾಯಿತು</item>
+        <item>ಮಾದಕ ಬಳಕೆ ಅಸ್ವಾಭಾವಿಕತೆ</item>
+        <item>ಡಿಮೆನ್ಶಿಯಾ ಸಂದೇಹಿತ</item>
+        <item>ಮೃಗ್ಮಟಿ ಸಂದೇಹಿತ</item>
+        <item>ಪ್ರಸವೋತ್ತರ ನಿರಾಳೆ</item>
+        <item>ತೀವ್ರ ಮಾನಸಿಕ ಅವ್ಯವಸ್ಥೆ ಸಂದೇಹಿತ</item>
+        <item>ಇತರೆ</item>
+    </string-array>
+
+    <!-- Yes/No Options Array -->
+    <string-array name="yes_no_options">
+        <item>ಹೌದು</item>
+        <item>ಇಲ್ಲ</item>
+    </string-array>
+    <!-- Nose Diagnosis Dataset -->
+    <string name="difficulty_in_breathing">ಉಸಿರಾಡಲು ತೊಂದರೆ</string>
+    <string name="open_mouth_breathing">ಬಾಯಿ ತೆರೆದು ಉಸಿರಾಡುವುದು</string>
+    <string name="nose_bleed_title">ಮೂಗಿನಲ್ಲಿ ರಕ್ತಸ್ರಾವ</string>
+    <string name="systolic_bp_title">ಸಿಸ್ಟೊಲಿಕ್ ಬಿಪಿ (mmHg)</string>
+    <string name="diastolic_bp_title">ಡಯಾಸ್ಟೊಲಿಕ್ ಬಿಪಿ (mmHg)</string>
+    <string name="foreign_body_nose_title">ಮೂಗಿನಲ್ಲಿ ಬಾಹ್ಯ ವಸ್ತು</string>
+    <string name="foreign_body_anterior">ಹೌದು (ಮುಂಭಾಗದಲ್ಲಿ ಕಾಣಿಸುವುದು)</string>
+    <string name="foreign_body_posterior">ಹೌದು (ಹಿಂಭಾಗದಲ್ಲಿ ಕಾಣಿಸುವುದು)</string>
+    <string name="sinusitis_title">ಸೈನಸೈಟಿಸ್</string>
+    <string name="sinusitis_with_pain">ಹೌದು (ಮುಖದ ನೋವು / ಸೂಕ್ಷ್ಮತೆ)</string>
+
+    <!-- Nose Diagnosis Alert Messages -->
+    <string name="difficulty_in_breathing_alert">ಉಸಿರಾಡಲು ತೊಂದರೆ. URI / Rhinitis / Sinusitis ಪತ್ತೆಮಾಡಿ. HWC ನಲ್ಲಿ ನಿರ್ವಹಿಸದಿದ್ದರೆ ತಜ್ಞರಿಗೆ ಕಳುಹಿಸಿ.</string>
+    <string name="open_mouth_breathing_alert">ಬಾಯಿ ತೆರೆದು ಉಸಿರಾಡುವುದು. URI / Rhinitis / Sinusitis ಪತ್ತೆಮಾಡಿ. HWC ನಲ್ಲಿ ನಿರ್ವಹಿಸದಿದ್ದರೆ ತಜ್ಞರಿಗೆ ಕಳುಹಿಸಿ.</string>
+    <string name="nose_bleed_alert_systolic_bp">ಸಿಸ್ಟೋಲಿಕ್ ಬಿಪಿ &gt; 120 mmHg. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="nose_bleed_alert_diastolic_bp">ಡಯಾಸ್ಟೋಲಿಕ್ ಬಿಪಿ &gt; 80 mmHg. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="foreign_body_posterior_alert">ಹಿಂಭಾಗದಲ್ಲಿ ಬಾಹ್ಯ ವಸ್ತು ಗೋಚರಿಸಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="sinusitis_alert">ದೀರ್ಘಕಾಲದ ಸೈನಸೈಟಿಸ್ ಶಂಕಿಸಲಾಗಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+
+    <string-array name="nose_foreign_body_options">
+        <item>ಹೌದು (ಮುಂಭಾಗದಲ್ಲಿ ಕಾಣಿಸುವುದು)</item>
+        <item>ಹೌದು (ಹಿಂಭಾಗದಲ್ಲಿ ಕಾಣಿಸುವುದು)</item>
+        <item>ಇಲ್ಲ</item>
+    </string-array>
+    <!-- Throat Diagnosis Dataset -->
+    <string name="throat_diagnosis_symptoms">ರೋಗಲಕ್ಷಣಗಳು</string>
+    <string name="throat_symptom_pain">ನೋವು</string>
+    <string name="throat_symptom_soreness">ಗಂಟಲು ನೋವು / ಉರಿ</string>
+    <string name="throat_symptom_cold">ಸಂಬಂಧಿತ ಶೀತ</string>
+    <string name="throat_symptom_itching">ತುರಿಕೆ</string>
+    <string name="throat_symptom_hoarseness">ಸ್ವರ ಗಡಸಾಗುವಿಕೆ</string>
+    <string name="throat_diagnosis_neck_swelling">ಕುತ್ತಿಗೆ ಊತವಿದೆ</string>
+    <string name="throat_diagnosis_difficulty_swallowing">ನುಂಗಲು ತೊಂದರೆ</string>
+    <string name="throat_diagnosis_tonsillitis">ಟಾನ್ಸಿಲೈಟಿಸ್</string>
+    <string name="throat_diagnosis_pharyngitis">ಫಾರಂಜಿಟಿಸ್ (Pharyngitis)</string>
+    <string name="throat_diagnosis_laryngitis">ಲಾರಿಂಜೈಟಿಸ್ (Laryngitis)</string>
+    <string name="throat_diagnosis_sinusitis">ಸೈನಸೈಟಿಸ್</string>
+    <string name="throat_diagnosis_cleft_lip">ಬಿರುಕು ಬಿಟ್ಟ ತುಟಿ (Cleft Lip)</string>
+    <string name="throat_diagnosis_cleft_palate">ಬಿರುಕು ಬಿಟ್ಟ ಅಣ್ಣ (Cleft Palate)</string>
+
+    <string name="throat_alert_neck_swelling">ಕುತ್ತಿಗೆ ಊತ ಪತ್ತೆಯಾಗಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="throat_alert_difficulty_swallowing">ನುಂಗಲು ತೊಂದರೆ ಪತ್ತೆಯಾಗಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="throat_alert_cleft_lip">ತುಟಿ ಸೀಳು ಸೇರಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+    <string name="throat_alert_cleft_palate">ಅಂಗುಳಿನ ಸೀಳು ಸೇರಿದೆ. ರೋಗಿಯನ್ನು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಕಳುಹಿಸಿ.</string>
+
+    <!-- Ophthalmic Screening -->
+    <string name="ophthalmic_screening_title">ನೇತ್ರ ತಪಾಸಣೆ</string>
+    <string name="ophthalmic_symptomatic_title">ನೇತ್ರ ರೋಗಲಕ್ಷಣ</string>
+    <string name="ophthalmic_screening_section_title">ಅಂಧತ್ವ ಮತ್ತು ವಕ್ರೀಭವನ ದೋಷಗಳಿಗೆ ತಪಾಸಣೆ</string>
+    <string name="ophthalmic_is_diabetic">ರೋಗಿಗೆ ಮಧುಮೇಹವಿದೆಯೇ? <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_screening_performed">ಮಧುಮೇಹ ರೋಗಿಗೆ ತಪಾಸಣೆ ಮಾಡಲಾಗಿದೆ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_right">ದೂರ ದೃಷ್ಟಿ ತೀಕ್ಷ್ಣತೆ \u2013 ಬಲ ಕಣ್ಣು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_left">ದೂರ ದೃಷ್ಟಿ ತೀಕ್ಷ್ಣತೆ \u2013 ಎಡ ಕಣ್ಣು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_visual_impairment_alert">ಶಂಕಿತ ದೃಷ್ಟಿ ದೋಷ</string>
+    <string name="ophthalmic_reason_for_visit">ಭೇಟಿಯ ಕಾರಣ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_near_va">ಹತ್ತಿರದ ದೃಷ್ಟಿ ತೀಕ್ಷ್ಣತೆ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_chart_used">ದೃಷ್ಟಿ ತೀಕ್ಷ್ಣತೆ ಚಾರ್ಟ್ ಬಳಸಲಾಗಿದೆ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_case_identification_title">ಪ್ರಕರಣ ಗುರುತಿಸುವಿಕೆ</string>
+    <string name="ophthalmic_case_id_alert">ಶಂಕಿತ ದೃಷ್ಟಿ ದೋಷ ಗುರುತಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಕೆಳಗೆ ಪ್ರಕರಣ ಗುರುತಿಸುವಿಕೆ ಪೂರ್ಣಗೊಳಿಸಿ.</string>
+    <string name="ophthalmic_case_id_conditions">ಪ್ರಕರಣ ಗುರುತಿಸುವಿಕೆ ಮತ್ತು ಸ್ಥಿತಿ(ಗಳು)</string>
+    <string name="ophthalmic_case_id_conditions_mandatory">ಪ್ರಕರಣ ಗುರುತಿಸುವಿಕೆ ಮತ್ತು ಸ್ಥಿತಿ(ಗಳು) <font color="#FF0000">*</font></string>
+    <string name="select_conditions">ಸ್ಥಿತಿ(ಗಳನ್ನು) ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="ophthalmic_vitamin_a_deficiency">ವಿಟಮಿನ್ ಎ ಕೊರತೆ / ಜೆರೋಫ್ಥಾಲ್ಮಿಯಾ</string>
+    <string name="ophthalmic_cataract_symptoms">ಕಣ್ಣಿನ ಪೊರೆ ಲಕ್ಷಣಗಳು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_glaucoma_symptoms">ಗ್ಲಾಕೋಮಾ ಲಕ್ಷಣಗಳು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dr_symptoms">ಮಧುಮೇಹ ರೆಟಿನೋಪತಿ ಲಕ್ಷಣಗಳು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_presbyopia_symptoms">ಪ್ರೆಸ್ಬಯೋಪಿಯಾ ಲಕ್ಷಣಗಳು <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_trachoma_status">ಟ್ರಕೋಮಾ ಸ್ಥಿತಿ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_corneal_disease_type">ಕಾರ್ನಿಯಲ್ ರೋಗದ ಪ್ರಕಾರ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_vitamin_a_deficiency_label">ವಿಟಮಿನ್ ಎ ಕೊರತೆ ಲಕ್ಷಣಗಳು / ಬಿಟಾಟ್\'ಸ್ ಸ್ಪಾಟ್ ಗುರುತಿಸಲಾಗಿದೆ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_trachoma_status">ಟ್ರಕೋಮಾ ಸ್ಥಿತಿ ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="ophthalmic_select_corneal_disease_type">ಕಾರ್ನಿಯಲ್ ರೋಗದ ಪ್ರಕಾರ ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="ophthalmic_alert_ophthalmologist_referral">ರೋಗಿಯನ್ನು ದ್ವಿತೀಯ ಹಂತದ ನೇತ್ರ ವೈದ್ಯರ ಬಳಿ ಕಳುಹಿಸಿ.</string>
+    <string name="ophthalmic_alert_presbyopia_management">ರೋಗಿಯು ಪ್ರೆಸ್ಬಯೋಪಿಯಾ ನಿರ್ವಹಣೆಗೆ (ಓದುವ ಕನ್ನಡಕ) ಅರ್ಹರಾಗಿರಬಹುದು.</string>
+    <string name="ophthalmic_alert_vitamin_a">ವಿಟಮಿನ್ ಎ ಪ್ರೊಫಿಲ್ಯಾಕ್ಸಿಸ್ ನೀಡಬೇಕು. ರೋಗಿಯನ್ನು ದ್ವಿತೀಯ ಹಂತದ ನೇತ್ರ ವೈದ್ಯರ ಬಳಿ ಕಳುಹಿಸಿ.</string>
+    <string name="ophthalmic_injury_trauma_title">ಗಾಯ ಮತ್ತು ಆಘಾತ ಫಾರ್ಮ್</string>
+    <string name="ophthalmic_injury_type_label">ಗಾಯದ ಪ್ರಕಾರ <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_injury_type">ಗಾಯದ ಪ್ರಕಾರ ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="ophthalmic_foreign_body_removal_attempted">ವಿದೇಶಿ ವಸ್ತು ತೆಗೆಯುವ ಪ್ರಯತ್ನ ಮಾಡಲಾಗಿದೆ</string>
+    <string name="ophthalmic_chemical_exposure_wash_performed">ರಾಸಾಯನಿಕ ಸಂಪರ್ಕ \u2013 ಸಂಪೂರ್ಣ ತೊಳೆಯಲಾಗಿದೆ</string>
+
+    <string-array name="ophthalmic_reason_for_visit_options">
+        <item>ಸ್ಕ್ರೀನಿಂಗ್</item>
+        <item>ರೋಗ ಲಕ್ಷಣ</item>
+        <item>ಕಣ್ಣಿನ ಗಾಯ/ಆಘಾತದ ಪ್ರಥಮ ಚಿಕಿತ್ಸೆ</item>
+    </string-array>
+
+    <string-array name="ophthalmic_chart_options">
+        <item>ಸ್ನೆಲೆನ್ ದೂರದ ಚಾರ್ಟ್</item>
+        <item>ಹತ್ತಿರದ ದೃಷ್ಟಿ ಚಾರ್ಟ್</item>
+    </string-array>
+
+    <string-array name="ophthalmic_case_id_options">
+        <item>ಕಣ್ಣಿನ ಪೊರೆ</item>
+        <item>ಗ್ಲುಕೋಮಾ</item>
+        <item>ಡಯಾಬಿಟಿಕ್ ರೆಟಿನೋಪತಿ</item>
+        <item>ಪ್ರೆಸ್ಬಯೋಪಿಯಾ</item>
+        <item>ಟ್ರಕೋಮಾ</item>
+        <item>ಕಾರ್ನಿಯಲ್ ಕಾಯಿಲೆ</item>
+        <item>ಕಣ್ಣಿನ ಉರಿಯೂತ</item>
+        <item>ಒಣ ಕಣ್ಣು</item>
+        <item>ಕಣ್ಣಿನ ಅಲರ್ಜಿ</item>
+    </string-array>
+
+    <string-array name="ophthalmic_injury_type_options">
+        <item>ಯಾಂತ್ರಿಕ ಬಾಹ್ಯ ವಸ್ತು</item>
+        <item>ಮೃದುವಾದ ಆಘಾತ</item>
+        <item>ಚುಚ್ಚುವ ಗಾಯದ ಶಂಕೆ</item>
+        <item>ರಾಸಾಯನಿಕ (ಆಮ್ಲ/ಕ್ಷಾರ/ಇತರ)</item>
+    </string-array>
+
+    <string-array name="ophthalmic_foreign_body_options">
+        <item>ಪ್ರಯತ್ನಿಸಿಲ್ಲ</item>
+        <item>ಕಣ್ಣಿನ ಪೊರೆಯಿಂದ ಪ್ರಯತ್ನಿಸಲಾಗಿದೆ</item>
+        <item>ಕಾರ್ನಿಯಾದಲ್ಲಿ ಸಿಕ್ಕಿಕೊಂಡ ಬಾಹ್ಯ ವಸ್ತು</item>
+    </string-array>
+
+    <string-array name="ophthalmic_trachoma_options">
+        <item>ಶಂಕಿತ ಸಕ್ರಿಯ ಟ್ರಕೋಮಾ</item>
+        <item>ಶಂಕಿತ TT/TI</item>
+        <item>ಟ್ರಕೋಮಾ ಇಲ್ಲ</item>
+    </string-array>
+
+    <string-array name="ophthalmic_corneal_disease_options">
+        <item>ಕಾರ್ನಿಯಲ್ ಅಪಾರದರ್ಶಕತೆ</item>
+        <item>ಶಂಕಿತ ಕಾರ್ನಿಯಲ್ ಅಲ್ಸರ್</item>
+        <item>ಇತರ ಕಾರ್ನಿಯಲ್ ಕಾಯಿಲೆಗಳು</item>
+    </string-array>
+    <string name="saved_successfully">ಯಶಸ್ವಿಯಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="save_failed_retry">ಉಳಿಸಲು ವಿಫಲವಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+    <string name="please_complete_field">ದಯವಿಟ್ಟು ಪೂರ್ಣಗೊಳಿಸಿ: %s</string>
+
+    <!-- Oral Health Dataset -->
+    <string name="oral_tooth_decay_present">ಹಲ್ಲು ಕೊಳೆತ ಇದೆ</string>
+    <string name="oral_tooth_decay_symptoms">ಹಲ್ಲು ಕೊಳೆತದ ಲಕ್ಷಣಗಳು</string>
+    <string name="oral_symptom_black_spot">ಕಪ್ಪು ಚುಕ್ಕೆ</string>
+    <string name="oral_symptom_discoloration">ಹಲ್ಲಿನ ಕುಳಿಯಲ್ಲಿ ಬಣ್ಣ ಬದಲಾವಣೆ</string>
+    <string name="oral_symptom_hole">ಹಲ್ಲಿನಲ್ಲಿ ರಂಧ್ರ</string>
+    <string name="oral_symptom_sensitivity">ಬಿಸಿ ಮತ್ತು ತಂಪು, ಸಿಹಿ ಮತ್ತು ಹುಳಿಗೆ ಸಂವೇದನಾಶೀಲತೆ</string>
+    <string name="oral_symptom_food_lodgment">ಕುಳಿ/ಹಲ್ಲುಗಳ ನಡುವೆ ಆಹಾರ ಸಿಕ್ಕಿಕೊಳ್ಳುವುದು</string>
+    <string name="oral_symptom_pain">ನೋವು</string>
+    <string name="oral_symptom_swelling">ಊತ</string>
+    <string name="oral_symptom_pus_discharge">ಕೀವು ಸ್ರಾವ</string>
+    <string name="oral_gum_disease_present">ಒಸಡು ರೋಗಗಳು ಇವೆ</string>
+    <string name="oral_gum_disease_symptoms">ಒಸಡು ರೋಗಗಳ ಲಕ್ಷಣಗಳು</string>
+    <string name="oral_gum_foul_smell">ದುರ್ವಾಸನೆ</string>
+    <string name="oral_gum_bleeding">ಒಸಡುಗಳಿಂದ ರಕ್ತಸ್ರಾವ</string>
+    <string name="oral_gum_deposits">ಹಲ್ಲಿನ ಮೇಲೆ ಶೇಖರಣೆ ಮತ್ತು ಬಣ್ಣ ಬದಲಾವಣೆ</string>
+    <string name="oral_gum_loose_teeth">ಸಡಿಲ ಹಲ್ಲುಗಳು</string>
+    <string name="oral_gum_widening_gap">ಹಲ್ಲುಗಳ ನಡುವಿನ ಅಂತರ ಹೆಚ್ಚುತ್ತಿದೆ</string>
+    <string name="oral_gum_swollen">ಊದಿಕೊಂಡ ಒಸಡುಗಳು</string>
+    <string name="oral_irregular_teeth_jaws">ಅನಿಯಮಿತ ಹಲ್ಲುಗಳು/ದವಡೆ</string>
+    <string name="oral_abnormal_growth_ulcer">ಅಸಹಜ ಬೆಳವಣಿಗೆ/ಹುಣ್ಣು</string>
+    <string name="oral_cleft_lip_palate">ಸೀಳು ತುಟಿ/ಅಂಗುಳ</string>
+    <string name="oral_dental_fluorosis">ದಂತ ಫ್ಲೋರೋಸಿಸ್</string>
+    <string name="oral_dental_emergency">ದಂತ ತುರ್ತು ಪರಿಸ್ಥಿತಿ</string>
+    <string name="oral_emergency_pain">ನೋವು</string>
+    <string name="oral_emergency_abscess">ಕುರು (Abscess)</string>
+    <string name="oral_emergency_swelling">ಊತ</string>
+    <string name="oral_emergency_tooth_injury">ಹಲ್ಲಿನ ಗಾಯ</string>
+    <string name="oral_emergency_avulsion">ಹಲ್ಲು ಕಿತ್ತುಹೋಗುವಿಕೆ (Avulsion)</string>
+    <string name="oral_emergency_non_healing_ulcer">ವಾಸಿಯಾಗದ ಹುಣ್ಣು</string>
+    <string name="oral_emergency_uncontrolled_bleeding">ನಿಯಂತ್ರಿಸಲಾಗದ ರಕ್ತಸ್ರಾವ</string>
+    <string name="oral_emergency_trauma">ಆಘಾತ (ಮುರಿದ ದವಡೆ/ಅಲುಗಾಡುವ ಹಲ್ಲುಗಳು)</string>
+    <string name="oral_health_referral_alert">ರೋಗಿಯನ್ನು ದ್ವಿತೀಯ ಹಂತದ ದಂತ ವೈದ್ಯರ ಬಳಿ ಕಳುಹಿಸಿ.</string>
+
+    <!-- Palliative Care / Pain and Symptom Assessment -->
+    <string name="palliative_care_identification_headline">ಉಪಶಮನ ಆರೈಕೆ ಗುರುತಿಸುವಿಕೆ (Palliative Care)</string>
+    <string name="pain_symptom_assessment_palliative">ನೋವು ಮತ್ತು ರೋಗಲಕ್ಷಣಗಳ ಮೌಲ್ಯಮಾಪನ</string>
+    
+    <string name="persistent_pain_present">ನಿರಂತರ ನೋವು ಇದೆ</string>
+    <string name="pain_severity">ನೋವಿನ ತೀವ್ರತೆ</string>
+    <string name="pain_duration">ನೋವಿನ ಅವಧಿ</string>
+    <string name="pain_duration_less_than_one_month">&lt; 1 ತಿಂಗಳು</string>
+    <string name="pain_duration_one_to_six_months">1–6 ತಿಂಗಳು</string>
+    <string name="pain_duration_more_than_six_months">&gt; 6 ತಿಂಗಳು</string>
+    <string name="mild">ಸೌಮ್ಯ</string>
+    <string name="moderate">ಮಧ್ಯಮ</string>
+    <string name="severe">ತೀವ್ರ</string>
+
+    <string name="other_symptoms_present">ಇತರ ಲಕ್ಷಣಗಳು ಇವೆ</string>
+    <string name="other_symptoms_severity">ಇತರ ಲಕ್ಷಣಗಳ ತೀವ್ರತೆ</string>
+    <string name="immediate_relief_provided">ತಕ್ಷಣದ ಪರಿಹಾರ ಒದಗಿಸಲಾಗಿದೆ</string>
+    
+    <string name="symptom_assessment_basic_title">ಲಕ್ಷಣಗಳ ಮೌಲ್ಯಮಾಪನ</string>
+    <string name="symptom_assessment_basic_field_title">ರೋಗಲಕ್ಷಣಗಳು</string>
+    <string name="symptom_nausea_vomiting">ವಾಕರಿಕೆ / ವಾಂತಿ</string>
+    <string name="symptom_constipation">ಮಲಬದ್ಧತೆ</string>
+    <string name="symptom_anxiety_restlessness">ಆತಂಕ / ಚಡಪಡಿಕೆ</string>
+    <string name="symptom_sleep_disturbance">ನಿದ್ರಾಹೀನತೆ</string>
+    <string name="breathlessness">ಉಸಿರಾಟದ ತೊಂದರೆ</string>
+    <string name="nausea">ವಾಕರಿಕೆ</string>
+    <string name="fatigue">ಆಯಾಸ</string>
+    <string name="weakness">ದೌರ್ಬಲ್ಯ</string>
+    <string name="other">ಇತರ</string>
+    
+    <string name="basic_management_cho_level_title">ಮೂಲ ನಿರ್ವಹಣೆ</string>
+    <string name="basic_symptom_relief_provided">ಮೂಲ ರೋಗಲಕ್ಷಣ ಪರಿಹಾರ ನೀಡಲಾಗಿದೆ</string>
+    <string name="basic_psychosocial_support_provided">ಮನೋಸಾಮಾಜಿಕ ಬೆಂಬಲ ನೀಡಲಾಗಿದೆ</string>
+    <string name="basic_caregiver_counselling_provided">ಆರೈಕೆದಾರರಿಗೆ ಆಪ್ತಸಮಾಲೋಚನೆ ಒದಗಿಸಲಾಗಿದೆ</string>
+    <string name="basic_management_remarks">ಷರಾ</string>
+    
+    <string name="distressing_symptoms_present">ಯಾತನಾಮಯ ಲಕ್ಷಣಗಳಿವೆ</string>
+    <string name="bedridden_or_severely_dependent">ಹಾಸಿಗೆ ಹಿಡಿದಿರುವ ಅಥವಾ ಹೆಚ್ಚು ಅವಲಂಬಿತ</string>
+    <string name="life_limiting_illness_known">ಮಾರಣಾಂತಿಕ ಕಾಯಿಲೆ ಎಂದು ತಿಳಿದಿದೆ</string>
+    <string name="caregiver_support_required">ಆರೈಕೆದಾರರ ಬೆಂಬಲ ಅಗತ್ಯವಿದೆ</string>
+
+    <string name="severe_pain_referral_alert">ತೀವ್ರವಾದ ನೋವು. ದಯವಿಟ್ಟು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಉಲ್ಲೇಖಿಸಿ.</string>
+    <string name="severe_symptoms_referral_alert">ತೀವ್ರವಾದ ರೋಗಲಕ್ಷಣಗಳು. ದಯವಿಟ್ಟು ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಉಲ್ಲೇಖಿಸಿ.</string>
+
+    <!-- Generic Referral & Follow Up Fields -->
+    <string name="referral_required_title">ಉಲ್ಲೇಖ ಅಗತ್ಯವಿದೆಯೇ</string>
+    <string-array name="referral_required_options">
+        <item>ಹೌದು</item>
+        <item>ಇಲ್ಲ</item>
+    </string-array>
+    
+    <string name="referral_level_title">ಉಲ್ಲೇಖಿತ ಹಂತ</string>
+    <string-array name="referral_level_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ</item>
+        <item>ಸಮುದಾಯ ಆರೋಗ್ಯ ಕೇಂದ್ರ</item>
+        <item>ಜಿಲ್ಲಾ ಆಸ್ಪತ್ರೆ</item>
+        <item>ಉಪಶಮನ ಆರೈಕೆ ಘಟಕ</item>
+    </string-array>
+    
+    <string name="reason_for_referral_title">ಉಲ್ಲೇಖಿಸಲು ಕಾರಣ</string>
+    <string-array name="reason_for_referral_options">
+        <item>ತೀವ್ರವಾದ ನೋವು</item>
+        <item>ಕಾರ್ಯಾತ್ಮಕ ಅವಲಂಬನೆ</item>
+        <item>ಡಿಮೆನ್ಶಿಯಾ ಶಂಕೆ</item>
+        <item>ಅಂತ್ಯ-ಜೀವನ ಆರೈಕೆ</item>
+    </string-array>
+    
+    <string name="follow_up_required_title">ಮುಂದಿನ ಭೇಟಿ ಅಗತ್ಯವಿದೆಯೇ</string>
+    <string-array name="follow_up_required_options">
+        <item>ಹೌದು</item>
+        <item>ಇಲ್ಲ</item>
+    </string-array>
+    
+    <string name="follow_up_date_title">ಮುಂದಿನ ಭೇಟಿ ದಿನಾಂಕ</string>
+    
+    <string name="case_status_title">ಪ್ರಕರಣದ ಸ್ಥಿತಿ</string>
+    <string-array name="case_status_options">
+        <item>ಚೇತರಿಸಿಕೊಂಡಿದ್ದಾರೆ</item>
+        <item>ಚಿಕಿತ್ಸೆಯಲ್ಲಿದ್ದಾರೆ</item>
+        <item>ಸಾವು</item>
+    </string-array>
+    
+    <string name="date_of_death_title">ಸಾವಿನ ದಿನಾಂಕ</string>
+    <!-- Elderly Health Assessment -->
+    <string name="elderly_geriatric_complaints">ಸಾಮಾನ್ಯ ವೃದ್ಧಾಪ್ಯದ ದೂರುಗಳಿವೆಯೇ?</string>
+    <string name="elderly_multiple_chronic">ಬಹು ದೀರ್ಘಕಾಲದ ಕಾಯಿಲೆಗಳು</string>
+    <string name="elderly_recent_falls">ಇತ್ತೀಚಿನ ಬಿದ್ದಿರುವ ಘಟನೆಗಳು</string>
+    <string name="elderly_difficulty_walking">ನಡೆಯಲು ಅಥವಾ ಸಮತೋಲನ ಕಾಯ್ದುಕೊಳ್ಳಲು ತೊಂದರೆ</string>
+    <string name="elderly_visual_hearing">ದೃಷ್ಟಿ ಅಥವಾ ಶ್ರವಣ ದೋಷ</string>
+    <string name="elderly_functional_decline">ದೈನಂದಿನ ಚಟುವಟಿಕೆಗಳಲ್ಲಿ ತೊಂದರೆ (ADL)</string>
+    <string name="elderly_functional_assessment_headline">ಕಾರ್ಯಾತ್ಮಕ ಮೌಲ್ಯಮಾಪನ ವಿಭಾಗ</string>
+    <string name="elderly_bathing">ಸ್ನಾನ ಮಾಡುವುದು</string>
+    <string name="elderly_dressing">ಉಡುಗೆ ಧರಿಸುವುದು</string>
+    <string name="elderly_toileting">ಶೌಚಾಲಯ ಬಳಕೆ</string>
+    <string name="elderly_transferring">ವರ್ಗಾವಣೆ (ಏಳುವುದು-ಕುಳಿತುಕೊಳ್ಳುವುದು)</string>
+    <string name="elderly_continence">ಮಲಮೂತ್ರ ವಿಸರ್ಜನೆ ನಿಯಂತ್ರಣ (Continence)</string>
+    <string name="elderly_feeding">ಆಹಾರ ಸೇವನೆ</string>
+    <string name="elderly_independent">ಸ್ವತಂತ್ರ (1)</string>
+    <string name="elderly_dependent">ಅವಲಂಬಿತ (0)</string>
+    <string name="elderly_total_score">ಒಟ್ಟು ಸ್ಕೋರ್</string>
+    <string name="elderly_functional_status">ಕಾರ್ಯಾತ್ಮಕ ಸ್ಥಿತಿ</string>
+    <string name="elderly_functional_decline_flag">ಕಾರ್ಯಾತ್ಮಕ ಅವನತಿಯ ಸ್ಥಿತಿ</string>
+    <string name="elderly_status_no_decline">ಯಾವುದೇ ಕುಸಿತವಿಲ್ಲ</string>
+    <string name="elderly_status_partial_dependence">ಭಾಗಶಃ ಅವಲಂಬನೆ</string>
+    <string name="elderly_status_functional_dependence">ಕಾರ್ಯಾತ್ಮಕ ಅವಲಂಬನೆ</string>
+    <string name="elderly_status_highly_dependent">ಹೆಚ್ಚು ಅವಲಂಬಿತರಾಗಿದ್ದಾರೆ</string>
+    <string name="elderly_status_unknown">ತಿಳಿದಿಲ್ಲ</string>
+    <string name="elderly_memory_loss">ನೆನಪಿನ ಶಕ್ತಿ ಕುಗ್ಗುವಿಕೆ ಅಥವಾ ಗೊಂದಲ</string>
+    <string name="elderly_dementia_headline">ಡಿಮೆನ್ಶಿಯಾ ತಪಾಸಣೆ ಪಟ್ಟಿ</string>
+    <string name="elderly_dementia_memory_loss">ಕ್ರಮೇಣ ಹೆಚ್ಚು ನೆನಪಿನ ಶಕ್ತಿ ಕಳೆದುಕೊಳ್ಳುವುದು</string>
+    <string name="elderly_dementia_disorientation">ದಿಗ್ಭ್ರಮೆ (ಸಮಯ/ಸ್ಥಳ/ವ್ಯಕ್ತಿ)</string>
+    <string name="elderly_dementia_behavioural">ವರ್ತನೆಯ ಬದಲಾವಣೆಗಳು</string>
+    <string name="elderly_dementia_self_care">ಸ್ವಯಂ-ಆರೈಕೆ / ದಿನಚರಿಯಲ್ಲಿ ಕುಸಿತ</string>
+    <string name="elderly_screening_outcome">ತಪಾಸಣೆಯ ಫಲಿತಾಂಶ</string>
+    <string name="elderly_referral_required">ಉಲ್ಲೇಖ ಅಗತ್ಯವಿದೆ</string>
+    <string name="elderly_outcome_suspected">ಶಂಕಿತ</string>
+    <string name="elderly_outcome_not_suspected">ಶಂಕಿತವಲ್ಲ</string>
+    <string name="elderly_alert_functional_decline">ರೋಗಿಯು ಕಾರ್ಯಾತ್ಮಕ ಅವನತಿಯನ್ನು ಹೊಂದಿದ್ದಾರೆ. ಅಗತ್ಯವಿದ್ದರೆ ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಉಲ್ಲೇಖಿಸಿ.</string>
+    <string name="elderly_alert_memory_loss">ರೋಗಿಯು ನೆನಪಿನ ಶಕ್ತಿಯನ್ನು ಕಳೆದುಕೊಂಡಿದ್ದಾರೆ. ಅಗತ್ಯವಿದ್ದರೆ ಉನ್ನತ ಸೌಲಭ್ಯಕ್ಕೆ ಉಲ್ಲೇಖಿಸಿ.</string>
+    <string name="yes_option">ಹೌದು</string>
+    <string name="no_option">ಇಲ್ಲ</string>
+
+    <!-- Mental Health Screening -->
+    <string name="mh_depression_severity">ಖಿನ್ನತೆಯ ತೀವ್ರತೆ</string>
+    <string name="mh_system_action">ವ್ಯವಸ್ಥಿತ ಕ್ರಮ</string>
+    <string name="mh_current_tobacco_use">ಪ್ರಸ್ತುತ ತಂಬಾಕು ಬಳಕೆ</string>
+    <string name="mh_tobacco_type">ತಂಬಾಕು ಬಳಕೆಯ ವಿಧ</string>
+    <string name="mh_tobacco_smoking">ಧೂಮಪಾನ</string>
+    <string name="mh_tobacco_smokeless">ಧೂಮರಹಿತ</string>
+    <string name="mh_tobacco_both">ಎರಡೂ</string>
+    <string name="mh_tobacco_frequency">ತಂಬಾಕು ಬಳಕೆಯ ಆವರ್ತನ</string>
+    <string name="mh_tobacco_occasional">ಸಾಂದರ್ಭಿಕ</string>
+    <string name="mh_tobacco_daily">ಪ್ರತಿದಿನ</string>
+    <string name="mh_tobacco_outcome">ತಂಬಾಕು ಬಳಕೆಯ ಫಲಿತಾಂಶ</string>
+    <string name="mh_tobacco_system_action">ವ್ಯವಸ್ಥಿತ ಕ್ರಮ</string>
+    <string name="mh_intervention_psychoeducation">ಮನೋಶಿಕ್ಷಣ</string>
+    <string name="mh_intervention_counselling">ಆಪ್ತಸಮಾಲೋಚನೆ</string>
+    <string name="mh_intervention_stress_mgmt">ಒತ್ತಡ ನಿರ್ವಹಣೆ</string>
+    <string name="mh_intervention_family_counselling">ಕೌಟುಂಬಿಕ ಆಪ್ತಸಮಾಲೋಚನೆ</string>
+    <string name="mh_suicide_immediate_assess">ಸಿಎಚ್‌ಒ ತಕ್ಷಣದ ಅಪಾಯವನ್ನು ಅಂದಾಜಿಸುತ್ತಾರೆ</string>
+    <string name="mh_suicide_risk_alert_moderate">ಸಾಧಾರಣ ಆತ್ಮಹತ್ಯೆ ಅಪಾಯ: ತಕ್ಷಣದ ಆಪ್ತಸಮಾಲೋಚನೆ ಅಗತ್ಯವಿದೆ. ರೆಫರಲ್ ಅನ್ನು ಪರಿಗಣಿಸಿ.</string>
+    <string name="mh_suicide_risk_alert_high">ಹೆಚ್ಚಿನ ಆತ್ಮಹತ್ಯೆ ಅಪಾಯ: ತುರ್ತು ಮಧ್ಯಸ್ಥಿಕೆ ಅಗತ್ಯವಿದೆ. ತಕ್ಷಣ ರೆಫರ್ ಮಾಡಿ.</string>
+    <string name="mh_date_format_pattern">dd/MM/yyyy</string>
+    <string name="mh_suspected">ಶಂಕಿಸಲಾಗಿದೆ</string>
+    <string name="mh_de_addiction">ವ್ಯಸನಮುಕ್ತಿ</string>
+    <string name="mh_de_addiction_centre">ವ್ಯಸನಮುಕ್ತಿ ಕೇಂದ್ರ</string>
+
+    <string-array name="phq9_severity_options">
+        <item>ಕನಿಷ್ಠ</item>
+        <item>ಮೃದು</item>
+        <item>ಸಾಧಾರಣ</item>
+        <item>ಸಾಧಾರಣ ತೀವ್ರ</item>
+        <item>ಅತೀ ತೀವ್ರ</item>
+    </string-array>
+
+    <string-array name="phq9_system_action_options">
+        <item>ಮನೋಶಿಕ್ಷಣ</item>
+        <item>ಆಪ್ತಸಮಾಲೋಚನೆ - MO/PHC ಗೆ ರೆಫರ್ ಮಾಡಿ</item>
+        <item>ರೆಫರಲ್ - ತುರ್ತು ರೆಫರಲ್</item>
+        <item>ರೆಫರಲ್ - ತುರ್ತು ಚಿಕಿತ್ಸೆಗಾಗಿ ರೆಫರಲ್</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_outcome_options">
+        <item>ಬಳಕೆ ಪತ್ತೆಯಾಗಿದೆ</item>
+        <item>ಬಳಕೆ ಪತ್ತೆಯಾಗಿಲ್ಲ</item>
+    </string-array>
+
+    <string-array name="mh_tobacco_system_action_options">
+        <item>ಸಂಕ್ಷಿಪ್ತ ಆಪ್ತಸಮಾಲೋಚನೆ</item>
+        <item>ರೆಫರಲ್</item>
+    </string-array>
+
+    <string-array name="mh_alcohol_classification_options">
+        <item>ಯಾವುದೇ ಸಮಸ್ಯಾತ್ಮಕ ಮದ್ಯಪಾನ ಬಳಕೆ ಪತ್ತೆಯಾಗಿಲ್ಲ</item>
+        <item>ಸಮಸ್ಯಾತ್ಮಕ ಮದ್ಯಪಾನ ಬಳಕೆ ಶಂಕಿಸಲಾಗಿದೆ</item>
+    </string-array>
+
+    <string-array name="mh_ed_outcome_options">
+        <item>ಶಂಕಿತ ಅಪಸ್ಮಾರ</item>
+        <item>ಶಂಕಿತ ಡಿಮೆನ್ಶಿಯಾ</item>
+        <item>ಶಂಕಿಸಲಾಗಿದೆ</item>
+        <item>ಶಂಕೆಯಿಲ್ಲ</item>
+    </string-array>
+
+    <string name="mh_ed_reason_neurological">ನರವೈಜ್ಞಾನಿಕ ಸ್ಥಿತಿಯ ಶಂಕೆ</string>
+
+    <string-array name="mh_referral_level_dmhp_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ (PHC)</item>
+        <item>ಸಮುದಾಯ ಆರೋಗ್ಯ ಕೇಂದ್ರ (CHC)</item>
+        <item>ಜಿಲ್ಲಾ ಆಸ್ಪತ್ರೆ</item>
+        <item>ಜಿಲ್ಲಾ ಮಾನಸಿಕ ಆರೋಗ್ಯ ಕಾರ್ಯಕ್ರಮ (DMHP)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_alcohol_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ (PHC)</item>
+        <item>ವ್ಯಸನಮುಕ್ತಿ ಕೇಂದ್ರ</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_rbsk_options">
+        <item>RBSK DEIC</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_child_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ (PHC)</item>
+        <item>ಸಮುದಾಯ ಆರೋಗ್ಯ ಕೇಂದ್ರ (CHC)</item>
+        <item>ಜಿಲ್ಲಾ ಆಸ್ಪತ್ರೆ (DH)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_adult_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ (PHC)</item>
+        <item>ಸಮುದಾಯ ಆರೋಗ್ಯ ಕೇಂದ್ರ (CHC)</item>
+        <item>ಜಿಲ್ಲಾ ಆಸ್ಪತ್ರೆ (DH)</item>
+        <item>ಡಿಎಂಎಚ್‌ಪಿ (DMHP)</item>
+        <item>ವ್ಯಸನಮುಕ್ತಿ ಕೇಂದ್ರ</item>
+    </string-array>
+    
+    <string-array name="mh_referral_level_standard_mh_options">
+        <item>ಪ್ರಾಥಮಿಕ ಆರೋಗ್ಯ ಕೇಂದ್ರ (PHC)</item>
+        <item>ಜಿಲ್ಲಾ ಮಾನಸಿಕ ಆರೋಗ್ಯ ಕಾರ್ಯಕ್ರಮ (DMHP)</item>
+    </string-array>
+
+    <!-- Missing Mental Health Strings -->
+    <string-array name="alcohol_system_action_options">
+        <item>ಸಂಕ್ಷಿಪ್ತ ಮಧ್ಯಸ್ಥಿಕೆ</item>
+        <item>ರೆಫರಲ್</item>
+    </string-array>
+    <string-array name="mh_case_closure_reason_options">
+        <item>ಚೇತರಿಸಿಕೊಂಡಿದ್ದಾರೆ</item>
+        <item>ರೆಫರ್ ಮಾಡಲಾಗಿದೆ</item>
+        <item>ಫಾಲೋ-ಅಪ್ ಕಳೆದುಹೋಗಿದೆ</item>
+        <item>ಸಾವು</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options">
+        <item>ಆತ್ಮಹತ್ಯೆ ಅಪಾಯ / ಸ್ವಯಂ ಹಾನಿ</item>
+        <item>ಸಾಧಾರಣದಿಂದ ತೀವ್ರ ಖಿನ್ನತೆ</item>
+        <item>ತೀವ್ರ ಮಾನಸಿಕ ಅಸ್ವಸ್ಥತೆ ಶಂಕಿಸಲಾಗಿದೆ</item>
+        <item>ವಸ್ತುವಿನ ಅವಲಂಬನೆ / ವಾಪಸಾತಿ ಲಕ್ಷಣಗಳು</item>
+        <item>ಕ್ರಿಯಾತ್ಮಕ ದುರ್ಬಲತೆ</item>
+        <item>ನರವೈಜ್ಞಾನಿಕ ಸ್ಥಿತಿಯ ಶಂಕೆ</item>
+        <item>ಮಗುವಿನ ನಡವಳಿಕೆ ಕಾಳಜಿ</item>
+        <item>ತನಗೆ ಅಥವಾ ಇತರರಿಗೆ ಅಪಾಯ</item>
+        <item>ಯಾವುದೇ ಸುಧಾರಣೆ ಇಲ್ಲ / ಹದಗೆಡುತ್ತಿದೆ</item>
+        <item>ತಜ್ಞರ ಆರೈಕೆ ಅಗತ್ಯವಿದೆ</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options_under_11">
+        <item>ಮಾನಸಿಕ ಆರೋಗ್ಯ ದೂರು</item>
+        <item>ವೈದ್ಯಕೀಯ ತೊಡಕು</item>
+    </string-array>
+    <string-array name="mh_referral_level_options">
+        <item>PHC</item>
+        <item>DMHP</item>
+        <item>ವ್ಯಸನಮುಕ್ತಿ ಕೇಂದ್ರ</item>
+    </string-array>
+
+    <string name="ed_age_60_years">ವಯಸ್ಸು ≥ 60 ವರ್ಷಗಳು</string>
+    <string name="ed_confusion_disorientation">ದಿಗ್ಭ್ರಮೆ ಅಥವಾ ಗೊಂದಲ</string>
+    <string name="ed_duration_minutes">ಅವಧಿ (ನಿಮಿಷಗಳಲ್ಲಿ)</string>
+    <string name="ed_edConfusionordrowsiness">ಎಪಿಸೋಡ್ ನಂತರ ಗೊಂದಲ ಅಥವಾ ತೂಕಡಿಕೆ</string>
+    <string name="ed_edRecurrentEpisodeloss">ಪ್ರಜ್ಞೆ ಕಳೆದುಕೊಳ್ಳುವ ಎಪಿಸೋಡ್‌ಗಳು</string>
+    <string name="ed_functional_decline">ದೈನಂದಿನ ಕಾರ್ಯನಿರ್ವಹಣೆಯಲ್ಲಿ ಕುಸಿತ (ಸ್ವಯಂ ಆರೈಕೆ, ದಿನಚರಿ ಚಟುವಟಿಕೆಗಳು)</string>
+    <string name="ed_intervention_type">ಮಧ್ಯಸ್ಥಿಕೆಯ ಪ್ರಕಾರ</string>
+    <string name="ed_progressive_memory_loss">ಪ್ರಗತಿಶೀಲ ಸ್ಮರಣೆ ನಷ್ಟ</string>
+    <string name="ed_psychosocial_intervention_provided">ಮಾನಸಿಕ-ಸಾಮಾಜಿಕ ಮಧ್ಯಸ್ಥಿಕೆಯನ್ನು ಒದಗಿಸಲಾಗಿದೆ</string>
+    <string name="ed_reason">ಕಾರಣ</string>
+    <string name="ed_recurrent_jerky_movements">ಪುನರಾವರ್ತಿತ ಸೆಳೆತದ ಚಲನೆಗಳು / ಫಿಟ್ಸ್</string>
+    <string name="ed_referral_required">ರೆಫರಲ್ ಅಗತ್ಯವಿದೆ</string>
+    <string name="ed_remarks">ಟೀಕೆಗಳು</string>
+    <string name="ed_screening_outcome">ಸ್ಕ್ರೀನಿಂಗ್ ಫಲಿತಾಂಶ</string>
+    <string name="ed_session_date">ಅಧಿವೇಶನದ ದಿನಾಂಕ</string>
+    <string name="epilepsy_dementia_checklist_title">ಅಪಸ್ಮಾರ ಮತ್ತು ಡಿಮೆನ್ಶಿಯಾ ಸ್ಕ್ರೀನಿಂಗ್ ಪರಿಶೀಲನಾಪಟ್ಟಿ</string>
+
+    <string name="mh_adherence_to_advice_title">ಸಲಹೆಯ ಪಾಲನೆ</string>
+    <string name="mh_case_closure_reason_title">ಪ್ರಕರಣವನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲು ಕಾರಣ</string>
+    <string name="mh_follow_up_date_title">ಫಾಲೋ-ಅಪ್ ದಿನಾಂಕ</string>
+    <string name="mh_follow_up_required_title">ಫಾಲೋ-ಅಪ್ ಅಗತ್ಯವಿದೆ</string>
+    <string name="mh_improvement_noted_title">ಸುಧಾರಣೆ ಕಂಡುಬಂದಿದೆ</string>
+    <string name="mh_reason_for_referral_title">ರೆಫರಲ್‌ಗೆ ಕಾರಣ</string>
+    <string name="mh_referral_date_title">ರೆಫರಲ್ ದಿನಾಂಕ</string>
+    <string name="mh_referral_escalation_title">ಹೆಚ್ಚಿನ ಹಂತಕ್ಕೆ ಕಳುಹಿಸುವುದು ಅಗತ್ಯವಿದೆ</string>
+    <string name="mh_referral_level_title">ರೆಫರಲ್ ಹಂತ</string>
+    <string name="mh_referral_required_title">ರೆಫರಲ್ ಅಗತ್ಯವಿದೆ</string>
+    <string name="mh_repeat_phq9_title">PHQ-9 ಅನ್ನು ಪುನರಾವರ್ತಿಸಿ</string>
+
+    <string name="phq9_alert_emergency"><font color="#FF0000">ತುರ್ತು ರೆಫರಲ್ (PHQ-9 ಸ್ಕೋರ್ ≥ 20)</font></string>
+    <string name="phq9_alert_referral_mo_phc"><font color="#FF0000">MO/PHC ಗೆ ರೆಫರ್ ಮಾಡಿ (PHQ-9 ಸ್ಕೋರ್ ≥ 10)</font></string>
+    <string name="phq9_alert_urgent"><font color="#FF0000">ತ್ವರಿತ ರೆಫರಲ್ (PHQ-9 ಸ್ಕೋರ್ ≥ 15)</font></string>
+
+    <string name="substance_alcohol_classification">ಆಲ್ಕೋಹಾಲ್ ಬಳಕೆಯ ವರ್ಗೀಕರಣ</string>
+    <string name="substance_alcohol_frequency">ಆಲ್ಕೋಹಾಲ್ ಬಳಕೆಯ ಆವರ್ತನ</string>
+    <string name="substance_alcohol_impact">ದೈನಂದಿನ ಕಾರ್ಯಚಟುವಟಿಕೆಗಳ ಮೇಲಿನ ಪ್ರಭಾವ (ಆರೋಗ್ಯ, ಕುಟುಂಬ, ಕೆಲಸ)</string>
+    <string name="substance_alcohol_loss">ಮದ್ಯಪಾನದ ಮೇಲಿನ ನಿಯಂತ್ರಣವನ್ನು ಕಳೆದುಕೊಳ್ಳುವುದು</string>
+    <string name="substance_alcohol_problematic">ಸಮಸ್ಯಾತ್ಮಕ ಆಲ್ಕೋಹಾಲ್ ಬಳಕೆಯ ಬಗ್ಗೆ CHO ಮೌಲ್ಯಮಾಪನ</string>
+    <string name="substance_alcohol_system_action">ವ್ಯವಸ್ಥೆಯ ಕ್ರಮ</string>
+    <string name="substance_alcohol_title">ಆಲ್ಕೋಹಾಲ್ ಬಳಕೆಯ ಗುರುತಿಸುವಿಕೆ</string>
+    <string name="substance_alcohol_withdrawal">ನಿರ್ಗಮನದ (withdrawal) ಲಕ್ಷಣಗಳನ್ನು ಸೂಚಿಸುವ ಗುಣಲಕ್ಷಣಗಳು</string>
+    <string name="substance_tobacco_title">ತಂಬಾಕು ಬಳಕೆಯ ಗುರುತಿಸುವಿಕೆ</string>
+    
+    <string name="elderly_health_assessment_saved">ವಯೋವೃದ್ಧರ ಆರೋಗ್ಯ ಮೌಲ್ಯಮಾಪನವನ್ನು ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="ear_diagnosis_saved">ಕಿವಿ ರೋಗನಿರ್ಣಯವನ್ನು ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="throat_diagnosis_saved">ಗಂಟಲು ರೋಗನಿರ್ಣಯವನ್ನು ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="nose_diagnosis_saved">ಮೂಗಿನ ರೋಗನಿರ್ಣಯವನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="title_nose_diagnosis">ಮೂಗು ರೋಗನಿರ್ಣಯ ಫಾರ್ಮ್</string>
+    <string name="title_ear_diagnosis">ಕಿವಿ ರೋಗನಿರ್ಣಯ ಫಾರ್ಮ್</string>
+    <string name="title_throat_diagnosis">ಗಂಟಲು ರೋಗನಿರ್ಣಯ ಫಾರ್ಮ್</string>
+    <string name="oral_health_saved">ಬಾಯಿಯ ಆರೋಗ್ಯ ವಿವರಗಳು ಯಶಸ್ವಿಯಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
+    <string name="title_oral_health">ದಂತ ಆರೋಗ್ಯ ಫಾರ್ಮ್</string>
+    <string name="title_pain_symptom_assessment">ಪ್ಯಾಲಿಯೇಟಿವ್ ಕೇರ್ ಗುರುತಿಸುವ ಫಾರ್ಮ್</string>
+    <string name="title_elderly_health_assessment">ವೃದ್ಧರ ಆರೋಗ್ಯ ಮೌಲ್ಯಮಾಪನ</string>
+    <string name="title_psychosocial_caregiver_support">ಮನೋಸಾಮಾಜಿಕ ಮತ್ತು ಆರೈಕೆದಾರರ ಸಹಾಯ</string>
+
+    <!--
+      Localized labels for chief complaint and duration unit dropdowns.
+      Order MUST match values/strings.xml chief_complaint_en_keys and
+      duration_units_en_keys exactly. MasterDataLocalizer pairs by index.
+    -->
+    <string-array name="chief_complaint_localized">
+        <item>ಜ್ವರ</item>
+        <item>ಕೆಮ್ಮು</item>
+        <item>ತಲೆನೋವು</item>
+        <item>ಶೀತ</item>
+        <item>ವಾಂತಿ</item>
+        <item>ಅತಿಸಾರ</item>
+        <item>ದೇಹದ ನೋವು</item>
+        <item>ಹೊಟ್ಟೆ ನೋವು</item>
+        <item>ಎದೆ ನೋವು</item>
+        <item>ಉಸಿರಾಟದ ತೊಂದರೆ</item>
+        <item>ಆಯಾಸ</item>
+        <item>ಹಸಿವು ಇಲ್ಲದಿರುವುದು</item>
+        <item>ಕಣ್ಣಿನ ಪೊರೆ</item>
+        <item>ಗ್ಲಾಕೋಮಾ</item>
+        <item>ಮಧುಮೇಹ ರೆಟಿನೋಪತಿ</item>
+        <item>ಪ್ರೆಸ್ಬಯೋಪಿಯಾ</item>
+        <item>ಟ್ರಕೋಮಾ</item>
+        <item>ಕಾರ್ನಿಯಾ ಕಾಯಿಲೆ</item>
+        <item>ಕಾಂಜಂಕ್ಟಿವೈಟಿಸ್ / ಕೆಂಪು ಕಣ್ಣು</item>
+        <item>ಒಣ ಕಣ್ಣು</item>
+        <item>ಒಣ ಕಣ್ಣು</item>
+        <item>ಕಣ್ಣಿನ ಅಲರ್ಜಿ</item>
+        <item>ಕಣ್ಣಿನ ಗಾಯ (ಭಾರೀ ಆಘಾತ / ಚುಚ್ಚುವ ಗಾಯ)</item>
+        <item>ಕಣ್ಣಿನ ಗಾಯ (ಭಾರೀ ಆಘಾತ / ಚುಚ್ಚುವ ಗಾಯ)</item>
+        <item>ರಾಸಾಯನಿಕ ಸಂಪರ್ಕ (ಆಮ್ಲ / ಕ್ಷಾರ / ಇತರೆ)</item>
+        <item>ರಾಸಾಯನಿಕ ಸಂಪರ್ಕ (ಆಮ್ಲ / ಕ್ಷಾರ / ಇತರೆ)</item>
+        <item>ಕಣ್ಣಿನಲ್ಲಿ ಬಾಹ್ಯ ವಸ್ತು</item>
+        <item>ಹಲ್ಲಿನ ಕ್ಷಯ</item>
+        <item>ವಸಡಿನ ಕಾಯಿಲೆಗಳು</item>
+        <item>ಹಲ್ಲು ಮತ್ತು ದವಡೆಯ ಅನಿಯಮಿತ ಜೋಡಣೆ</item>
+        <item>ಅಸಾಮಾನ್ಯ ಬೆಳವಣಿಗೆ, ಚೌಕಟ್ಟು ಅಥವಾ ಹುಣ್ಣು</item>
+        <item>ಸೀಳು ತುಟಿ / ಅಂಗುಳು</item>
+        <item>ಡೆಂಟಲ್ ಫ್ಲೋರೋಸಿಸ್</item>
+        <item>ದಂತ ತುರ್ತು</item>
+        <item>ಕುತ್ತಿಗೆ ಊತ</item>
+        <item>ನುಂಗಲು ಕಷ್ಟ</item>
+        <item>ಸೀಳು ತುಟಿ</item>
+        <item>ಸೀಳು ಅಂಗುಳು</item>
+        <item>ಟಾನ್ಸಿಲೈಟಿಸ್</item>
+        <item>ಗಂಟಲಿನ ಉರಿಯೂತ</item>
+        <item>ಧ್ವನಿಪೆಟ್ಟಿಗೆಯ ಉರಿಯೂತ</item>
+        <item>ಸೈನುಸೈಟಿಸ್</item>
+        <item>ಕೇಳುವಲ್ಲಿ ಕಷ್ಟ</item>
+        <item>ಕಿವಿಯ ಮೇಣ</item>
+        <item>ಜನ್ಮಜಾತ ಕಿವಿಯ ವಿಕೃತಿ</item>
+        <item>ಕಿವಿಯಲ್ಲಿ ಬಾಹ್ಯ ವಸ್ತು</item>
+        <item>ಬಾಯಿ ತೆರೆದು ಉಸಿರಾಟ</item>
+        <item>ಮೂಗಿನ ರಕ್ತಸ್ರಾವ</item>
+        <item>ಮೂಗಿನಲ್ಲಿ ಬಾಹ್ಯ ವಸ್ತು</item>
+    </string-array>
+
+    <string-array name="duration_units_localized">
+        <item>ಗಂಟೆಗಳು</item>
+        <item>ದಿನಗಳು</item>
+        <item>ವಾರಗಳು</item>
+        <item>ತಿಂಗಳುಗಳು</item>
+        <item>ವರ್ಷಗಳು</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 71da83d02..7824e3e80 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -14,4 +14,11 @@
         <item>One</item>
         <item>Half</item>
     </string-array>
-</resources>
\ No newline at end of file
+
+    <string-array name="case_status_options">
+        <item>Under care</item>
+        <item>Referred</item>
+        <item>Stable</item>
+        <item>Death</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3574a7a11..d17616ac6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,6 +13,12 @@
 <!--            <flag name="password" value="5" />-->
         </attr>
     </declare-styleable>
+    <attr name="colorQuaternary" format="color" />
+    <attr name="colorOnQuaternary" format="color" />
+    <attr name="colorQuaternaryContainer" format="color" />
+    <attr name="colorOnQuaternaryContainer" format="color" />
+    <attr name="harmonizeQuaternary" format="boolean" />
+    <!-- Temporary aliases for backward compatibility -->
     <attr name="colorQuartenary" format="color" />
     <attr name="colorOnQuartenary" format="color" />
     <attr name="colorQuartenaryContainer" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7ab564510..08960d876 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -110,7 +110,9 @@
     <color name="md_theme_dark_surfaceTint">#91CDFF</color>
     <color name="md_theme_dark_outlineVariant">#42474E</color>
     <color name="md_theme_dark_scrim">#000000</color>
-    <color name="Quartenary">#FD5901</color>
+    <color name="Quaternary">#FD5901</color>
+    <!-- Temporary alias for backward compatibility -->
+    <color name="Quartenary">@color/Quaternary</color>
     <color name="Tertiary">#008083</color>
     <color name="holo_green_dark">#669900</color>
     <color name="holo_red_light">#F44336</color>
@@ -126,5 +128,17 @@
     <color name="line_focused">#3F51B5</color>
     <color name="line_default">#C5CAE9</color>
     <color name="color_consent_text">#0000EE</color>
+    <color name="gray_dark">#666666</color>
+    <color name="gray_light">#E0E0E0</color>
+    <color name="colorPrimary">#006496</color>
+    <color name="stock_green">#008000</color>
+    <color name="stock_red">#FF0000</color>
+
+    <!-- Error state: used for visual impairment alert and Case ID alert in ophthalmic screening -->
+    <color name="color_error_text">#D32F2F</color>
+    <color name="color_error_bg">#FFEBEE</color>
+    <!-- Info state: used for presbyopia management alert in ophthalmic screening -->
+    <color name="color_info_text">#01579B</color>
+    <color name="color_info_bg">#E1F5FE</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2baa7e598..2f6711eaa 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">220dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 
     <dimen name="padding_tiny">2dp</dimen>
@@ -29,7 +29,7 @@
     <dimen name="btn_height">48dp</dimen>
     <dimen name="login_btn_height">56dp</dimen>
     <dimen name="bottom_nav_height">56dp</dimen>
-    <dimen name="bottom_space_height">64dp</dimen>
+    <dimen name="bottom_space_height">16dp</dimen>
 
     <dimen name="text_huge">32sp</dimen>
     <dimen name="text_big">24sp</dimen>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 000000000..d2fb6ef8e
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="icon_grid_span">3</integer>
+</resources>
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
index c5a2eb88d..a1a4a5c05 100644
--- a/app/src/main/res/values/plurals.xml
+++ b/app/src/main/res/values/plurals.xml
@@ -12,4 +12,8 @@
         <item quantity="one">%d day old</item>
         <item quantity="other">%d days old</item>
     </plurals>
+    <plurals name="visit_count">
+        <item quantity="one">%d Visit</item>
+        <item quantity="other">%d Visits</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35bc1e8a4..85e2c93ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,17 @@
 <resources>
     <string name="app_name">AAM</string>
+    <string name="all_td_doses_message"> All TD doses have been given</string>
+    <string name="anc_alert_bradycardia">Bradycardia detected — High Risk Pregnancy</string>
+    <string name="anc_alert_tachycardia">Tachycardia detected — High Risk Pregnancy</string>
+    <string name="anc_alert_blood_sugar_high">Blood Sugar (Fasting) - High Risk Pregnancy</string>
+    <string name="anc_alert_urine_sugar_hrp">Urine Sugar positive — High Risk Pregnancy</string>
+    <string name="anc_alert_urine_albumin_hrp">Urine Albumin positive — High Risk Pregnancy</string>
+    <string name="anc_alert_hb_severe_anemia">Severe Anaemia — High Risk Pregnancy</string>
+    <string name="anc_alert_bp_hrp">Abnormal Blood Pressure detected — High Risk Pregnancy</string>
+    <string name="anc_alert_danger_signs_hrp">Alert: Danger Sign(s) selected — High Risk Pregnancy</string>
+    <string name="form_session_expired">Your session has expired. Please log out and log in again to continue.</string>
+    <string name="form_patient_not_found">Patient record not found. Please reopen this form from the beneficiary list.</string>
+    <string name="form_load_failed">Could not load this form. Please try again, and if the problem persists, log out and log in again.</string>
     <string name="PREF_NAME" translatable="false">cho-pref-1</string>
     <string name="PREF_D2D_API_KEY" translatable="false">JWT-Token_A</string>
     <string name="PREF_primary_API_KEY" translatable="false">JWT-Token_B</string>
@@ -19,7 +31,7 @@
     <string name="PREF_current_saved_language" translatable="false">Locale.Helper.Selected.Language</string>
     <string name="til_username_hint_text">Username</string>
     <string name="login_failed">"Login failed"</string>
-    <!-- TODO: Remove or change this placeholder text -->
+
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="next">Next</string>
     <string name="til_password_hint_text">Password</string>
@@ -30,6 +42,23 @@
     <string name="outreach">Outreach</string>
     <string name="system_issue">System Issue</string>
     <string name="manual_issue">Manual Issue</string>
+    <string name="no_batch_selected">Please select a batch before submitting</string>
+    <string name="refresh_batch_data">Refresh Batch Data</string>
+    <string name="batch_data_refreshed">Batch data refreshed successfully</string>
+    <string name="batch_refresh_failed">Failed to refresh batch data. Please check your connection.</string>
+    <string name="no_batches_available">No batches available for this medicine</string>
+    <string name="batch_data_loading">Loading batch data...</string>
+    <string name="medicine_dispensed_successfully">Medicine dispensed successfully</string>
+    <string name="dispensing_failed">Failed to dispense medicine. Please try again.</string>
+    <string name="network_required_manual_batch">Network connection required for manual batch selection</string>
+    <string name="network_required_refresh">Network connection required to refresh batch data. Please connect to internet.</string>
+    <string name="view_batch_disabled_system">View Batch is disabled in System Issue mode</string>
+    <string name="system_issue_auto_allocation">System Issue mode: Automatic batch allocation enabled</string>
+    <string name="batch_selection_required">Please select batch for all medicines in Manual Issue mode</string>
+    <string name="batch_selection_required_for">Please select batch for: %s</string>
+    <string name="refreshing">Refreshing...</string>
+    <string name="last_refreshed_never">Last refreshed: Never</string>
+    <string name="error_refreshing_batch_data">Error refreshing batch data</string>
     <string name="wellness_activity">Wellness Activity</string>
     <string name="training">Training</string>
     <string name="health_mela">Health Mela</string>
@@ -99,13 +128,12 @@
     <string name="revisit_details_text">Revisit Details</string>
     <string name="case_record_text">Case Record</string>
     <string name="lab_record_text">Lab Record</string>
-    <string name="pharmacist_record_text">Pharmacist Record</string>
+    <string name="pharmacist_record_text">Pharmacy</string>
+
 
-    <!--    <string name="cbac">CBAC</string>-->
     <string name="anc">ANC</string>
     <string name="pnc">PNC</string>
     <string name="immunization">Immunization</string>
-    <string name="eligible_couple_tracking">Eligible Couple Tracking</string>
 
     <string name="weight_kg_text">Weight(kg)</string>
     <string name="temperature_f_text">Temperature(F)</string>
@@ -138,6 +166,164 @@
     <string name="title_activity_visit_details">VisitDetailsActivity</string>
     <string name="esanjeevni">eSanjeevani</string>
     <string name="title_activity_web_view">WebViewActivity</string>
+    <string name="ophthalmic_screening_title">Ophthalmic Screening</string>
+    <string name="ophthalmic_symptomatic_title">Ophthalmology Symptomatic</string>
+    <string name="ophthalmic_screening_section_title">Screening for Blindness and Refractive Errors</string>
+    <string name="ophthalmic_is_diabetic">Is the patient diabetic? <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_screening_performed">Screening Performed for Diabetic Patient <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_right">Distance Visual Acuity \u2013 Right Eye <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dist_va_left">Distance Visual Acuity \u2013 Left Eye <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_visual_impairment_alert">Suspected visual impairment</string>
+    <string name="ophthalmic_reason_for_visit">Reason for Visit <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_near_va">Near Visual Acuity <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_chart_used">Visual Acuity Chart Used <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_case_identification_title">Case Identification</string>
+    <string name="ophthalmic_case_id_alert">Suspected visual impairment identified. Please complete the case identification below.</string>
+    <string name="ophthalmic_case_id_conditions">Case Identification and Condition(s)</string>
+    <string name="ophthalmic_case_id_conditions_mandatory">Case Identification and Condition(s) <font color="#FF0000">*</font></string>
+    <string name="select_conditions">Select Condition(s)</string>
+    <string name="referral_required_title">Referral required</string>
+    <string-array name="referral_required_options">
+        <item>Yes</item>
+        <item>No</item>
+    </string-array>
+    <string name="referral_level_title">Referral level</string>
+    <string-array name="referral_level_options">
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>District Hospital</item>
+        <item>Palliative Care Unit</item>
+    </string-array>
+    <string name="reason_for_referral_title">Reason for referral</string>
+    <string-array name="reason_for_referral_options">
+        <item>Severe pain</item>
+        <item>Functional dependence</item>
+        <item>Dementia suspected</item>
+        <item>End-of-life care</item>
+    </string-array>
+    <string name="follow_up_required_title">Follow-up required</string>
+    <string-array name="follow_up_required_options">
+        <item>Yes</item>
+        <item>No</item>
+    </string-array>
+    <string name="follow_up_date_title">Follow-up date</string>
+    <string name="difficulty_in_breathing">Difficulty in Breathing</string>
+    <string name="open_mouth_breathing">Open Mouth Breathing</string>
+    <string name="difficulty_in_breathing_alert">Difficulty in breathing detected. Diagnose URI / Rhinitis / Sinusitis. Refer if not manageable at HWC.</string>
+    <string name="open_mouth_breathing_alert">Open mouth breathing detected. Diagnose URI / Rhinitis / Sinusitis. Refer if not manageable at HWC.</string>
+    <string name="pain_severity">Pain severity</string>
+    <string name="pain_duration">Pain duration</string>
+    <string name="pain_duration_less_than_one_month">&lt; 1 month</string>
+    <string name="pain_duration_one_to_six_months">1–6 months</string>
+    <string name="pain_duration_more_than_six_months">&gt; 6 months</string>
+    <string name="other_symptoms_present">Other symptoms present</string>
+    <string name="other_symptoms_severity">Other symptoms severity</string>
+    <string name="immediate_relief_provided">Immediate relief provided</string>
+    <string name="palliative_care_identification_headline">Palliative Care Identification</string>
+    <string name="pain_symptom_assessment_palliative">Pain and Symptom Assessment (Palliative)</string>
+    <string name="persistent_pain_present">Persistent pain present</string>
+    <string name="symptom_assessment_basic_title">Symptom Assessment</string>
+    <string name="symptom_assessment_basic_field_title">Symptoms</string>
+    <string name="symptom_nausea_vomiting">Nausea / vomiting</string>
+    <string name="symptom_constipation">Constipation</string>
+    <string name="symptom_anxiety_restlessness">Anxiety / restlessness</string>
+    <string name="symptom_sleep_disturbance">Sleep disturbance</string>
+    <string name="basic_management_cho_level_title">Basic Management</string>
+    <string name="basic_symptom_relief_provided">Basic symptom relief provided</string>
+    <string name="basic_psychosocial_support_provided">Psychosocial support provided</string>
+    <string name="basic_caregiver_counselling_provided">Caregiver counselling provided</string>
+    <string name="basic_management_remarks">Remarks</string>
+    <string name="distressing_symptoms_present">Distressing symptoms present</string>
+    <string name="bedridden_or_severely_dependent">Bedridden or severely dependent</string>
+    <string name="life_limiting_illness_known">Life-limiting illness known</string>
+    <string name="caregiver_support_required">Caregiver support required</string>
+    <string name="palliative_care_eligible">Palliative care eligible</string>
+    <string name="breathlessness">Breathlessness</string>
+    <string name="nausea">Nausea</string>
+    <string name="fatigue">Fatigue</string>
+    <string name="weakness">Weakness</string>
+    <string name="other">Other</string>
+    <string name="mild">Mild</string>
+    <string name="moderate">Moderate</string>
+    <string name="severe">Severe</string>
+    <string name="severe_pain_referral_alert">Severe pain detected. Referral to higher facility is recommended.</string>
+    <string name="severe_symptoms_referral_alert">Severe symptoms detected. Referral to higher facility is recommended.</string>
+
+    <string name="ophthalmic_vitamin_a_deficiency">Vitamin A Deficiency / Xerophthalmia</string>
+
+    <!-- Condition sub-field labels -->
+    <string name="ophthalmic_cataract_symptoms">Cataract Symptoms <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_glaucoma_symptoms">Glaucoma Symptoms <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_dr_symptoms">Diabetic Retinopathy Symptoms <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_presbyopia_symptoms">Presbyopia Symptoms <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_trachoma_status">Trachoma Status <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_corneal_disease_type">Corneal Disease Type <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_vitamin_a_deficiency_label">Vitamin A Deficiency Symptoms / Bitot\'s Spot Identified <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_trachoma_status">Select Trachoma Status</string>
+    <string name="ophthalmic_select_corneal_disease_type">Select Corneal Disease Type</string>
+
+    <!-- Condition sub-field alert texts -->
+    <string name="ophthalmic_alert_ophthalmologist_referral"> Refer to ophthalmologist at the secondary level.</string>
+    <string name="ophthalmic_alert_presbyopia_management"> Patient may qualify for presbyopia management (e.g., reading glasses) as per CHO service scope.</string>
+    <string name="ophthalmic_alert_vitamin_a"> Vitamin A prophylaxis to be given. Refer to ophthalmologist at the secondary level.</string>
+    <!-- Injury and Trauma module strings -->
+    <string name="ophthalmic_injury_trauma_title">Injury and Trauma Form</string>
+    <string name="ophthalmic_injury_type_label">Injury Type <font color="#FF0000">*</font></string>
+    <string name="ophthalmic_select_injury_type">Select Injury Type(s)</string>
+    <string name="ophthalmic_foreign_body_removal_attempted">Foreign Body Removal Attempted</string>
+    <string name="ophthalmic_chemical_exposure_wash_performed">Chemical Exposure \u2013 Thorough Wash Performed</string>
+
+    <string-array name="ophthalmic_reason_for_visit_options">
+        <item>Screening</item>
+        <item>Symptomatic</item>
+        <item>First aid for eye injury/ trauma</item>
+    </string-array>
+
+    <string-array name="ophthalmic_chart_options">
+        <item>Snellen\'s distance chart</item>
+        <item>Near vision chart</item>
+    </string-array>
+
+    <string-array name="ophthalmic_case_id_options">
+        <item>Cataract</item>
+        <item>Glaucoma</item>
+        <item>Diabetic retinopathy</item>
+        <item>Presbyopia</item>
+        <item>Trachoma</item>
+        <item>Corneal disease</item>
+        <item>Conjunctivitis/Acute red eye</item>
+        <item>Dry eye / xerophthalmia</item>
+        <item>Eye allergy</item>
+    </string-array>
+
+    <string-array name="ophthalmic_injury_type_options">
+        <item>Mechanical foreign body</item>
+        <item>Blunt trauma</item>
+        <item>Penetrating injury suspected</item>
+        <item>Chemical (acid/alkali/other)</item>
+    </string-array>
+
+    <string-array name="ophthalmic_foreign_body_options">
+        <item>Not attempted</item>
+        <item>Attempted from conjunctival sac</item>
+        <item>Foreign body lodged in cornea</item>
+    </string-array>
+
+    <string-array name="ophthalmic_trachoma_options">
+        <item>Suspected active trachoma</item>
+        <item>Suspected TT/TI</item>
+        <item>No trachoma</item>
+    </string-array>
+
+    <string-array name="ophthalmic_corneal_disease_options">
+        <item>Corneal opacity</item>
+        <item>Corneal ulcer suspected</item>
+        <item>Other corneal pathology</item>
+    </string-array>
+    <string name="saved_successfully">Saved successfully</string>
+    <string name="save_failed_retry">Save failed. Please retry.</string>
+    <string name="please_complete_field">Please complete: %s</string>
+
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>
     <string name="second_fragment_label">Second Fragment</string>
@@ -148,7 +334,7 @@
     <string name="generate_abha_id">Create ABHA Number</string>
 
     <string name="aadhar_consent_text">I hereby confirm that I have explained the below mentioned consent process to the individual for the creation of the ABHA Number using he individual\'s aadhar number</string>
-    <string name="PREF_rem_me_uname">user-name-local-saved</string>
+    <string name="PREF_rem_me_uname" translatable="false">user-name-local-saved</string>
     <string name="title_activity_nav">NavActivity</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -158,6 +344,8 @@
     <string name="action_settings">Settings</string>
 
     <string name="menu_home">Home</string>
+    <string name="tab_dashboard">Dashboard</string>
+    <string name="tab_rmnch">RMNCH</string>
     <string name="menu_gallery">Gallery</string>
     <string name="menu_slideshow">Slideshow</string>
     <string name="error_while_logging_in">Error while logging in!!</string>
@@ -301,7 +489,10 @@
     <string name="phone_number">Phone Number</string>
     <string name="registration_date">Registration Date</string>
     <string name="marital_status">Marital Status <font color="#FF0000">*</font></string>
-    <string name="spouse_name">Spouse Name</string>
+    <string name="spouse_name">Spouse Name <font color="#FF0000">*</font></string>
+    <string name="wife_name">Wife Name <font color="#FF0000">*</font></string>
+    <string name="husband_s_name">Husband\'s Name <font color="#FF0000">*</font></string>
+    <string name="wife_s_name">Wife\'s Name <font color="#FF0000">*</font></string>
     <string name="age_at_marriage">Age at Marriage <font color="#FF0000">*</font></string>
 
     <string name="revisit_date">Revisit Date</string>
@@ -314,18 +505,27 @@
     <string name="toast_upload_file">Please Upload the Selected File</string>
     <string name="toast_sub_cat_select">Please Select Sub Category</string>
     <string name="toast_cat_select">Please Select Category</string>
+    <string name="toast_visit_reason_select">Please Select Reason for Visit</string>
     <string name="toast_file_uploaded">You have uploaded the file</string>
     <string name="toast_file_size_max">Please select file less than 5MB</string>
     <string name="nav_item_1_text">Name : <b>%s</b></string>
+    <string name="nav_item_5_text">Facility Name : <b>%s</b></string>
+    <string name="nav_item_6_text">Employee Id : <b>%s</b></string>
+    <string name="nav_item_7_text">Facility Id : <b>%s</b></string>
+    <string name="nav_item_8_text">Location Type : <b>%s</b></string>
+    <string name="nav_item_4_text">Mobile No. : <b>%s</b></string>
     <string name="nav_item_2_text">Username : <b>%s</b></string>
     <string name="nav_item_3_text">User ID :  <b>%d</b></string>
-    <string name="PREF_user_entry">logged-in-user</string>
-    <string name="PREF_user_name">user name</string>
+    <string name="PREF_user_entry" translatable="false">logged-in-user</string>
+    <string name="PREF_user_name" translatable="false">user name</string>
     <string name="individual_s_consent_for_creation_of_abha_number">Individual’s consent for creation of ABHA Number.</string>
     <string name="exit">Exit</string>
     <string name="timer">timer</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="death">Death</string>
+    <string name="case_status_title">Case status</string>
+    <string name="date_of_death_title">Date of death</string>
     <string name="fp_tv">Please Place your Finger on the fingerprint sensor to proceed</string>
     <string name="fp_try_again">Finger Not Recognised Try Again!</string>
     <string name="fingerprint_captured">FingerPrint Captured!</string>
@@ -350,6 +550,8 @@
     <string name="something_wend_wong">Something Went Wrong</string>
     <string name="loading_form">Loading Form</string>
     <string name="loading">Loading Please Wait....</string>
+    <string name="initial_setup_title">Initial Setup</string>
+    <string name="initial_setup_subtitle">Downloading required data. This may take a few minutes on first login.</string>
     <string name="personal_information">Patient Registration</string>
     <string name="location_information">Location Information</string>
     <string name="other_information">Other Information</string>
@@ -360,11 +562,18 @@
     <string name="fill_dob">Fill Your Date Of Birth</string>
     <string name="enter_your_age">Enter Your Age</string>
     <string name="select_age_in_unit">Select Age in Unit</string>
-    <string name="select_mariital_status">Select Marital Status</string>
+    <string name="select_marital_status">Select Marital Status</string>
     <string name="enter_spouse_name">Enter Spouse Name</string>
+    <string name="enter_husband_name">Enter Husband Name</string>
+    <string name="enter_wife_name">Enter Wife Name</string>
     <string name="enter_age_at_marriage">Enter age at Marriage</string>
     <string name="select_gender">Select Gender</string>
     <string name="select_village">Select Village</string>
+    <string name="enter_father_s_name_error">Enter a valid Father\'s Name</string>
+    <string name="are_you_sure">Are you Sure?</string>
+    <string name="cancel_confirmation_message">Do you want to cancel? Any unsaved data will be lost.</string>
+    <string name="patient_registered_successfully_title">Patient Registered successfully</string>
+    <string name="patient_edited_successfully_title">Patient details edited successfully</string>
     <string name="network_error">Network Error!!</string>
     <string name="linked_to_beneficiary">Linked to Beneficiary</string>
     <string name="duration_tv">Duration</string>
@@ -372,6 +581,7 @@
     <string name="something_went_wrong">Something went wrong !</string>
     <string name="beneficiary_abha_number">Beneficiary ABHA Number.</string>
     <string name="no_records_found">No Records Found!!</string>
+    <string name="no_record_found">No record found</string>
     <string name="patients_cnt_display">" Patients"</string>
     <string name="subtractSign">-</string>
     <string name="addSign">+</string>
@@ -386,36 +596,45 @@
     <string name="nurseDataNotSaved">Nurse data is not saved for this record</string>
     <string name="dataSavedCaseRecord">Case Record Data Saved</string>
     <string name="pendingForLabtech">Pending For Lab Result</string>
+    <string name="pending_for_pharmacist_dispense">Pending For Pharmacist Dispense</string>
+    <string name="case_close_confirmation">This case is being closed. Do you want to proceed?</string>
+    <string name="case_closed_successfully">Case closed successfully</string>
+    <string name="close_case_btn">Close Case</string>
     <string name="flowCompleted">Flow Completed</string>
     <string name="unsyncedNurseData">There are unsynced nurse data found. please sync and try again</string>
     <string name="diagnosisCannotBeEmpty">Please Enter Provisional</string>
     <string name="note_ben_reg">Note!</string>
     <string name="please_search_for_beneficiary">Please search for Beneficiary before registration.</string>
     <string name="no_patient_found">No matching patient found. Please choose an option from below.</string>
-    <string name="pref_location_data">pref_location_data</string>
+    <string name="pref_location_data" translatable="false">pref_location_data</string>
     <string name="chief_complaint2">Chief Complaint List</string>
     <string name="beneficiary_name">Beneficiary Name:</string>
     <string name="abha_no">Abha No:</string>
     <string name="ben_id">Ben Id:</string>
     <string name="ben_age">Age:</string>
-    <string name="quantity_prescribed">Quantity Prescribed:</string>
+    <string name="quantity_prescribed">Prescribed Quantity:</string>
     <string name="quantity_in_hand">Quantity In Hand:</string>
-    <string name="quantity_dispensed">Quantity Dispensed:</string>
+    <string name="quantity_dispensed">Dispensed Quantity:</string>
     <string name="special_instructions">Special Instructions:</string>
     <string name="dispensed_quantity">Dispensed Quantity:</string>
     <string name="expiry_date">Expiry Date:</string>
     <string name="ben_phone_no">Phone No:</string>
+    <string name="ben_visit_date">Visit Date: </string>
+    <string name="ben_visit_num">Visit No: </string>
     <string name="ben_gender">Gender:</string>
     <string name="abha">ABHA</string>
     <string name="view_batch">View Batch</string>
     <string name="ok_button">Ok</string>
     <string name="change_role">Change Role</string>
-    <string name="password_local_saved">password-local-saved</string>
+    <string name="password_local_saved" translatable="false">password-local-saved</string>
     <string name="remember_me">Remember Me</string>
     <string name="other_cphc_services">Other CPHC Services</string>
+    <string name="other_cphc_category_key" translatable="false">Other CPHC Services</string>
     <string name="reason_for_visit">Reason For Visit</string>
     <string name="ben_card_name">Name:</string>
     <string name="beneficiary_id">Beneficiary ID:</string>
+    <string name="beneficiary_id_format">Beneficiary ID: %s</string>
+    <string name="beneficiary_id_label">Beneficiary ID: </string>
     <string name="master_longitude">Master Longitude</string>
     <string name="get_location">Get Location</string>
     <string name="master_latitude">Master Latitude</string>
@@ -427,11 +646,14 @@
     <string name="english_lang">English</string>
     <string name="kannada_lang">ಕನ್ನಡ</string>
     <string name="hindi_lang">हिंदी</string>
+    <string name="assamese">অসমীয়া</string>
     <string name="registrar_role">Registrar</string>
     <string name="nurse_role">Nurse</string>
     <string name="doctor_role">Doctor</string>
     <string name="pharmacist_role">Pharmacist</string>
     <string name="lab_technician_role">Lab Technician</string>
+    <string name="cho_role">CHO</string>
+    <string name="proceed_with_registration">Proceed with Registration</string>
     <string name="patient_successfully_registered">Patient Registered Successfully.</string>
     <string name="tap_to_take_photo">Tap to take photo</string>
     <string name="photo">Photo</string>
@@ -455,10 +677,12 @@
     <string name="visit_code">Visit Code:</string>
     <string name="prescription_id">Prescription ID:</string>
     <string name="form_label">Form: </string>
+    <string name="available_quantity">Total Available Quantity: </string>
+    <string name="patient_details_label">Patient: </string>
     <string name="prescribed_label">Prescribed: </string>
     <string name="prescribed_label_qt">Prescribed Quantity: </string>
     <string name="patient_registered_successfully">Patient Registered Successfully.</string>
-    <string name="father_s_name">Father\'s Name</string>
+    <string name="father_s_name">Father\'s Name <font color="#FF0000">*</font></string>
     <string name="exit_application">Exit Application</string>
     <string name="do_you_want_to_exit_application">Do you want to exit application</string>
     <string name="patient_cnt_display">" Patient"</string>
@@ -507,11 +731,16 @@
     <string name="form_input_max_limit_error">%1s should be lesser than or equal to %2d</string>
     <string name="form_input_max_limit_error_decimal">%1s should be lesser than or equal to %2.1f</string>
     <string name="form_input_error_invalid_mobile">Invalid Mobile Number !</string>
+    <string name="form_fill_field_error">Please fill: %1$s</string>
+    <string name="form_alert_title">Alert</string>
     <string name="form_input_error_invalid_rch">Invalid RCH ID !</string>
     <string name="form_input_error_invalid_mcp">Invalid MCP Number !</string>
     <string name="form_input_error_invalid_aadhar">Invalid Aadhaar Number !</string>
+    <string name="add_file">add file</string>
 
     <string name="view">VIEW</string>
+    <string name="image_unavailable">Image unavailable</string>
+    <string name="back">Back</string>
     <string name="something_wend_wong_contact_testing">Something wend wong! Contact testing!</string>
     <string name="iv_sync_state_tv">SYNC STATE</string>
     <string name="high_risk">High Risk</string>
@@ -521,26 +750,51 @@
     <string name="radio_title_ds">%s<span> **</span></string>
     <string name="radio_title">%s<span> *</span></string>
     <string name="anc_visit_number">ANC Visit %1d</string>
+    <string name="anc_visits">ANC Visits</string>
     <string name="pnc_visit_number">PNC Visit on Day %1d</string>
+    <string name="pnc_visits">PNC Visits</string>
+    <string name="view_visits">View Visits</string>
 
+    <string name="icon_title_pmr">Pregnant Women Registration</string>
+    <string name="title_register_pregnancy">Pregnant Women Registration</string>
+    <string name="title_view_pregnancy_registration">View Pregnancy Registration</string>
+    <string name="pwr_eligibility_error">Pregnancy Registration form is not available </string>
     <!--  Post Natal Care  -->
     <string name="pnc_period">PNC Period</string>
     <string name="pnc_visit_date">PNC Visit Date</string>
     <string name="pnc_ifa_tabs_given">No. of IFA Tablets given</string>
     <string name="pnc_contraception_method">Method of Contraception</string>
-    <string name="pnc_any_contraception_method">Any Method of Contraception</string>
-    <string name="pnc_other_ppc_method">Other PPC Method</string>
+    <string name="pnc_any_contraception_method">Family planning method used by the couple after delivery to avoid pregnancy?</string>
+    <string name="pnc_other_ppc_method">Other Contraception Method</string>
     <string name="pnc_mother_danger_sign">Mother Danger Sign</string>
     <string name="pnc_other_danger_sign">Other Danger Sign</string>
     <string name="pnc_referral_facility">Referral Facility</string>
     <string name="pnc_mother_death">Mother Death</string>
     <string name="pnc_death_date">Date of Death</string>
-    <string name="pnc_death_cause">Probable Cause of Mother Death</string>
+    <string name="pnc_death_cause">Cause of Maternal Death</string>
     <string name="pnc_other_death_cause">Other Death Cause</string>
     <string name="pnc_death_place">Place of Death</string>
     <string name="pnc_remarks">Remarks</string>
+    <string name="pnc_calcium_supplementation">Calcium supplementation</string>
+    <string name="pnc_maternal_symptoms">Maternal Symptoms</string>
+    <string name="pnc_other_maternal_symptoms">Other maternal symptoms</string>
+    <string name="pnc_pallor">Pallor (Anemia check)</string>
+    <string name="pnc_vaginal_bleeding">Vaginal Bleeding</string>
+    <string name="pnc_date_of_sterilization">Date of Sterilization</string>
+    <string name="pnc_any_danger_sign">Any Danger Signs?\nAny High-risk identified?</string>
+    <string name="other_place_of_death">Other Place of Death</string>
+    <string name="pnc_ifa_max_error">IFA Tablets cannot exceed 400</string>
+    <string name="pnc_calcium_max_error">Calcium supplementation cannot exceed 400</string>
+    <string name="pnc_referral_alert_multiple_symptoms">Referral required: 2 or more maternal symptoms detected</string>
+    <string name="pnc_referral_alert_severe_pallor">Referral required: Severe pallor detected</string>
+    <string name="pnc_referral_alert_vaginal_bleeding">Referral required: Heavy bleeding or foul-smelling discharge detected</string>
     <string name="tracking_form_filled_successfully">Tracking form filled successfully</string>
+    <string name="form_save_failed">Failed to save form. Please try again.</string>
     <string name="tracking_date">Date of Visit</string>
+    <string name="visit_history_title">Visit History</string>
+    <string name="no_visits_found">No visits found</string>
+    <string name="visit_count_icon">Visit count icon</string>
+    <string name="error_loading_visits">Error loading visits. Please try again.</string>
     <string name="long_to_string">%d</string>
     <string-array name="pnc_period_array">
         <item>1st Day</item>
@@ -560,8 +814,10 @@
         <item>CONDOM</item>
         <item>MALE STERILIZATION</item>
         <item>FEMALE STERILIZATION</item>
-        <item>POST PARTUM STERILIZATION (PPS WITHIN 7 DAYS OF DELIVERY)</item>
-        <item>ANY OTHER (SPECIFY)</item>
+        <item>POST PARTUM STERILIZATION (PPS)</item>
+        <item>Minilap</item>
+        <item>None</item>
+        <item>OTHER</item>
     </string-array>
     <string-array name="pnc_mother_danger_sign_array">
         <item>PPH</item>
@@ -580,16 +836,64 @@
         <item>Any Other (Specify)</item>
     </string-array>
     <string-array name="pnc_death_cause_array">
-        <item>ECLAMPSIA</item>
-        <item>HAEMORRHAGE (PPH)</item>
-        <item>ANAEMIA</item>
-        <item>HIGH FEVER</item>
-        <item>Any Other</item>
+        <item>Eclampsia</item>
+        <item>Hemorrhage (PPH)</item>
+        <item>Anaemia</item>
+        <item>High fever</item>
+        <item>Sepsis</item>
+        <item>Accident</item>
+        <item>Other</item>
     </string-array>
     <string-array name="pnc_death_place_array">
         <item>Home</item>
-        <item>Hospital</item>
-        <item>Transit</item>
+        <item>Subcenter</item>
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>District Hospital</item>
+        <item>Medical College Hospital</item>
+        <item>Private Hospital</item>
+        <item>In Transit</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="pnc_maternal_symptoms_array">
+        <item>Excessive bleeding</item>
+        <item>Foul-smelling discharge</item>
+        <item>Fever</item>
+        <item>Severe abdominal pain</item>
+        <item>Breast pain</item>
+        <item>Painful urination</item>
+        <item>Severe headache</item>
+        <item>Dizziness</item>
+        <item>Difficulty breathing</item>
+        <item>Swelling</item>
+        <item>Wound pain</item>
+        <item>Mood changes</item>
+        <item>None</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="pnc_pallor_array">
+        <item>None</item>
+        <item>Mild</item>
+        <item>Moderate</item>
+        <item>Severe</item>
+    </string-array>
+    <string-array name="pnc_vaginal_bleeding_array">
+        <item>Normal</item>
+        <item>Heavy bleeding</item>
+        <item>Foul-smelling discharge</item>
+        <item>Scanty</item>
+        <item>Stopped</item>
+    </string-array>
+    <string-array name="sterilization_methods_array">
+        <item>MALE STERILIZATION</item>
+        <item>FEMALE STERILIZATION</item>
+        <item>POST PARTUM STERILIZATION (PPS WITHIN 7 DAYS OF DELIVERY)</item>
+        <item>Minilap</item>
+    </string-array>
+    <string-array name="female_sterilization_methods_array">
+        <item>FEMALE STERILIZATION</item>
+        <item>POST PARTUM STERILIZATION (PPS WITHIN 7 DAYS OF DELIVERY)</item>
+        <item>Minilap</item>
     </string-array>
     <string-array name="visit_months">
         <item>Jan</item>
@@ -613,9 +917,25 @@
         <item>Mala N</item>
         <item>Chaya</item>
         <item>ECP</item>
+        <item>Male Sterilization</item>
+        <item>Female Sterilization</item>
+        <item>MiniLap</item>
         <item>Any Other Method</item>
     </string-array>
 
+    <string-array name="antra_doses">
+        <item>1st Dose</item>
+        <item>2nd Dose</item>
+        <item>3rd Dose</item>
+        <item>4th Dose</item>
+        <item>5th Dose</item>
+        <item>6th Dose</item>
+        <item>7th Dose</item>
+        <item>8th Dose</item>
+        <item>9th Dose</item>
+        <item>10th Dose</item>
+    </string-array>
+
     <string name="template_null">Enter Template Name</string>
     <string name="templte_exists">Template name already exists</string>
     <string name="delete_temp">Delete Template</string>
@@ -627,4 +947,1274 @@
     <string name="edd_date">EDD Date</string>
     <string name="update_btn">Update</string>
 
-</resources>
\ No newline at end of file
+
+    <!-- EC Tracking Form -->
+    <string name="ec_tracking_title">Eligible Couple Tracking</string>
+    <string name="status_of_woman_eligible_couple_name">Eligible Couple</string>
+    <string name="status_of_woman_eligible_couple_code">EC</string>
+    <string name="status_of_woman_pregnant_woman_name">Pregnant Woman</string>
+    <string name="status_of_woman_pregnant_woman_code">PW</string>
+    <string name="status_of_woman_postnatal_name">Postnatal</string>
+    <string name="status_of_woman_postnatal_code">PN</string>
+    <string name="status_of_woman_elderly_name">Elderly</string>
+    <string name="status_of_woman_elderly_code">EL</string>
+    <string name="status_of_woman_adolescent_name">Adolescent</string>
+    <string name="status_of_woman_adolescent_code">AD</string>
+    <string name="status_of_woman_permanent_sterilization_name">Permanent Sterilization</string>
+    <string name="status_of_woman_permanent_sterilization_code">ST</string>
+    <string name="status_of_woman_not_applicable_name">Not Applicable</string>
+    <string name="status_of_woman_not_applicable_code">NA</string>
+    <string name="is_pregnancy_test_done">Is Pregnancy Test Done?</string>
+    <string name="pregnancy_test_result">Pregnancy Test Result</string>
+    <string name="is_woman_pregnant">Is the Woman Pregnant?</string>
+    <string name="using_family_planning">Are you using / Do you want to use any Family Planning Method?</string>
+    <string name="method_of_contraception_label">Method of Contraception</string>
+    <string name="any_other_method">Any Other Method</string>
+    <string name="antra_dose">ANTRA Dose</string>
+    <string name="antra_injection_date">Date of ANTRA Injection</string>
+    <string name="antra_due_date">Due Date of Next Injection</string>
+    <string name="date_of_sterilization">Date of Sterilization</string>
+    <string name="incentive_alert_title">Incentive Information</string>
+    <string name="antra_incentive_alert">Please upload MCA Card photo to claim your Incentive</string>
+    <string name="sterilization_incentive_alert">Please upload Discharge Summary photo to claim your Incentive</string>
+    <string name="one_visit_per_month_error">Only one visit is allowed per month</string>
+    <string name="visit_date_before_registration_error">Visit date cannot be before EC Registration date</string>
+    <string name="lmp_backdated_limit_error">LMP date can only be backdated up to 6 months</string>
+    <string name="sterilization_backdated_limit_error">Date of sterilization can only be backdated up to 2 months</string>
+    <string name="antra_backdated_limit_error">Date of ANTRA injection can only be backdated up to 2 months</string>
+    <string name="antra_dose_restart_alert">Gap is more than 120 days. Restarting from Dose 1.</string>
+    <string name="not_available">not available</string>
+
+
+    <!-- RMNCHA+ Dashboard Module Strings -->
+    <string name="all_beneficiaries">All Beneficiaries</string>
+    <string name="eligible_couple_list">Eligible Couple List</string>
+    <string name="maternal_health">Maternal Health</string>
+    <string name="child_care">Child Care</string>
+    <string name="disease_control">Disease Control</string>
+    <string name="communicable_diseases">Communicable Diseases</string>
+    <string name="routine_immunization">Routine Immunization</string>
+    <string name="high_risk_assessment">High Risk Assessment</string>
+    <string name="general_opd_care_list">General OPD Care List</string>
+    <string name="death_reports">Death Reports</string>
+    <string name="village_level_forms">Village Level Forms</string>
+    <string name="cd_icon_grid_icon">Icon Grid Item</string>
+
+    <!-- Maternal Health Sub-modules -->
+    <string name="pregnant_women_registration">Pregnant Women Registration</string>
+    <string name="delivery_outcome">Delivery Outcome</string>
+    <string name="pnc_mother_list">PNC Mother List</string>
+    <string name="e_pmsma_list" translatable="false">e-PMSMA List</string>
+    <string name="add_e_pmsma_visit">Add e-PMSMA Visit</string>
+    <string name="view_e_pmsma" >View e-PMSMA</string>
+    <string name="infant_registration">Infant Registration</string>
+    <string name="child_registration">Child Registration</string>
+    <string name="abortion_list">Abortion List</string>
+
+    <!-- Child Care Sub-modules -->
+    <string name="infant_list">Infant Registration List</string>
+    <string name="child_list">Child List</string>
+    <string name="adolescent_list">Adolescent List</string>
+    <string name="children_under_5_years">Children under 5 Years</string>
+
+    <!-- Eligible Couple Sub-modules -->
+    <string name="eligible_couple_registration">Eligible Couple Registration</string>
+    <string name="eligible_couple_tracking">Eligible Couple Tracking</string>
+
+    <!-- Eligible Couple List Strings -->
+    <string name="husband_name">Husband Name </string>
+    <string name="lmp_date">LMP Date</string>
+    <string name="missed_period">Missed Period</string>
+    <string name="under_review">Under Review</string>
+    <string name="register">Register</string>
+    <string name="no_eligible_couples_found">No Eligible Couples Found</string>
+    <string name="no_registered_couples_found">No Registered Couples Found</string>
+    <string name="call">Call</string>
+    <string name="mobile_number_not_present">Mobile number not present</string>
+    <string name="no_data">N/A</string>
+    <string name="search">Search</string>
+    <string name="status">Status</string>
+    <string name="age_ben">Age</string>
+    <string name="tv_mob_no_ph">Mobile Number</string>
+    <string name="tv_rch_id">RCH ID</string>
+
+
+    <!-- Pregnant Women Registration Strings -->
+    <string name="no_pregnant_women_found">No Pregnant Women Found</string>
+
+    <!-- ANC Visits Strings -->
+    <string name="weeks_of_pregnancy">Weeks Of Pregnancy</string>
+    <string name="edd">EDD</string>
+    <string name="last_visit_date">Last Visit Date</string>
+    <string name="add_anc_visit">ADD ANC VISIT</string>
+    <string name="add_pmsma">ADD PMSMA</string>
+    <string name="no_anc_eligible_women_found">No ANC Eligible Women Found</string>
+
+    <!-- Delivery Outcome Strings -->
+    <string name="no_delivered_women_found">No Delivered Women Found</string>
+    <string name="do_mother_condition">Mother\'s Condition Immediately Post-Delivery</string>
+    <string name="do_maternal_complications">Maternal Complications</string>
+    <string name="do_mother_currently_admitted">Mother Currently Admitted?</string>
+    <string name="do_discharge_date">Date of Discharge</string>
+    <string name="do_discharge_time">Time of Discharge</string>
+    <string name="do_delivery_outcome">Outcomes of Delivery</string>
+    <string name="do_live_birth">Live Birth</string>
+    <string name="do_still_birth">Still Birth</string>
+    <string name="do_next">Next</string>
+    <string name="do_inform_district_nodal_officer">Inform District Nodal Officer</string>
+    <string name="do_alert_intensive_pnc">Intensive PNC monitoring recommended for this mother.</string>
+    <string name="do_hysterectomy_note">Family planning status and eligible couple tracking will be updated for hysterectomy.</string>
+    <string name="do_maternal_death_audit">Maternal death audit form will be opened.</string>
+    <string name="do_discharge_date_before_delivery">Discharge date cannot be before delivery date.</string>
+    <string name="do_vitals_and_prescription">Vitals &amp; Prescription</string>
+    <string-array name="do_mother_condition_array">
+        <item>Healthy / Stable</item>
+        <item>Complication (specify)</item>
+        <item>Critical / ICU admission</item>
+        <item>Maternal Death</item>
+    </string-array>
+    <string-array name="do_maternal_complications_array">
+        <item>Post-Partum Hemorrhage (PPH)</item>
+        <item>Retained placenta</item>
+        <item>Perineal tear (1st/2nd degree)</item>
+        <item>Perineal tear (3rd/4th degree)</item>
+        <item>Uterine rupture</item>
+        <item>Sepsis/ Infection</item>
+        <item>Pre-eclampsia/Eclampsia</item>
+        <item>Blood transfusion required</item>
+        <item>Hysterectomy performed</item>
+        <item>Anesthesia complication</item>
+        <item>Other</item>
+    </string-array>
+    <string-array name="do_mother_admitted_array">
+        <item>Yes (Still in hospital)</item>
+        <item>No (Discharged)</item>
+    </string-array>
+
+    <string name="do_woman_name">Name of the woman</string>
+    <string name="do_woman_age">Age</string>
+    <string name="do_case_id">Case ID:</string>
+    <string name="do_view_anc_history">View ANC History</string>
+    <string name="do_delivery_date">Date of Delivery</string>
+    <string name="do_delivery_time">Time of Delivery</string>
+    <string name="do_gestational_age_at_delivery">Gestational Age at Delivery</string>
+    <string name="do_place_of_delivery">Place of Delivery</string>
+    <string name="do_private_hospital_name">If Private Hospital, specify name</string>
+    <string name="do_delivery_conducted_by">Delivery conducted by</string>
+    <string name="do_mode_of_delivery">Mode of Delivery</string>
+    <string name="do_indication_for_lscs">Indication for LSCS/Emergency LSCS/Assisted</string>
+    <string name="do_indication_for_lscs_other">Other (specify)</string>
+    <string name="do_error_future_date">Cannot be a future date</string>
+    <string name="do_error_date_range">Date must be between %1$s and %2$s</string>
+    <string name="do_alert_post_term_delivery">Post-term delivery</string>
+    <string name="do_alert_preterm_delivery">Preterm delivery</string>
+    <string name="do_alert_home_delivery">Home delivery occurred. Provide counselling on risks. Ensure immediate PNC visit within 24 hours.</string>
+    <string name="do_alert_on_the_way">Urgent PNC home visit within 24 hours required.</string>
+    <string name="do_alert_unskilled_delivery">Unskilled delivery. High-risk PNC needed.</string>
+    <string name="do_alert_extremely_preterm">Extremely Preterm (&lt;28 weeks)</string>
+    <string name="do_alert_very_preterm">Very Preterm (28–32 weeks)</string>
+    <string name="do_alert_moderate_preterm">Moderate to Late Preterm (32–37 weeks)</string>
+    <string name="do_alert_term">Term (37–42 weeks)</string>
+    <string name="do_alert_post_term">Post-term (&gt;42 weeks)</string>
+    <string name="do_error_indication_required">Please select at least one indication</string>
+    <string name="do_error_indication_other_required">Please specify the indication</string>
+
+    <string-array name="do_place_of_delivery_array">
+        <item>Sub-Centre</item>
+        <item>Primary Health Centre (PHC)</item>
+        <item>Community Health Centre (CHC)</item>
+        <item>District Hospital (DH)</item>
+        <item>Medical College Hospital</item>
+        <item>Referral/Tertiary Hospital</item>
+        <item>Private Hospital</item>
+        <item>Home delivery</item>
+        <item>On the way to facility</item>
+    </string-array>
+    <string-array name="do_delivery_conducted_by_array">
+        <item>Doctor (MBBS/Specialist)</item>
+        <item>Nurse/ANM</item>
+        <item>CHO</item>
+        <item>Skilled Birth Attendant (SBA)</item>
+        <item>Dai/TBA (Traditional Birth Attendant)</item>
+        <item>Family member</item>
+        <item>Self/Unassisted</item>
+    </string-array>
+    <string-array name="do_mode_of_delivery_array">
+        <item>Normal Vaginal Delivery (NVD)</item>
+        <item>Vacuum/ Forceps Assisted</item>
+        <item>Lower Segment Cesarean Section (LSCS)</item>
+        <item>Emergency LSCS</item>
+        <item>Vaginal Birth After Cesarean (VBAC)</item>
+    </string-array>
+    <string-array name="do_indication_for_lscs_array">
+        <item>Fetal distress</item>
+        <item>Cephalopelvic disproportion (CPD)</item>
+        <item>Previous LSCS</item>
+        <item>Malpresentation (Breech/Transverse)</item>
+        <item>Prolonged/Obstructed labor</item>
+        <item>Antepartum hemorrhage (APH)</item>
+        <item>Pre-eclampsia/Eclampsia</item>
+        <item>Cord prolapse</item>
+        <item>Failed induction</item>
+        <item>Multiple pregnancies</item>
+        <item>Maternal request</item>
+        <item>Other (specify)</item>
+    </string-array>
+
+
+    <!-- PNC Mother List Strings -->
+    <string name="delivery_date">Date of Delivery</string>
+    <string name="days_since_delivery">Days Since Delivery</string>
+    <string name="no_pnc_mothers_found">No PNC Mothers Found</string>
+    <string name="no_e_pmsma_women_found">No e-PMSMA Women Found</string>
+
+    <!-- Infant Registration Strings -->
+    <string name="infant_reg_list">Infant Reg List</string>
+    <string name="mother_name">Mother\'s Name</string>
+    <string name="no_infants_found">No Infants Found</string>
+
+    <!-- Child Registration Strings -->
+    <string name="child_reg_list">Child Registration List</string>
+    <string name="no_children_found">No Children Found</string>
+    <string name="name_of_child">Name of Child</string>
+    <string name="child_registration_saved">Child registration saved successfully</string>
+
+    <!-- Abortion List Strings -->
+    <string name="abortion_date">Abortion Date</string>
+    <string name="no_abortion_records_found">No Abortion Records Found</string>
+
+    <!-- e-PMSMA List Strings -->
+    <string name="no_pmsma_women_found">No PMSMA Women Found</string>
+
+    <!-- Adolescent List Strings -->
+    <string name="no_adolescents_found">No Adolescents Found</string>
+
+    <!-- Children under 5 Years List Strings -->
+    <string name="no_children_under_5_found">No Children under 5 Years Found</string>
+    <string name="check_sam">Check SAM</string>
+    <string name="ors">ORS</string>
+    <string name="ifa">IFA</string>
+    <string name="add_visit">Add Visit</string>
+    <string name="view_visit">View Visit</string>
+    <string name="visit_history">Visit History</string>
+    <string name="no_of_children">No. of Children</string>
+    <string name="select_mariital_status">Select Marital Status</string>
+    <string name="select_status_of_woman">Select Status of Woman</string>
+    <string name="duplicate_face_detected">Duplicate face detected</string>
+    <string name="duplicate_face_message">A similar face was found in the system. Do you want to use the existing record or continue with new registration?</string>
+    <string name="use_existing">Use Existing</string>
+    <string name="continue_new">Continue New</string>
+
+    <!-- Status of Woman -->
+    <string name="status_of_woman">Status of Woman <font color="#FF0000">*</font></string>
+    <string name="does_beneficiary_have_abha">Does beneficiary have ABHA ID?</string>
+    <string name="abha_id_number">ABHA ID Number (14 digits)</string>
+    <string name="abha_enrollment_alert">Please counsel the beneficiary to enroll for ABHA ID</string>
+    <string name="patient_details_edited_successfully">Patient details edited successfully</string>
+    <string name="invalid_abha_format">ABHA ID must be 14 digits</string>
+
+    <!-- Beneficiary Card -->
+    <string name="beneficiary_card_title">Beneficiary Card</string>
+    <string name="age_gender_label">Age / Gender</string>
+    <string name="phone_number_label">Phone Number</string>
+    <string name="village_name_label">Village Name</string>
+    <string name="abha_id_label">ABHA ID</string>
+    <string name="generate_abha_id_btn">Generate ABHA ID</string>
+    <string name="continue_btn">Continue</string>
+    <string name="view_beneficiary_card">View Card</string>
+
+    <!-- Edit Beneficiary Details -->
+    <string name="edit_beneficiary_details">Edit Beneficiary Details</string>
+    <string name="last_name_optional">Last Name (Optional)</string>
+    <string name="phone_number_optional">Phone Number (Optional)</string>
+    <string name="age_mandatory">Age <font color="#FF0000">*</font></string>
+    <string name="years_mandatory">Years <font color="#FF0000">*</font></string>
+    <string name="months_optional">Months</string>
+    <string name="days_optional">Days</string>
+    <string name="save_btn">Save</string>
+    <string name="cancel_btn">Cancel</string>
+    <string name="title_mental_health_screening">Mental Health Screening</string>
+    <string name="mental_health_screening_saved">Mental Health Screening saved successfully</string>
+    <string name="edit_btn">Edit</string>
+    <string name="age_years_required">Age in years is required</string>
+    <string name="beneficiary_updated_successfully">Beneficiary details updated successfully</string>
+    <string name="status_of_woman_required">Status of Woman is required</string>
+    <string name="speak_now">Speak now...</string>
+    <string name="speech_recognition_error">Speech recognition not available</string>
+    <string name="beneficiary_photo_content_description">Photo of %s</string>
+    <string name="desc_patient_photo">Patient photo</string>
+
+    <!-- Neonatal Outcome Strings -->
+    <string name="neonatal_outcome">Neonatal Outcome</string>
+    <string name="baby_number">Baby %1d</string>
+    <string name="no_outcome_at_birth">Outcome at Birth</string>
+    <string name="no_sex">Sex</string>
+    <string name="no_cried_immediately">Cried immediately after birth?</string>
+    <string name="no_type_of_resuscitation">Type of Resuscitation</string>
+    <string name="no_birth_weight">Birth Weight (in grams)</string>
+    <string name="no_congenital_anomaly_detected">Any congenital anomaly detected?</string>
+    <string name="no_type_of_congenital_anomaly">Type of congenital anomaly</string>
+    <string name="no_other_congenital_anomaly">Other congenital anomaly (specify)</string>
+    <string name="no_newborn_complications">Newborn Complications</string>
+    <string name="no_current_status_of_baby">Current Status of Baby</string>
+    <string name="no_cause_of_death">Cause of Death</string>
+    <string name="no_other_cause_of_death">Other cause of death (specify)</string>
+    <string name="no_birth_dose_vaccines_given">Birth dose vaccines given</string>
+    <string name="no_reason_for_no_vaccines">Reason for not giving birth dose vaccines</string>
+    <string name="no_vitamin_k_injection_given">Vitamin K injection given?</string>
+    <string name="no_reason_for_no_vitamin_k">Reason for not giving Vitamin K injection</string>
+    <string name="no_birth_certificate_issued">Birth Certificate issued?</string>
+
+    <!-- Alerts -->
+    <string name="no_alert_lbw">Low Birth Weight (LBW): 1500-2499g. Close monitoring required.</string>
+    <string name="no_alert_vlbw">Very Low Birth Weight (VLBW): 1000-1499g. Immediate SNCU referral recommended.</string>
+    <string name="no_alert_elbw">Extremely Low Birth Weight (ELBW): \u003c1000g. Critical - NICU care required.</string>
+    <string name="no_alert_macrosomia">Macrosomia (flag for maternal GDM screening)</string>
+    <string name="no_alert_ambiguous_sex">Ambiguous genitalia detected. Pediatric specialist referral required.</string>
+    <string name="no_alert_stillbirth">Stillbirth recorded. Stillbirth audit form will be triggered.</string>
+    <string name="no_alert_neonatal_death">Neonatal death recorded. Death audit form will be triggered.</string>
+    <string name="no_alert_complications">Immediate pediatric/specialist review required for complications.</string>
+    <string name="no_alert_pnc_counseling">Ensure proper PNC counseling for mother on newborn care.</string>
+    <string name="no_alert_birth_certificate_legal">Birth registration is a legal requirement.</string>
+
+    <!-- Validation -->
+    <string name="no_error_birth_weight_range">Birth weight must be between 500g and 6000g</string>
+    <string name="no_error_birth_weight_required">Please enter birth weight</string>
+    <string name="no_error_outcome_required">Please select outcome at birth</string>
+    <string name="no_error_sex_required">Please select sex</string>
+    <string name="no_error_crying_status_required">Please select crying status</string>
+    <string name="no_error_resuscitation_required">Please select type of resuscitation</string>
+    <string name="no_error_current_status_required">Please select current status of baby</string>
+    <string name="no_error_cause_of_death_required">Please select cause of death</string>
+    <string name="no_error_vaccines_required">Please select vaccines given</string>
+    <string name="no_error_vitamin_k_required">Please select if Vitamin K was given</string>
+    <!-- Ear Diagnosis Form -->
+    <string name="title_ear_diagnosis">Ear Diagnosis Form</string>
+    <string name="pain_symptom_assessment_saved">Pain and Symptom Assessment Saved</string>
+    <string name="title_pain_symptom_assessment">Palliative Care Identification Form</string>
+    <string name="ear_diagnosis_saved">Ear Diagnosis Saved</string>
+    <string name="title_nose_diagnosis">Nose Diagnosis Form</string>
+    <string name="nose_diagnosis_saved">Nose Diagnosis Saved</string>
+    <string name="title_throat_diagnosis">Throat Diagnosis Form</string>
+    <string name="throat_diagnosis_saved">Throat Diagnosis Saved</string>
+
+    <!-- Throat Diagnosis Dataset -->
+    <string name="throat_diagnosis_symptoms">Symptoms</string>
+    <string name="throat_diagnosis_neck_swelling">Swelling in the neck (Thyroid)</string>
+    <string name="throat_diagnosis_difficulty_swallowing">Difficulty in Swallowing</string>
+    <string name="throat_diagnosis_tonsillitis">Tonsillitis</string>
+    <string name="throat_diagnosis_pharyngitis">Pharyngitis</string>
+    <string name="throat_diagnosis_laryngitis">Laryngitis</string>
+    <string name="throat_diagnosis_sinusitis">Sinusitis</string>
+    <string name="throat_diagnosis_cleft_lip">Cleft Lip</string>
+    <string name="throat_diagnosis_cleft_palate">Cleft Palate</string>
+
+    <string name="throat_symptom_pain">Pain</string>
+    <string name="throat_symptom_soreness">Soreness</string>
+    <string name="throat_symptom_cold">Cold</string>
+    <string name="throat_symptom_itching">Itching</string>
+    <string name="throat_symptom_hoarseness">Hoarseness</string>
+    <string name="show_cphc_details">Show CPHC Details</string>
+    <string name="cphc_details_title">CPHC Details</string>
+    <string name="no_previous_cphc_details">No CPHC data found.</string>
+    <string name="cphc_visit_current_format">Visit No: %1$d</string>
+    <string name="cphc_reported_concerns">Reported Concerns:</string>
+    <string name="cphc_show_unavailable_details">Show unavailable details (%1$d)</string>
+    <string name="cphc_hide_unavailable_details">Hide unavailable details</string>
+    <string name="cphc_referral_follow_up">Referral and Follow-up</string>
+    <string name="cphc_referral">Referral</string>
+    <string name="cphc_case_status">Case Status</string>
+    <string name="cphc_date_of_death">Date of Death</string>
+    <string name="cphc_follow_up_required">Follow-up Required</string>
+    <string name="cphc_referral_required">Referral Required</string>
+    <string name="cphc_referral_level">Referral Level</string>
+    <string name="cphc_reason_for_referral">Reason for Referral</string>
+    <string name="cphc_remarks">Remarks</string>
+    <string name="cphc_ear_diagnosis">Ear Diagnosis</string>
+    <string name="cphc_ear_foreign_body">Foreign Body In Ear</string>
+    <string name="cphc_ear_condition_type">Ear Condition Type</string>
+    <string name="cphc_nose_diagnosis">Nose Diagnosis</string>
+    <string name="cphc_throat_diagnosis">Throat Diagnosis</string>
+    <string name="cphc_oral_health">Oral Health</string>
+    <string name="cphc_ophthalmic">Ophthalmic</string>
+    <string name="cphc_elderly">Elderly Health</string>
+    <string name="cphc_mental">Mental Health</string>
+    <string name="cphc_nose_difficulty_breathing">Difficulty Breathing</string>
+    <string name="cphc_nose_open_mouth_breathing">Open Mouth Breathing</string>
+    <string name="cphc_nose_bleed">Nose Bleed</string>
+    <string name="cphc_nose_systolic_bp">Systolic BP</string>
+    <string name="cphc_nose_diastolic_bp">Diastolic BP</string>
+    <string name="cphc_nose_foreign_body">Foreign Body Nose</string>
+    <string name="cphc_nose_sinusitis">Sinusitis</string>
+    <string name="cphc_throat_symptoms">Symptoms</string>
+    <string name="cphc_throat_neck_swelling">Neck Swelling</string>
+    <string name="cphc_throat_difficulty_swallowing">Difficulty Swallowing</string>
+    <string name="cphc_throat_tonsillitis">Tonsillitis</string>
+    <string name="cphc_throat_pharyngitis">Pharyngitis</string>
+    <string name="cphc_throat_laryngitis">Laryngitis</string>
+    <string name="cphc_throat_sinusitis">Sinusitis</string>
+    <string name="cphc_throat_cleft_lip">Cleft Lip</string>
+    <string name="cphc_throat_cleft_palate">Cleft Palate</string>
+    <string name="cphc_oral_tooth_decay_present">Tooth Decay Present</string>
+    <string name="cphc_oral_tooth_decay_symptoms">Tooth Decay Symptoms</string>
+    <string name="cphc_oral_gum_disease_present">Gum Disease Present</string>
+    <string name="cphc_oral_gum_disease_symptoms">Gum Disease Symptoms</string>
+    <string name="cphc_oral_irregular_teeth_jaws">Irregular Teeth/Jaws</string>
+    <string name="cphc_oral_abnormal_growth_ulcer">Abnormal Growth/Ulcer</string>
+    <string name="cphc_oral_cleft_lip_palate">Cleft Lip/Palate</string>
+    <string name="cphc_oral_dental_fluorosis">Dental Fluorosis</string>
+    <string name="cphc_oral_dental_emergency">Dental Emergency</string>
+    <string name="cphc_oph_is_diabetic">Is Diabetic</string>
+    <string name="cphc_oph_screening_performed">Screening Performed</string>
+    <string name="cphc_oph_visual_acuity_chart_used">Visual Acuity Chart Used</string>
+    <string name="cphc_oph_dist_va_right">Distance VA Right</string>
+    <string name="cphc_oph_dist_va_left">Distance VA Left</string>
+    <string name="cphc_oph_near_va">Near VA</string>
+    <string name="cphc_oph_case_id_conditions">Case ID Conditions</string>
+    <string name="cphc_oph_injury_type">Injury Type</string>
+    <string name="cphc_elderly_geriatric_complaints">Geriatric Complaints</string>
+    <string name="cphc_elderly_multiple_chronic_conditions">Multiple Chronic Conditions</string>
+    <string name="cphc_elderly_recent_falls">Recent Falls</string>
+    <string name="cphc_elderly_difficulty_walking_balance">Difficulty Walking/Balance</string>
+    <string name="cphc_elderly_visual_hearing_difficulty">Visual/Hearing Difficulty</string>
+    <string name="cphc_elderly_functional_decline">Functional Decline</string>
+    <string name="cphc_elderly_total_score">Total Score</string>
+    <string name="cphc_elderly_functional_status">Functional Status</string>
+    <string name="cphc_elderly_memory_loss">Memory Loss</string>
+    <string name="cphc_elderly_dementia_outcome">Dementia Screening Outcome</string>
+    <string name="cphc_mental_emotional_behavioural_concerns">Emotional/Behavioural Concerns</string>
+    <string name="cphc_mental_substance_use_concerns">Substance Use Concerns</string>
+    <string name="cphc_mental_self_harm_suicide_thoughts">Self Harm/Suicide Thoughts</string>
+    <string name="cphc_mental_memory_loss_confusion">Memory Loss/Confusion</string>
+    <string name="cphc_mental_seizures_fits_loc">Seizures/Fits (LOC)</string>
+    <string name="cphc_mental_phq9_total_score">PHQ-9 Total Score</string>
+    <string name="cphc_mental_phq9_depression_severity">PHQ-9 Depression Severity</string>
+    <string name="cphc_mental_phq9_system_action">PHQ-9 System Action</string>
+    <string name="cphc_mental_suicide_risk_level">Suicide Risk Level</string>
+    <string name="cphc_mental_referral_required">Referral Required</string>
+    <string name="cphc_mental_follow_up_required">Follow-up Required</string>
+    <string name="cphc_mental_is_postpartum">Is Postpartum</string>
+    <string name="cphc_mental_substance_current_tobacco_use">Current Tobacco Use</string>
+    <string name="cphc_mental_substance_tobacco_type">Tobacco Type</string>
+    <string name="cphc_mental_substance_tobacco_frequency">Tobacco Frequency</string>
+    <string name="cphc_mental_substance_alcohol_use">Alcohol Use</string>
+    <string name="cphc_mental_substance_other_use">Other Substance Use</string>
+    <string name="cphc_mental_substance_other_specify">Other Substance Specify</string>
+    <string name="cphc_mental_substance_frequency">Substance Frequency</string>
+    <string name="cphc_mental_substance_system_action">Substance System Action</string>
+    <string name="cphc_mental_brief_intervention_given">Brief Intervention Given</string>
+    <string name="cphc_mental_suicide_current_thoughts">Current Self-harm Thoughts</string>
+    <string name="cphc_mental_suicide_plan">Suicide Plan</string>
+    <string name="cphc_mental_suicide_previous_attempt">Previous Attempt</string>
+    <string name="cphc_mental_suicide_hopelessness">Hopelessness</string>
+    <string name="cphc_mental_referral_level">Referral Level</string>
+    <string name="cphc_mental_reason_for_referral">Reason for Referral</string>
+    <string name="cphc_mental_referral_date">Referral Date</string>
+    <string name="cphc_mental_follow_up_date">Follow-up Date</string>
+    <string name="cphc_mental_improvement_noted">Improvement Noted</string>
+    <string name="cphc_mental_adherence_to_advice">Adherence to Advice</string>
+    <string name="cphc_oph_cataract_symptoms">Cataract Symptoms</string>
+    <string name="cphc_oph_glaucoma_symptoms">Glaucoma Symptoms</string>
+    <string name="cphc_oph_diabetic_retinopathy_symptoms">Diabetic Retinopathy Symptoms</string>
+    <string name="cphc_oph_presbyopia_symptoms">Presbyopia Symptoms</string>
+    <string name="cphc_oph_trachoma_status">Trachoma Status</string>
+    <string name="cphc_oph_corneal_disease_type">Corneal Disease Type</string>
+    <string name="cphc_oph_vitamin_a_deficiency">Vitamin A Deficiency</string>
+    <string name="cphc_oph_foreign_body_removal">Foreign Body Removal</string>
+    <string name="cphc_oph_chemical_exposure">Chemical Exposure</string>
+    <string name="cphc_elderly_bathing">Bathing</string>
+    <string name="cphc_elderly_dressing">Dressing</string>
+    <string name="cphc_elderly_toileting">Toileting</string>
+    <string name="cphc_elderly_transferring">Transferring</string>
+    <string name="cphc_elderly_continence">Continence</string>
+    <string name="cphc_elderly_feeding">Feeding</string>
+    <string name="cphc_elderly_functional_decline_flag">Functional Decline Flag</string>
+    <string name="cphc_elderly_dementia_memory_loss">Dementia Memory Loss</string>
+    <string name="cphc_elderly_dementia_disorientation">Dementia Disorientation</string>
+    <string name="cphc_elderly_dementia_behavioural_changes">Dementia Behavioural Changes</string>
+    <string name="cphc_elderly_dementia_self_care_decline">Dementia Self-care Decline</string>
+    <string name="cphc_elderly_dementia_referral_required">Dementia Referral Required</string>
+    <string name="cphc_mental_substance_tobacco_outcome">Tobacco Outcome</string>
+    <string name="cphc_mental_substance_tobacco_use">Tobacco Use</string>
+    <string name="cphc_mental_suicide_immediate_assess">Immediate Suicide Risk Assessment</string>
+    <string name="cphc_mental_dementia_progressive_memory_loss">Dementia Progressive Memory Loss</string>
+    <string name="cphc_mental_dementia_forgetting_recent">Dementia Forgetting Recent Events</string>
+    <string name="cphc_mental_dementia_disorientation">Dementia Disorientation</string>
+    <string name="cphc_mental_dementia_daily_activities">Dementia Daily Activities Impact</string>
+    <string name="cphc_mental_dementia_behavioural_changes">Dementia Behavioural Changes</string>
+    <string name="cphc_mental_epilepsy_recurrent_seizures">Epilepsy Recurrent Seizures</string>
+    <string name="cphc_mental_epilepsy_jerky_movements">Epilepsy Jerky Movements</string>
+    <string name="cphc_mental_epilepsy_tongue_bite">Epilepsy Tongue Bite</string>
+    <string name="cphc_mental_epilepsy_confusion_after">Epilepsy Post-episode Confusion</string>
+    <string name="cphc_mental_epilepsy_loc_duration">Epilepsy Loss of Consciousness Duration</string>
+    <string name="cphc_mental_substance_alcohol_loss">Alcohol Loss of Control</string>
+    <string name="cphc_mental_substance_alcohol_impact">Alcohol Impact on Responsibilities</string>
+    <string name="cphc_mental_substance_alcohol_withdrawal">Alcohol Withdrawal Symptoms</string>
+    <string name="cphc_mental_substance_alcohol_problematic">Problematic Alcohol Use</string>
+    <string name="cphc_mental_substance_alcohol_classification">Alcohol Use Classification</string>
+    <string name="cphc_mental_substance_alcohol_system_action">Alcohol System Action</string>
+    <string name="cphc_mental_substance_alcohol_frequency">Alcohol Use Frequency</string>
+    <string name="cphc_mental_ed_recurrent_episode_loss">ED Recurrent Episode with Loss</string>
+    <string name="cphc_mental_ed_recurrent_jerky_movements">ED Recurrent Jerky Movements</string>
+    <string name="cphc_mental_ed_confusion_drowsiness">ED Confusion or Drowsiness</string>
+    <string name="cphc_mental_ed_progressive_memory_loss">ED Progressive Memory Loss</string>
+    <string name="cphc_mental_ed_confusion_disorientation">ED Confusion or Disorientation</string>
+    <string name="cphc_mental_ed_functional_decline">ED Functional Decline</string>
+    <string name="cphc_mental_ed_screening_outcome">ED Screening Outcome</string>
+    <string name="cphc_mental_ed_psychosocial_intervention_provided">ED Psychosocial Intervention Provided</string>
+    <string name="cphc_mental_ed_intervention_type">ED Intervention Type</string>
+    <string name="cphc_mental_ed_session_date">ED Session Date</string>
+    <string name="cphc_mental_ed_duration_minutes">ED Session Duration (minutes)</string>
+    <string name="cphc_mental_ed_remarks">ED Remarks</string>
+    <string name="cphc_mental_ed_referral_required">ED Referral Required</string>
+    <string name="cphc_mental_ed_reason">ED Reason</string>
+    <string name="cphc_mental_referral_escalation_required">Referral Escalation Required</string>
+    <string name="cphc_mental_case_closure_reason">Case Closure Reason</string>
+
+    <string name="throat_alert_neck_swelling">Neck swelling detected. Refer patient to specialist at secondary level.</string>
+    <string name="throat_alert_difficulty_swallowing">Difficulty in swallowing detected. Refer patient to specialist at secondary level.</string>
+    <string name="throat_alert_cleft_lip">Cleft lip detected. Refer patient to specialist at secondary level.</string>
+    <string name="throat_alert_cleft_palate">Cleft palate detected. Refer patient to specialist at secondary level.</string>
+    <!-- Nose Diagnosis Form Strings -->
+    <string name="nose_bleed_title">Nose Bleed (Epistaxis)</string>
+    <string name="systolic_bp_title">Systolic BP (mmHg)</string>
+    <string name="diastolic_bp_title">Diastolic BP (mmHg)</string>
+    <string name="foreign_body_nose_title">Foreign Body Nose</string>
+    <string name="foreign_body_anterior">Yes (anterior visible)</string>
+    <string name="foreign_body_posterior">Yes (posterior visible)</string>
+    <string name="sinusitis_title">Sinusitis</string>
+    <string name="sinusitis_with_pain">Yes (Facial pain / tenderness)</string>
+
+    <!-- Nose Diagnosis Alert Messages -->
+    <string name="nose_bleed_alert_systolic_bp">Systolic BP &gt; 120 mmHg. Refer patient to specialist at secondary level.</string>
+    <string name="nose_bleed_alert_diastolic_bp">Diastolic BP &gt; 80 mmHg. Refer patient to specialist at secondary level.</string>
+    <string name="foreign_body_posterior_alert">Posterior visible detected. Refer patient to specialist at secondary level.</string>
+    <string name="sinusitis_alert">Chronic sinusitis suspected. Refer patient to specialist at secondary level.</string>
+
+    <!-- Nose Diagnosis Dropdown/Radio Options -->
+    <string-array name="nose_foreign_body_options">
+        <item>Yes (anterior visible)</item>
+        <item>Yes (posterior visible)</item>
+        <item>No</item>
+    </string-array>
+
+    <string name="title_oral_health">Dental Form</string>
+    <string name="oral_health_saved">Oral Health details saved</string>
+    <string name="oral_health_referral_alert">Refer patient to Dentist at the secondary level.</string>
+    <string name="title_psychosocial_caregiver_support">Psychosocial and Caregiver Support</string>
+    <string name="psychosocial_caregiver_support_saved">Psychosocial and Caregiver Support Saved</string>
+    <string-array name="no_outcome_at_birth_array">
+        <item>Live Birth</item>
+        <item>Still Birth (Macerated)</item>
+        <item>Still Birth (Fresh)</item>
+        <item>Died during delivery</item>
+    </string-array>
+
+    <string-array name="no_sex_array">
+        <item>Male</item>
+        <item>Female</item>
+        <item>Ambiguous</item>
+    </string-array>
+
+    <string-array name="no_cried_immediately_array">
+        <item>Immediate cry</item>
+        <item>Cried after resuscitation</item>
+        <item>Not applicable (Stillbirth)</item>
+    </string-array>
+
+    <string-array name="no_type_of_resuscitation_array">
+        <item>Stimulation</item>
+        <item>Suctioning</item>
+        <item>Bag and mask ventilation</item>
+        <item>Oxygen</item>
+        <item>Intubation</item>
+        <item>Chest compressions</item>
+        <item>Medications</item>
+    </string-array>
+
+    <string-array name="no_congenital_anomaly_array">
+        <item>Yes</item>
+        <item>No</item>
+        <item>Suspected (under evaluation)</item>
+    </string-array>
+
+    <string-array name="no_type_of_congenital_anomaly_array">
+        <item>Neural tube defect (Spina bifida/Anencephaly)</item>
+        <item>Cleft lip/palate</item>
+        <item>Club foot</item>
+        <item>Down syndrome (suspected)</item>
+        <item>Congenital heart defect (suspected)</item>
+        <item>Limb defects</item>
+        <item>Abdominal wall defect</item>
+        <item>Genital abnormality</item>
+        <item>Other</item>
+    </string-array>
+
+    <string-array name="no_newborn_complications_array">
+        <item>Birth asphyxia</item>
+        <item>Respiratory distress</item>
+        <item>Neonatal jaundice (visible at birth)</item>
+        <item>Sepsis (suspected)</item>
+        <item>Hypothermia</item>
+        <item>Hypoglycemia</item>
+        <item>Bleeding</item>
+        <item>Convulsions</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="no_current_status_array">
+        <item>Healthy and with mother</item>
+        <item>Admitted (SNCU/NICU)</item>
+        <item>Admitted (General ward)</item>
+        <item>Died</item>
+    </string-array>
+
+    <string-array name="no_cause_of_death_array">
+        <item>Birth asphyxia</item>
+        <item>Prematurity</item>
+        <item>Low birth weight complications</item>
+        <item>Sepsis</item>
+        <item>Congenital anomaly</item>
+        <item>Respiratory distress</item>
+        <item>Unknown</item>
+        <item>Other</item>
+    </string-array>
+
+    <string-array name="no_birth_dose_vaccines_array">
+        <item>BCG</item>
+        <item>Hepatitis B (Birth dose)</item>
+        <item>OPV-0</item>
+        <item>None</item>
+    </string-array>
+
+    <string-array name="no_birth_certificate_array">
+        <item>Yes</item>
+        <item>In process</item>
+        <item>No (Not applied)</item>
+    </string-array>
+
+    <!-- Extracted from Kotlin - user facing strings -->
+    <string name="today">Today</string>
+    <string name="month_january">January</string>
+    <string name="month_february">February</string>
+    <string name="month_march">March</string>
+    <string name="month_april">April</string>
+    <string name="month_may">May</string>
+    <string name="month_june">June</string>
+    <string name="month_july">July</string>
+    <string name="month_august">August</string>
+    <string name="month_september">September</string>
+    <string name="month_october">October</string>
+    <string name="month_november">November</string>
+    <string name="month_december">December</string>
+    <string name="no_face_detected">No face detected</string>
+    <string name="multiple_faces_detected">Multiple faces detected</string>
+    <string name="invalid_face_detection">Invalid face detection</string>
+    <string name="failed_to_generate_face_embeddings">Failed to generate face embeddings</string>
+    <string name="face_embeddings_generated">Face Embeddings Generated</string>
+    <string name="face_detection_failed">Face detection failed: %1$s</string>
+    <string name="unable_to_fetch_details">Unable to fetch details</string>
+    <string name="age_years_format">%1$d years</string>
+    <string name="anc_visit_number_format">ANC Visit %1$d</string>
+    <string name="completed_with_date">Completed: %1$s</string>
+    <string name="completed_status">✓ Completed</string>
+    <string name="scheduled_ga_format">Scheduled: %1$s (GA: %2$d weeks)</string>
+    <string name="due_status">⚠ Due</string>
+    <string name="pending_status">○ Pending</string>
+    <string name="na">NA</string>
+    <string name="previous_activity">Previous Activity</string>
+    <string name="activity_details">Activity Details</string>
+    <string name="activity_form">Activity Form</string>
+    <string name="medicine_not_available">Medicine not available</string>
+    <string name="login_failed_toast">Login Failed</string>
+    <string name="processing">Processing…</string>
+    <string name="invalid_input">Invalid input</string>
+    <string name="delivery_record_not_found">Delivery record not found</string>
+    <string name="save_successful_toast">Save Successful</string>
+    <string name="invalid_data_entered">Invalid data entered</string>
+    <string name="please_wait_master_location">Please wait while master location coordinates are fetched.</string>
+    <string name="data_saved">Data is Saved!</string>
+    <string name="error_saving_master_location">Error while saving the master location</string>
+    <string name="please_fill_all_details">Please fill all the details</string>
+    <string name="all_pnc_visits_completed">All PNC visits completed</string>
+    <string name="all_4_anc_visits_completed">All 4 ANC visits completed</string>
+    <string name="verify_abha_otp">Verify ABHA OTP</string>
+    <string name="events_for_date_already_exist">Events for this Date already exist</string>
+    <string name="proceed_to_home">Proceed to Home</string>
+    <string name="invalid_image_try_again">Invalid Image! Try Again</string>
+    <string name="exception_image_processing_failed">Exception! Image Processing Failed</string>
+    <string name="eyes_closed_try_again">Eyes Closed! Try Again</string>
+    <string name="home_visit">Home Visit</string>
+    <string name="please_capture_image_to_continue">Please capture the image to continue.</string>
+    <string name="loading_patient_data_please_wait">Loading patient data, please wait…</string>
+    <string name="nav_error">Nav Error: %1$s</string>
+    <string name="records_transferred_format">Records Transferred: %1$d/%2$d</string>
+    <string name="progress_percentage_format">%1$d%%</string>
+    <string name="please_enter_beneficiary_name">Please Enter Beneficiary Name</string>
+    <string name="batch_selection">Batch Selection</string>
+    <string name="template_deleted">Template deleted</string>
+    <string name="max_duration_allowed_6">Maximum value allowed for Duration is 6.</string>
+    <string name="medicine_number_format">Medicine - %1$d</string>
+    <string name="location_update_message">You have moved more than 2 meters from the fixed point. Do you want to update your location?</string>
+    <string name="beneficiary_abha_mapping">Beneficiary ABHA mapping.</string>
+    <string name="alert_title">Alert</string>
+    <string name="please_confirm_logout_exit">Please confirm to logout and exit.</string>
+    <string name="login_away_from_facility">You are trying to Log-in away from your facility. Do you want to retry?</string>
+    <string name="patient_already_exists">Patient Already Exists</string>
+    <string name="error_saving_patient">Error Saving Patient</string>
+    <string name="esanjeevani_login">eSanjeevani Login</string>
+    <string name="update_ready_to_install">An update is ready to install.</string>
+    <string name="restart">Restart</string>
+    <string name="applytxt">Apply</string>
+    <string name="choose_application_language">Choose Application Language</string>
+    <string name="update_canceled_or_failed">Update was canceled or failed.</string>
+    <string name="try_again_btn">Try Again</string>
+    <string name="permission_denied">Permission denied</string>
+    <string name="not_scheduled">Not scheduled</string>
+    <string name="location_provider_gps_disabled">Location Provider/GPS disabled</string>
+    <string name="invalid_image_multiple_faces">Invalid Image! Multiple Faces Detected</string>
+    <string name="linking_abha_to_beneficiary">Linking ABHA to beneficiary</string>
+    <string name="patient_already_exists_message">A patient with Beneficiary ID %1$s already exists in the system.</string>
+    <string name="error_saving_patient_message">Failed to save patient due to missing data. Please ensure all data is synced.</string>
+    <string name="stock_label">In Stock: %1$d</string>
+    <string name="out_of_stock">Out of Stock</string>
+
+    <!-- Case Closure Strings -->
+    <string name="case_closure_confirmation_title">Close Case</string>
+    <string name="case_closure_confirmation_message">This case is being closed. Do you want to proceed?</string>
+    <string name="case_closure_yes">Yes</string>
+    <string name="case_closure_no">No</string>
+    <string name="case_closure_error_pending_lab">Cannot close case: Lab test is pending</string>
+    <string name="case_closure_error_undispensed_medicine">Cannot close case: Medicine has not been dispensed</string>
+    <string name="case_closure_success">Case closed successfully</string>
+    <string name="case_closure_error">Error closing case</string>
+    <string name="antra_next_due_date">ANTRA Next Due Date</string>
+
+    <string name="refer_date">Refer Date:</string>
+    <string name="referred_from">Referred From:</string>
+    <string name="referred_to">Referred To:</string>
+
+    <!-- Mental Health Screening Strings -->
+    <!-- Response Options -->
+    <string name="yes_option">Yes</string>
+    <string name="no_option">No</string>
+
+    <!-- Initial Screening Questions -->
+    <string name="emotional_behavioural_concerns">Emotional or behavioural concerns present</string>
+    <string name="substance_use_concerns">Substance use related concerns present</string>
+    <string name="self_harm_suicide_thoughts">Thoughts of self-harm or suicide present</string>
+    <string name="memory_loss_confusion">Memory loss or confusion present</string>
+    <string name="seizures_fits_loc">Seizures, fits, or loss of consciousness present</string>
+    <string name="postpartum_woman">Post-partum woman (≤12 months after delivery)</string>
+
+    <!-- PHQ-9 Depression Screening -->
+    <string name="phq9_section_title">PHQ-9 Depression Screening</string>
+    <string name="phq9_little_interest">Little interest or pleasure in doing things</string>
+    <string name="phq9_feeling_down">Feeling down, depressed, or hopeless</string>
+    <string name="phq9_sleep_trouble">Trouble falling/staying asleep, or sleeping too much</string>
+    <string name="phq9_feeling_tired">Feeling tired or having little energy</string>
+    <string name="phq9_appetite">Poor appetite or overeating</string>
+    <string name="phq9_feeling_bad">Feeling bad about yourself — or that you are a failure</string>
+    <string name="phq9_concentration">Trouble concentrating on things</string>
+    <string name="phq9_moving_slowly">Moving or speaking slowly, or being fidgety/restless</string>
+    <string name="phq9_self_harm_thoughts">Thoughts that you would be better off dead or of hurting yourself</string>
+    <string name="phq9_total_score">PHQ-9 Total Score</string>
+
+    <string-array name="phq9_options">
+        <item>0 - Not at all</item>
+        <item>1 - Several days</item>
+        <item>2 - More than half the days</item>
+        <item>3 - Nearly every day</item>
+    </string-array>
+
+    <!-- Substance Use Screening & Brief Intervention -->
+    <string name="substance_section_title">Substance Use Screening and Brief Intervention</string>
+    <string name="substance_tobacco_title">Tobacco Use Identification</string>
+    <string name="substance_alcohol_title">Alcohol Use Identification </string>
+    <string name="substance_alcohol_use">Current alcohol use</string>
+    <string name="substance_tobacco_use">Tobacco use</string>
+    <string name="substance_alcohol_loss">Loss of control over drinking</string>
+    <string name="substance_alcohol_impact">Impact on daily functioning (health, family, work)</string>
+    <string name="substance_alcohol_withdrawal">Symptoms suggestive of withdrawal</string>
+    <string name="substance_alcohol_problematic">CHO assessment of problematic alcohol use</string>
+    <string name="substance_alcohol_classification">Alcohol use classification</string>
+    <string name="substance_alcohol_system_action">System action</string>
+    <string name="substance_other_specify">Specify other substance</string>
+    <string name="substance_alcohol_frequency">Frequency of Alcohol use</string>
+    <string name="brief_intervention_given">Brief intervention given</string>
+
+    <string-array name="substance_frequency_options">
+        <item>Occasionally</item>
+        <item>Regular</item>
+        <item>Daily</item>
+    </string-array>
+
+    <!-- Suicide Risk Screening -->
+    <string name="suicide_section_title">Suicide Risk Screening</string>
+    <string name="suicide_current_thoughts">Current thoughts of self-harm or ending life</string>
+    <string name="suicide_plan">Current intent or plan</string>
+    <string name="suicide_immediate_assess">CHO assesses immediate risk</string>
+    <string name="suicide_previous_attempt">Previous suicide attempt</string>
+    <string name="suicide_risk_alert_moderate">Moderate Suicide Risk: Immediate counselling required. Consider referral.</string>
+    <string name="suicide_risk_alert_high">High Suicide Risk: Emergency intervention required. Refer immediately.</string>
+    <string name="suicide_hopelessness">Access to means</string>
+    <string name="suicide_risk_level">Suicide risk level</string>
+
+    <string-array name="suicide_risk_options">
+        <item>Low</item>
+        <item>Moderate</item>
+        <item>High</item>
+    </string-array>
+    <string-array name="alcohol_system_action_options">
+        <item>Brief intervention</item>
+        <item>Referral</item>
+    </string-array>
+
+    <!-- Dementia Screening Checklist -->
+    <string name="dementia_section_title">Dementia Screening Checklist</string>
+    <string name="dementia_progressive_memory_loss">Progressive memory loss</string>
+    <string name="dementia_forgetting_recent">Forgetting recent events</string>
+    <string name="dementia_disorientation">Disorientation to time/place</string>
+    <string name="dementia_daily_activities">Difficulty managing daily activities</string>
+    <string name="dementia_behavioural_changes">Behavioural changes</string>
+
+    <!-- Epilepsy Screening Checklist -->
+    <string name="epilepsy_section_title">Epilepsy Screening Checklist</string>
+    <string name="epilepsy_recurrent_seizures">Recurrent seizures/fits</string>
+    <string name="epilepsy_jerky_movements">Jerky movements during episode</string>
+    <string name="epilepsy_tongue_bite">Tongue bite or incontinence during episode</string>
+    <string name="epilepsy_confusion_after">Confusion after episode</string>
+    <string name="epilepsy_loc_duration">Duration of loss of consciousness</string>
+
+    <string-array name="epilepsy_duration_options">
+        <item>Less than 5 minutes</item>
+        <item>5–15 minutes</item>
+        <item>More than 15 minutes</item>
+    </string-array>
+
+    <!-- Mental Health Referral Reasons -->
+    <string name="mental_health_reason_for_referral">Reason for referral</string>
+    <string-array name="mental_health_referral_reasons">
+        <item>Depression (PHQ-9 score ≥10)</item>
+        <item>Suicide risk identified</item>
+        <item>Substance use disorder</item>
+        <item>Dementia suspected</item>
+        <item>Epilepsy suspected</item>
+        <item>Post-partum depression</item>
+        <item>Severe mental disorder suspected</item>
+        <item>Other</item>
+    </string-array>
+
+    <!-- Yes/No Options Array -->
+    <string-array name="yes_no_options">
+        <item>Yes</item>
+        <item>No</item>
+    </string-array>
+    <!-- PHQ-9 Alert Strings -->
+    <string name="phq9_alert_referral_mo_phc"><font color="#FF0000">Refer to MO/PHC (PHQ-9 score ≥ 10)</font></string>
+    <string name="phq9_alert_urgent"><font color="#FF0000">Urgent referral (PHQ-9 score ≥ 15)</font></string>
+    <string name="phq9_alert_emergency"><font color="#FF0000">Emergency referral (PHQ-9 score ≥ 20)</font></string>
+    <string name="title_elderly_health_assessment">Elderly Health Assessment</string>
+    <string name="epilepsy_dementia_checklist_title">Epilepsy &amp; Dementia Screening Checklist</string>
+    <string name="ed_edRecurrentEpisodeloss">Episodes of loss of consciousness</string>
+    <string name="ed_edConfusionordrowsiness">Confusion or drowsiness after episode</string>
+    <string name="ed_recurrent_jerky_movements">Recurrent jerky movements / fits</string>
+    <string name="ed_progressive_memory_loss">Progressive memory loss</string>
+    <string name="ed_confusion_disorientation">Disorientation or confusion </string>
+    <string name="ed_functional_decline">Decline in daily functioning (self-care, routine activities)</string>
+    <string name="ed_age_60_years">Age ≥ 60 years</string>
+    <string name="ed_screening_outcome">Screening Outcome</string>
+    <string name="ed_referral_required">Referral Required</string>
+    <string name="ed_reason">Reason</string>
+    <string name="ed_psychosocial_intervention_provided">Psychosocial intervention provided</string>
+    <string name="ed_intervention_type">Type of intervention</string>
+    <string name="ed_session_date">Session date</string>
+    <string name="ed_duration_minutes">Duration (minutes)</string>
+    <string name="ed_remarks">Remarks</string>
+    <!-- Mental Health Screening – Referral fields -->
+    <string name="mh_referral_required_title">Referral required</string>
+    <string name="mh_referral_level_title">Referral level</string>
+    <string-array name="mh_referral_level_options">
+        <item>PHC</item>
+        <item>DMHP</item>
+        <item>De-addiction centre</item>
+    </string-array>
+    <string name="mh_reason_for_referral_title">Reason for referral</string>
+    <string-array name="mh_reason_for_referral_options">
+        <item>Suicide risk / self-harm</item>
+        <item>Moderate to severe depression</item>
+        <item>Severe mental disorder suspected</item>
+        <item>Substance dependence / withdrawal</item>
+        <item>Functional impairment</item>
+        <item>Neurological condition suspected</item>
+        <item>Child behavioural concern</item>
+        <item>Risk to self or others</item>
+        <item>No improvement / worsening</item>
+        <item>Requires specialist care</item>
+    </string-array>
+    <string-array name="mh_reason_for_referral_options_under_11">
+        <item>Mental health complaint</item>
+        <item>Medical complication</item>
+    </string-array>
+    <string name="mh_referral_date_title">Referral date</string>
+
+    <!-- Mental Health Screening – Follow-up & Closure fields -->
+    <string name="mh_follow_up_required_title">Follow-up required</string>
+    <string name="mh_follow_up_date_title">Follow-up date</string>
+    <string name="mh_improvement_noted_title">Improvement noted</string>
+    <string name="mh_adherence_to_advice_title">Adherence to advice</string>
+    <string-array name="mh_improvement_noted_options">
+        <item>Improved</item>
+        <item>Same</item>
+        <item>Worse</item>
+    </string-array>
+    <string name="mh_repeat_phq9_title">Repeat PHQ-9</string>
+    <string name="mh_referral_escalation_title">Escalation required</string>
+    <string name="mh_case_closure_reason_title">Case closure reason</string>
+    <string-array name="mh_case_closure_reason_options">
+        <item>Recovered</item>
+        <item>Referred</item>
+        <item>Lost to follow-up</item>
+        <item>Death</item>
+    </string-array>
+    <string name="cd_camera_search">Open camera</string>
+
+    <!-- Ear Diagnosis Dataset -->
+    <string name="ear_difficulty_hearing">Difficulty Hearing</string>
+    <string name="ear_whisper_test_response">Whisper Test Response</string>
+    <string name="ear_whisper_correct">Correct</string>
+    <string name="ear_whisper_incorrect">Incorrect</string>
+    <string name="ear_hearing_test_outcome">Hearing Test Outcome</string>
+    <string name="ear_hearing_normal">Normal</string>
+    <string name="ear_hearing_slight_loss">Slight Loss</string>
+    <string name="ear_hearing_moderate">Moderate</string>
+    <string name="ear_hearing_severe">Severe</string>
+    <string name="ear_hearing_deaf">Deaf</string>
+    <string name="ear_pain">Earache / Ear Pain</string>
+    <string name="ear_discharge_present">Ear Discharge Present</string>
+    <string name="ear_foreign_body">Foreign Body Present in Ear</string>
+    <string name="ear_foreign_body_superficial">Yes (Superficial)</string>
+    <string name="ear_foreign_body_deep">Yes (Deep)</string>
+    <string name="ear_condition_type">Type of Ear Condition</string>
+    <string name="ear_otomycosis">Otomycosis</string>
+    <string name="ear_otitis_externa">Otitis Externa</string>
+    <string name="ear_acute_discharge">Acute Ear Discharge</string>
+    <string name="ear_chronic_discharge">Chronic Ear Discharge</string>
+    <string name="ear_wax">Ear Wax</string>
+    <string name="ear_congenital_malformation">Congenital Ear Malformation</string>
+    <string name="ear_alert_abnormal_hearing">Abnormal hearing detected. Refer patient to specialist at secondary level.</string>
+    <string name="ear_alert_deep_foreign_body">Deep foreign body detected. Refer patient to specialist at secondary level.</string>
+    <string name="ear_alert_congenital_malformation">Congenital ear malformation detected. Refer patient to specialist at secondary level.</string>
+
+    <!-- Oral Health Dataset -->
+    <string name="oral_tooth_decay_present">Tooth Decay Present</string>
+    <string name="oral_tooth_decay_symptoms">Symptoms of Tooth Decay</string>
+    <string name="oral_symptom_black_spot">Black spot</string>
+    <string name="oral_symptom_discoloration">Discoloration of tooth Cavity</string>
+    <string name="oral_symptom_hole">Hole in the tooth</string>
+    <string name="oral_symptom_sensitivity">Sensitivity to hot and cold, sweet and sour</string>
+    <string name="oral_symptom_food_lodgment">Food lodgment in the cavity/ between teeth</string>
+    <string name="oral_symptom_pain">Pain</string>
+    <string name="oral_symptom_swelling">Swelling</string>
+    <string name="oral_symptom_pus_discharge">Pus discharge</string>
+    <string name="oral_gum_disease_present">Gum Diseases Present</string>
+    <string name="oral_gum_disease_symptoms">Symptoms of Gum Diseases</string>
+    <string name="oral_gum_foul_smell">Foul smell</string>
+    <string name="oral_gum_bleeding">Bleeding gums</string>
+    <string name="oral_gum_deposits">Deposits and discoloration of tooth</string>
+    <string name="oral_gum_loose_teeth">Loose teeth</string>
+    <string name="oral_gum_widening_gap">Widening gap between teeth</string>
+    <string name="oral_gum_swollen">Swollen gums</string>
+    <string name="oral_irregular_teeth_jaws">Irregular Teeth/Jaws</string>
+    <string name="oral_abnormal_growth_ulcer">Abnormal Growth/Ulcer</string>
+    <string name="oral_cleft_lip_palate">Cleft Lip/Palate</string>
+    <string name="oral_dental_fluorosis">Dental Fluorosis</string>
+    <string name="oral_dental_emergency">Dental Emergency</string>
+    <string name="oral_emergency_pain">Pain</string>
+    <string name="oral_emergency_abscess">Abscess</string>
+    <string name="oral_emergency_swelling">Swelling</string>
+    <string name="oral_emergency_tooth_injury">Tooth Injury</string>
+    <string name="oral_emergency_avulsion">Avulsion</string>
+    <string name="oral_emergency_non_healing_ulcer">Non-Healing Ulcer</string>
+    <string name="oral_emergency_uncontrolled_bleeding">Uncontrolled Bleeding</string>
+    <string name="oral_emergency_trauma">Trauma (Fractured jaw/mobile teeth)</string>
+
+    <!-- Elderly Health Assessment Dataset -->
+    <string name="elderly_geriatric_complaints">General geriatric complaints present?</string>
+    <string name="elderly_multiple_chronic">Multiple chronic conditions</string>
+    <string name="elderly_recent_falls">Recent falls</string>
+    <string name="elderly_difficulty_walking">Difficulty in walking or balance</string>
+    <string name="elderly_visual_hearing">Visual or hearing difficulty</string>
+    <string name="elderly_functional_decline">Functional decline / difficulty in daily activities (ADL)</string>
+    <string name="elderly_functional_assessment_headline">Functional Assessment section</string>
+    <string name="elderly_bathing">Bathing</string>
+    <string name="elderly_dressing">Dressing</string>
+    <string name="elderly_toileting">Toileting</string>
+    <string name="elderly_transferring">Transferring</string>
+    <string name="elderly_continence">Continence</string>
+    <string name="elderly_feeding">Feeding</string>
+    <string name="elderly_independent">Independent (1)</string>
+    <string name="elderly_dependent">Dependent (0)</string>
+    <string name="elderly_total_score">Total Score</string>
+    <string name="elderly_functional_status">Functional Status</string>
+    <string name="elderly_functional_decline_flag">Functional Decline Flag</string>
+    <string name="elderly_status_no_decline">No decline</string>
+    <string name="elderly_status_partial_dependence">Partial Dependence</string>
+    <string name="elderly_status_functional_dependence">Functional Dependence</string>
+    <string name="elderly_status_highly_dependent">Highly Dependent</string>
+    <string name="elderly_status_unknown">Unknown</string>
+    <string name="elderly_memory_loss">Memory loss or confusion</string>
+    <string name="elderly_dementia_headline">Dementia Screening Checklist</string>
+    <string name="elderly_dementia_memory_loss">Progressive memory loss</string>
+    <string name="elderly_dementia_disorientation">Disorientation (time/place/person)</string>
+    <string name="elderly_dementia_behavioural">Behavioural changes</string>
+    <string name="elderly_dementia_self_care">Decline in self-care / routine activities</string>
+    <string name="elderly_screening_outcome">Screening Outcome</string>
+    <string name="elderly_referral_required">Referral Required</string>
+    <string name="elderly_outcome_suspected">Suspected</string>
+    <string name="elderly_outcome_not_suspected">Not suspected</string>
+    <string name="elderly_alert_functional_decline">Patient has functional decline. Please refer to higher facility if needed.</string>
+    <string name="elderly_alert_memory_loss">Patient has memory loss. Please refer to higher facility if needed.</string>
+
+    <!-- Psychosocial Caregiver Support Dataset -->
+    <string name="psychosocial_counselling_provided">Psychosocial counselling provided</string>
+    <string name="psychosocial_caregiver_counselling">Caregiver counselling provided</string>
+    <string name="psychosocial_caregiver_distress">Caregiver distress identified</string>
+    <string name="psychosocial_counselling_remarks">Counselling remarks</string>
+
+    <!-- Mental Health Screening – remaining hardcoded strings -->
+    <string name="mh_depression_severity">Depression Severity</string>
+    <string name="mh_system_action">System Action</string>
+    <string name="mh_current_tobacco_use">Current tobacco use</string>
+    <string name="mh_tobacco_type">Type of tobacco use</string>
+    <string name="mh_tobacco_smoking">Smoking</string>
+    <string name="mh_tobacco_smokeless">Smokeless</string>
+    <string name="mh_tobacco_both">Both</string>
+    <string name="mh_tobacco_frequency">Frequency of tobacco use</string>
+    <string name="mh_tobacco_occasional">Occasional</string>
+    <string name="mh_tobacco_daily">Daily</string>
+    <string name="mh_tobacco_outcome">Tobacco use outcome</string>
+    <string name="mh_tobacco_system_action">System action</string>
+    <string name="mh_intervention_psychoeducation">Psychoeducation</string>
+    <string name="mh_intervention_counselling">Counselling</string>
+    <string name="mh_intervention_stress_mgmt">Stress management</string>
+    <string name="mh_intervention_family_counselling">Family counselling</string>
+    <string name="mh_suicide_immediate_assess">CHO assesses immediate risk</string>
+    <string name="mh_suicide_risk_alert_moderate">Moderate Suicide Risk: Immediate counselling required. Consider referral.</string>
+    <string name="mh_suicide_risk_alert_high">High Suicide Risk: Emergency intervention required. Refer immediately.</string>
+    <string name="mh_date_format_pattern">dd/MM/yyyy</string>
+    <string name="mh_suspected">Suspected</string>
+    <string name="mh_de_addiction">De-addiction</string>
+    <string name="mh_de_addiction_centre">De-addiction centre</string>
+
+    <!-- PHQ-9 Severity -->
+    <string-array name="phq9_severity_options">
+        <item>Minimal</item>
+        <item>Mild</item>
+        <item>Moderate</item>
+        <item>Moderately Severe</item>
+        <item>Severe</item>
+    </string-array>
+
+    <!-- PHQ-9 System Actions -->
+    <string-array name="phq9_system_action_options">
+        <item>Psychoeducation</item>
+        <item>Counselling - Refer to MO/PHC</item>
+        <item>Referral - Urgent referral</item>
+        <item>Referral - Emergency referral</item>
+    </string-array>
+
+    <!-- Tobacco Outcomes -->
+    <string-array name="mh_tobacco_outcome_options">
+        <item>Use identified</item>
+        <item>No use identified</item>
+    </string-array>
+
+    <!-- Tobacco System Actions -->
+    <string-array name="mh_tobacco_system_action_options">
+        <item>Brief counselling</item>
+        <item>Referral</item>
+    </string-array>
+
+    <!-- Alcohol Classification -->
+    <string-array name="mh_alcohol_classification_options">
+        <item>No problematic alcohol use identified</item>
+        <item>Problematic alcohol use suspected</item>
+    </string-array>
+
+    <!-- ED Screening Outcomes -->
+    <string-array name="mh_ed_outcome_options">
+        <item>Suspected Epilepsy</item>
+        <item>Suspected Dementia</item>
+        <item>Suspected</item>
+        <item>Not suspected</item>
+    </string-array>
+
+    <string name="mh_ed_reason_neurological">Neurological condition suspected</string>
+
+    <!-- Contextual Referral Levels -->
+    <string-array name="mh_referral_level_dmhp_options">
+        <item>Primary Health Centre (PHC)</item>
+        <item>CHC</item>
+        <item>District Hospital</item>
+        <item>District Mental Health Programme (DMHP)</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_alcohol_options">
+        <item>PHC</item>
+        <item>De-addiction</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_rbsk_options">
+        <item>RBSK DEIC</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_child_options">
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>DH</item>
+    </string-array>
+
+    <string-array name="mh_referral_level_adult_options">
+        <item>PHC</item>
+        <item>CHC</item>
+        <item>DH</item>
+        <item>DMHP</item>
+        <item>De-addiction</item>
+    </string-array>
+    
+    <string-array name="mh_referral_level_standard_mh_options">
+        <item>PHC</item>
+        <item>DMHP</item>
+    </string-array>
+    
+    <string name="elderly_health_assessment_saved">Elderly Health Assessment Saved</string>
+
+    <!--
+      MasterDataLocalizer mapping arrays. The _en_keys array holds the canonical
+      English values that are used as keys for lookup and for persistence to the
+      DB and server. The _localized array (defined per-locale) holds the
+      locale-specific display label at the same index. Index alignment is
+      load-bearing — do not reorder one without the other.
+    -->
+    <string-array name="chief_complaint_en_keys" translatable="false">
+        <item>Fever</item>
+        <item>Cough</item>
+        <item>Headache</item>
+        <item>Cold</item>
+        <item>Vomiting</item>
+        <item>Diarrhea</item>
+        <item>Body pain</item>
+        <item>Stomach pain</item>
+        <item>Chest pain</item>
+        <item>Shortness of breath</item>
+        <item>Fatigue</item>
+        <item>Loss of appetite</item>
+        <item>Cataract</item>
+        <item>Glaucoma</item>
+        <item>Diabetic retinopathy</item>
+        <item>Presbyopia</item>
+        <item>Trachoma</item>
+        <item>Corneal disease</item>
+        <item>Conjunctivitis/Acute red eye</item>
+        <item>Dry eye / xerophthalmia</item>
+        <item>Dry eye/ xerophthalmia</item>
+        <item>Eye allergy</item>
+        <item>Eye injuries from blunt trauma, penetrating injury to eye,</item>
+        <item>Eye injuries from blunt trauma, penetrating injury to eye</item>
+        <item>Chemical exposure (acid/ alkali/other),</item>
+        <item>Chemical exposure (acid/ alkali/other)</item>
+        <item>Foreign body lodged in the eye</item>
+        <item>Dental Decay</item>
+        <item>Gum diseases</item>
+        <item>Irregular arrangement of teeth and jaws</item>
+        <item>Abnormal growth, patch or ulcers</item>
+        <item>Cleft lip/ palate</item>
+        <item>Dental Fluorosis</item>
+        <item>Dental Emergencies</item>
+        <item>Neck swelling</item>
+        <item>Dysphagia</item>
+        <item>Cleft lip</item>
+        <item>Cleft palate</item>
+        <item>Tonsillitis</item>
+        <item>Pharyngitis</item>
+        <item>Laryngitis</item>
+        <item>Sinusitis</item>
+        <item>Difficulty in hearing</item>
+        <item>Ear wax</item>
+        <item>Congenital Ear Malformation</item>
+        <item>Foreign body in ear</item>
+        <item>open mouth breathing</item>
+        <item>Nosebleed</item>
+        <item>Foreign body in nose</item>
+    </string-array>
+
+    <string-array name="chief_complaint_localized">
+        <item>Fever</item>
+        <item>Cough</item>
+        <item>Headache</item>
+        <item>Cold</item>
+        <item>Vomiting</item>
+        <item>Diarrhea</item>
+        <item>Body pain</item>
+        <item>Stomach pain</item>
+        <item>Chest pain</item>
+        <item>Shortness of breath</item>
+        <item>Fatigue</item>
+        <item>Loss of appetite</item>
+        <item>Cataract</item>
+        <item>Glaucoma</item>
+        <item>Diabetic retinopathy</item>
+        <item>Presbyopia</item>
+        <item>Trachoma</item>
+        <item>Corneal disease</item>
+        <item>Conjunctivitis/Acute red eye</item>
+        <item>Dry eye / xerophthalmia</item>
+        <item>Dry eye/ xerophthalmia</item>
+        <item>Eye allergy</item>
+        <item>Eye injuries from blunt trauma, penetrating injury to eye,</item>
+        <item>Eye injuries from blunt trauma, penetrating injury to eye</item>
+        <item>Chemical exposure (acid/ alkali/other),</item>
+        <item>Chemical exposure (acid/ alkali/other)</item>
+        <item>Foreign body lodged in the eye</item>
+        <item>Dental Decay</item>
+        <item>Gum diseases</item>
+        <item>Irregular arrangement of teeth and jaws</item>
+        <item>Abnormal growth, patch or ulcers</item>
+        <item>Cleft lip/ palate</item>
+        <item>Dental Fluorosis</item>
+        <item>Dental Emergencies</item>
+        <item>Neck swelling</item>
+        <item>Dysphagia</item>
+        <item>Cleft lip</item>
+        <item>Cleft palate</item>
+        <item>Tonsillitis</item>
+        <item>Pharyngitis</item>
+        <item>Laryngitis</item>
+        <item>Sinusitis</item>
+        <item>Difficulty in hearing</item>
+        <item>Ear wax</item>
+        <item>Congenital Ear Malformation</item>
+        <item>Foreign body in ear</item>
+        <item>open mouth breathing</item>
+        <item>Nosebleed</item>
+        <item>Foreign body in nose</item>
+    </string-array>
+
+    <string-array name="duration_units_en_keys" translatable="false">
+        <item>Hour(s)</item>
+        <item>Day(s)</item>
+        <item>Week(s)</item>
+        <item>Month(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+
+    <string-array name="duration_units_localized">
+        <item>Hour(s)</item>
+        <item>Day(s)</item>
+        <item>Week(s)</item>
+        <item>Month(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+
+</resources>
diff --git a/app/src/main/res/values/strings_abortion.xml b/app/src/main/res/values/strings_abortion.xml
new file mode 100644
index 000000000..5a2fdca23
--- /dev/null
+++ b/app/src/main/res/values/strings_abortion.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="visit_date">Visit Date</string>
+    <string name="abortion_type">Abortion Type</string>
+    <string name="facility_place_of_abortion">Facility/Place of Abortion</string>
+    <string name="serial_no_as_per_admission_evacuation_register">Serial No. as per admission/evacuation register</string>
+    <string name="method_of_termination">Method of termination</string>
+    <string name="termination_done_by">Termination done by</string>
+    <string name="date_of_sterilisation">Date of Sterilisation</string>
+    <string name="cac_form">CAC Form</string>
+    <string name="what_family_planning_method_has_been_chosen_after_the_abortion">What family planning method has been chosen after the abortion?</string>
+    <string name="abortion_discharge_summary_1">Abortion Discharge\n Summary 1</string>
+    <string name="abortion_discharge_summary_2">Abortion Discharge\n Summary 2</string>
+    <string name="select_image_source">Select image source</string>
+    <string name="camera">Camera</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera_permission_denied">Camera permission denied</string>
+    <string name="pick_pdf">Pick a PDF</string>
+
+    <string-array name="anc_termination_done_by">
+        <item>Doctor</item>
+        <item>Nurse</item>
+    </string-array>
+
+    <string-array name="anc_method_of_termination">
+        <item>MVA</item>
+        <item>EVA</item>
+        <item>MMA</item>
+        <item>Others</item>
+    </string-array>
+
+    <string-array name="anc_confirmation_array">
+        <item>Yes</item>
+        <item>No</item>
+    </string-array>
+
+    <string-array name="abortion_isplaning_array">
+        <item>Has a PAIUCD been inserted?(Copper-T) or</item>
+        <item>Has the woman opted for permanent sterilization (Tubectomy)?</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a2ee03437..737c0a272 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,6 +21,7 @@
         <item name="android:padding">@dimen/padding_small</item>
         <item name="android:textAppearance">@style/TextAppearance.Material3.TitleMedium</item>
         <item name="android:gravity">center_vertical</item>
+        <item name="android:maxLines">1</item>
     </style>