diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
index 9edb703..6aa46be 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt
@@ -108,7 +108,33 @@ class KitScanActivity : AppCompatActivity() {
 
         binding.btnGo.setOnClickListener {
             val serialNumber = binding.nameEditText.text.toString().trim()
-            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(serialNumber)) {
+            if (serialNumber.isNotEmpty() && isSerialValid(serialNumber)) {
+                if (DataHolder.selectedTest == null) {
+                    with(sharedPreference.edit()) {
+                        putString(
+                            Constants.KIT_NUMBER, binding.nameEditText.text.toString()
+                        )
+                        putInt(Constants.KIT_COUNT, 1)
+                        apply()
+                    }
+                    Toast.makeText(
+                        applicationContext,
+                        "Kit number is updated, Please Select user before starting test",
+                        Toast.LENGTH_SHORT
+                    ).show()
+
+                    val i = Intent(applicationContext, DashboardActivity::class.java)
+                    startActivity(i)
+                    finish()
+                }
+            } else {
+                Toast.makeText(this, "Invalid KIT Number", Toast.LENGTH_LONG).show()
+                return@setOnClickListener
+            }
+            if (serialNumber.isNotEmpty() && checkDataNotNull() && isSerialValid(
+                    serialNumber
+                )
+            ) {
                 DataHolder.kitSerial = binding.nameEditText.text.toString()
                 DataHolder.selectedTest?.kitSerial = binding.nameEditText.text.toString()
                 with(sharedPreference.edit()) {
@@ -125,8 +151,9 @@ class KitScanActivity : AppCompatActivity() {
 
     private fun checkHemoCubeKitData(): Boolean {
         return sharedPreference.getString(Constants.KIT_NUMBER, "")
-            ?.isNotBlank() == true && sharedPreference.getInt(Constants.KIT_COUNT, 0) > 0
-                && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
+            ?.isNotBlank() == true && sharedPreference.getInt(
+            Constants.KIT_COUNT, 0
+        ) > 0 && sharedPreference.getInt(Constants.KIT_COUNT, 0) < 35
     }
 
     private fun isSerialValid(s: String): Boolean {
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index 3d53418..af6da2c 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -3,6 +3,7 @@ package com.example.hpostesting.presentation.dashboard
 import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -16,6 +17,7 @@ import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.example.hpostesting.data.model.patient.UserData
+import com.example.hpostesting.presentation.KitScanActivity
 import com.example.hpostesting.presentation.adapter.UserListAdapter
 import com.example.hpostesting.presentation.hemocube.HemoCubeViewModel
 import com.example.hpostesting.presentation.testRight.TestRightViewModel
@@ -80,6 +82,15 @@ class HomeFragment : Fragment() {
         binding.uploadData.setOnClickListener {
             showUploadDialog(requireContext())
         }
+        binding.btnNewKit.setOnClickListener {
+            with(sharedPreference.edit()) {
+                putString(Constants.KIT_NUMBER, "")
+                putInt(Constants.KIT_COUNT, 0)
+                apply()
+            }
+            startActivity(Intent(requireContext(), KitScanActivity::class.java))
+            requireActivity().finish()
+        }
     }
     private fun setUserId() {
         binding.btnSubmit.setOnClickListener {
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 21129ef..29ba960 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
@@ -80,12 +80,10 @@ class HemoCubeFragment : Fragment() {
         binding.btnSubmit.isEnabled = false
         binding.btnSubmit.isClickable = false
 
-
         binding.btnKit.setOnClickListener {
             if (isTestOngoing) {
                 val title = "WARNING"
-                val message =
-                    "There is a on going test, do you want to stop it. if Yes please disconnect the device and connect it again, once you reached to kitDetails Screen"
+                val message = "There is a on going test, do you want to stop it"
                 val negativeText = getString(R.string.no)
                 val positiveText = "Yes"
 
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000..c22704d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/black" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0d21241..9aa32ec 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -194,6 +194,27 @@
             app:layout_constraintTop_toBottomOf="@+id/radioGroup"
             tools:listitem="@layout/user_item_view"/>
 
+        <TextView
+            android:id="@+id/label"
+            style="@style/title1_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/new_kit"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewKit"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/btnNewKit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:backgroundTint="@color/primary"
+            android:contentDescription="@string/new_kit"
+            android:src="@drawable/ic_add"
+            app:elevation="1dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>