diff --git a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/AlmostThereFragment.kt b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/AlmostThereFragment.kt
index 35aea22..857a955 100644
--- a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/AlmostThereFragment.kt
+++ b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/AlmostThereFragment.kt
@@ -273,6 +273,32 @@ class AlmostThereFragment : BaseFragment() {
             binding.spCity.setText(res.Result.CityName)
             binding.spState.setText(res.Result.StateName)
         }
+
+        validateStep()
+    }
+
+    private fun validateStep() {
+        if(arguments?.containsKey("step") == true && arguments?.getInt("step",0)!=3){
+            val bundle = Bundle()
+            bundle.putSerializable("mobile", arguments?.getString("mobile")!!)
+            bundle.putSerializable("email", binding.edtEmail.text.toString())
+            bundle.putString("arnType",arguments?.getString("arnType"))
+            arguments?.getInt("step",0)?.let { bundle.putInt("step", it) }
+            var fragment: Fragment =
+                if(arguments?.getString("arnType").equals(getString(R.string.advisory),true)){
+                    SaveEAgreementFragment()
+                }else{
+                    PaymentFragment()
+                }
+            fragment.arguments = bundle
+            addFragment(
+                activity as BaseActivity,
+                R.id.signUpContainer,
+                fragment,
+                "AlmostThereFragment",
+                true
+            )
+        }
     }
 
     private fun pinAPIForCityState(pinCode: String) {
diff --git a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt
index 6d8fab9..408f31d 100644
--- a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt
+++ b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/GetStartedFragment.kt
@@ -507,6 +507,9 @@ class GetStartedFragment : BaseFragment() {
                     0
                 )
                 binding.edtFullNamePanCard.setText(res.Result.data.FullName)
+                if(arguments?.containsKey("step") == true && arguments?.getInt("step",0)!=3){
+                    validateStep()
+                }
                 true
             } else {
                 commonErrorMethod(
@@ -613,6 +616,29 @@ class GetStartedFragment : BaseFragment() {
                     .show()
             }
         }
+
+    }
+
+    private fun validateStep() {
+        if(arguments?.containsKey("step") == true && arguments?.getInt("step",0)!=2){
+            val fragment = AlmostThereFragment()
+            val bundle = Bundle()
+            bundle.putSerializable("InputValue", pt)
+            bundle.putSerializable("arnData", arnData)
+            bundle.putSerializable("panData", panRes)
+            bundle.putString("mobile", arguments?.getString("mobile"))
+            bundle.putString("arnType", arguments?.getString("arnType"))
+            arguments?.getInt("step",0)?.let { bundle.putInt("step", it) }
+            fragment.arguments = bundle
+
+            addFragment(
+                activity as BaseActivity,
+                R.id.signUpContainer,
+                fragment,
+                "GET STARTED",
+                true
+            )
+        }
     }
 
     private fun setImageUploadType(front: Boolean, back: Boolean, aRN: Boolean, eUIN: Boolean) {
diff --git a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/NewDistributorSignStepOne.kt b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/NewDistributorSignStepOne.kt
index 9476353..2b387b4 100644
--- a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/NewDistributorSignStepOne.kt
+++ b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/NewDistributorSignStepOne.kt
@@ -51,7 +51,6 @@ class NewDistributorSignStepOne : BaseFragment() {
         )[OnBoardingViewModel::class.java]
 
         (activity as SignUpActivity).viewModelOne.getAllProduct(
-//            Constants.BASE_URL_COMMON + "User/GetAllProduct",
             (activity as SignUpActivity)
         )
 
@@ -77,7 +76,7 @@ class NewDistributorSignStepOne : BaseFragment() {
             if (listMapData?.isNotEmpty() == true) {
                 val bundle = Bundle()
                 bundle.putString("mobile", arguments?.getString("mobile"))
-                bundle.putString("arnType", "Associate")
+                bundle.putString("arnType", getString(R.string.associateText))
                 val fragment = GetStartedFragment()
                 fragment.arguments = bundle
 
diff --git a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/SignUpFragment.kt b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/SignUpFragment.kt
index 1933ad2..fbcf04c 100644
--- a/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/SignUpFragment.kt
+++ b/app/src/main/java/com/nivesh/production/partnerOnBoarding/ui/fragments/SignUpFragment.kt
@@ -160,13 +160,10 @@ class SignUpFragment : BaseFragment() {
                     bundle.putString("mobile", partnerDetailResponse.Result.Mobile)
                     bundle.putString("arnType", arguments?.getString("arnType"))
                     bundle.putSerializable("partnerResponse",partnerDetailResponse)
+                    bundle.putInt("step",partnerDetailResponse.Result.Step)
                     var fragment = Fragment()
                     if (type == 4) {
-                        when (partnerDetailResponse.Result.Step) {
-                            2 -> fragment = GetStartedFragment()
-                            3 -> fragment = AlmostThereFragment()
-                            4 -> fragment = SaveEAgreementFragment()
-                        }
+                        fragment = GetStartedFragment()
                     } else if (type == 3) {
                        fragment = NewDistributorSignStepOne()
                     }