diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index cbe375a..305457d 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -35,7 +35,7 @@ import kotlin.math.log10
 
 @Suppress("MemberVisibilityCanBePrivate")
 class HemoCubeFragment : Fragment() {
-
+    private var checkCuvette = false
     private lateinit var binding: FragmentHemoCubeReferenceBinding
     private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
     private lateinit var sharedPreferences: SharedPreferences
@@ -117,30 +117,39 @@ class HemoCubeFragment : Fragment() {
         binding.tvSubtitle4.text = "Config"
 
         binding.btnSamplestart.setOnClickListener {
-            activity?.runOnUiThread {
-                binding.tvSubtitle4.visibility = View.VISIBLE
+            if(checkCuvette){
+                activity?.runOnUiThread {
+                    binding.tvSubtitle4.visibility = View.VISIBLE
 //                binding.tvSubtitle4.text = "Sample Started"
+                }
+                startSampleProcess()
+                it.visibility = View.GONE
+            }else{
+                checkCuvettePresence()
             }
-            startSampleProcess()
-            it.visibility = View.GONE
         }
         binding.btnRetryCheckCuvette.setOnClickListener {
 
             checkCuvettePresence()
         }
         binding.btnPlacebuffer.setOnClickListener {
-            if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
-                showBufferAlertDialog()
-            } else {
-                activity?.runOnUiThread {
-                    binding.tvSubtitle4.visibility = View.VISIBLE
+            if(checkCuvette){
+                if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) {
+                    showBufferAlertDialog()
+                } else {
+                    activity?.runOnUiThread {
+                        binding.tvSubtitle4.visibility = View.VISIBLE
 //                    binding.tvSubtitle4.text = "Buffer Started"
-                }
+                    }
 
-              //  checkAndStartProcess()
-                startBufferProcess()
-                it.visibility = View.GONE
+                    //  checkAndStartProcess()
+                    startBufferProcess()
+                    it.visibility = View.GONE
+                }
+            }else{
+                checkCuvettePresence()
             }
+
         }
 
         if (sharedPreferences.getString(Constants.USER_ID, "").toString() == "ADMIN") {
@@ -423,12 +432,13 @@ class HemoCubeFragment : Fragment() {
                 this.testStatusCode = TestStatus.EPROM_ADC_RETRIEVAL_COMPLETED.code
                 hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
                 checkCuvettePresence()
+                showStartBufferButton()
             }
 
             resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
                 this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
-                showStartBufferButton()
+                checkCuvette = true
             }
             resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENT.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
@@ -1161,6 +1171,8 @@ class HemoCubeFragment : Fragment() {
     }
 
     private fun checkCuvettePresence() {
+        Toast.makeText(requireContext(),"Please wait...",Toast.LENGTH_LONG).show()
+
         activity?.runOnUiThread {
             binding.btnRetryCheckCuvette.visibility = View.GONE
         }