diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php
index 9e41c616..220164b8 100755
--- a/app/Views/client_basic_info.php
+++ b/app/Views/client_basic_info.php
@@ -125,13 +125,13 @@ input:checked + .slider:before {
                         </div>
                     </div>
 
-                    <div>
+                    <!-- <div>
                         <label class="switch">
-                            <input id="is_download_btn" type="checkbox" name="is_download_btn" <?= (isset($client['is_download_btn']) && $client['is_download_btn'] == 1) ? 'checked' : '' ?>>
+                            <input id="is_download_btn" type="checkbox" name="is_download_btn" <?php // echo(isset($client['is_download_btn']) && $client['is_download_btn'] == 1) ? 'checked' : '' ?>>
                             <span class="slider round" style="height: 27px;"></span>
                         </label>
                         <label for="is_download_btn" style=" position: relative;bottom: 5px;">Enable Client Export Option</label>
-                    </div>
+                    </div> -->
 
 
 
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 6b4210a4..5327b58b 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -94,16 +94,16 @@ body {
                             <span class="d-none d-sm-inline-block">API</span>
                         </a>
                     </li> -->
-                    <li class="nav-item">
+                    <!-- <li class="nav-item">
                         <a href="#others-tab" data-toggle="tab" aria-expanded="false" class="nav-link px-3 py-2" id="others_tab">
                             <span class="mr-1"><i class="mdi mdi-tag-text-outline"></i></span>
                             <span class="d-none d-sm-inline-block">Others</span>
                         </a>
-                    </li>
+                    </li> -->
                 </ul>
                 <div class="tab-content">
                     <?php include("client_api.php"); ?>
-                    <?php include('client_others_tab.php'); ?>
+                    <?php // include('client_others_tab.php'); ?>
                     <?php include('notification.php'); ?>
                     <?php include('client_basic_info.php'); ?>
                     <?php include('client_kyc.php'); ?>
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index fd95e532..b16dae44 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -16,7 +16,7 @@
                     <th>Client Branch</th>
                     <th>TPA</th>
                     <th>Date</th>
-                    <th>Enrolment Status</th>
+                    <!-- <th>Enrolment Status</th> -->
                     <th>Status</th>
                     <th>Action</th>
                 </tr>
@@ -136,7 +136,7 @@
                                 <input  type="text" class="form-control" placeholder="GST (%)" id="gst_no" name="gst" required>
                             </div>
 
-                            <div class="form-group col-md-4 EB">
+                            <!-- <div class="form-group col-md-4 EB">
                                 <label class="switch" style="position: relative;top: 43px;left: 20px;">
                                     <input id="inception_type" type="checkbox" name="inception_type">
                                     <span class="slider round" style="height: 27px;"></span>
@@ -159,7 +159,7 @@
                             <div class="form-group col-md-4">
                                 <label for="reminder_date">Reminder Date<span class="text-danger">*</span></label>
                                 <input value="" type="text" class="form-control dateofdata" placeholder="Enter Remainder Dates( eg, 28,29,30 )" name="reminder_date" id="reminder_date" >
-                            </div>
+                            </div> -->
                             
                             <div class="form-group col-md-12 EB">
                                 <label for="disclaimer">Disclaimer<span class="text-danger">*</span></label>
@@ -239,23 +239,23 @@
 
 <script>
 
-    $('#inception_type').change(function () {
-        var open_data = $('#open_date').parent();
-        var close_data = $('#close_date').parent();
-        var reminder_data = $('#reminder_date').parent();
-        if($(this).prop('checked')){
-            $(open_data).show();
-            $(close_data).show();
-            $(reminder_data).show();
-            $('.dateofdata').attr('required', true);
-        }else{
-            $(open_data).hide();
-            $(close_data).hide();
-            $(reminder_data).hide();
-            $('.dateofdata').attr('required', false);
+    // $('#inception_type').change(function () {
+    //     var open_data = $('#open_date').parent();
+    //     var close_data = $('#close_date').parent();
+    //     var reminder_data = $('#reminder_date').parent();
+    //     if($(this).prop('checked')){
+    //         $(open_data).show();
+    //         $(close_data).show();
+    //         $(reminder_data).show();
+    //         $('.dateofdata').attr('required', true);
+    //     }else{
+    //         $(open_data).hide();
+    //         $(close_data).hide();
+    //         $(reminder_data).hide();
+    //         $('.dateofdata').attr('required', false);
 
-        }
-    })
+    //     }
+    // })
 
     var policy_PrimaryKey = $('#client_id_policy').val();
     var policy_client = $('#policy_PrimaryKey').val();
@@ -348,28 +348,28 @@
                 }
                 //console.log('search_term :', search_term)
 
-                var enrollmentStatus = '';
-                if (item.inception_type == 1) {
+                // var enrollmentStatus = '';
+                // if (item.inception_type == 1) {
 
-                    enrollmentStatus = 'N/A'
+                //     enrollmentStatus = 'N/A'
 
-                } else if (item.inception_type == 2) {
+                // } else if (item.inception_type == 2) {
 
-                    if (item.open_for_enrollment == 1) {
+                //     if (item.open_for_enrollment == 1) {
 
-                        enrollmentStatus = '<a href="#" data-id="' + item.id + '" id="' + item.policy_id +
-                            '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrolment">Open</a>'
+                //         enrollmentStatus = '<a href="#" data-id="' + item.id + '" id="' + item.policy_id +
+                //             '" class="btnOpenEnroll" data-toggle="tooltip" data-placement="left" title="Click To Close Enrolment">Open</a>'
 
 
-                    } else if (item.open_for_enrollment == 0) {
+                //     } else if (item.open_for_enrollment == 0) {
 
-                        enrollmentStatus =
-                            '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment"  data-id="' +
-                            item.id + '" id="' + item.policy_id + '" class="btnOpenEnroll">Closed</a>'
+                //         enrollmentStatus =
+                //             '<a href="#" data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment"  data-id="' +
+                //             item.id + '" id="' + item.policy_id + '" class="btnOpenEnroll">Closed</a>'
 
-                    }
+                //     }
 
-                }
+                // }
 
                 var tpaValue = 'TPA Unavailable';
 
@@ -388,7 +388,7 @@
                             <td>${item.branch_name ? item.branch_name : ' - '}</td>
                             <td>${tpaValue}</td>
                             <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
-                            <td style="text-align: center;">${(enrollmentStatus)}</td>
+                        
                             <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                             <td>
                                 <div class="btn-group dropdown">
@@ -434,6 +434,7 @@
 
         $('#policy_form')[0].reset();
         $('#add_form').show();
+        // console.log("Policy Form Added")
         $('#table_list').hide();
         $('.btnBack').show();
         $('.btnAdd').hide();
@@ -442,9 +443,9 @@
         $('#tpa').val('').change();
         $('#policy_no').val('').change();
         $('#policy_no').val('').change();
-        $('#start_date').val('').change();
-        $('#end_date').val('').change();
-        $('#close_date').val('').change();
+        // $('#start_date').val('').change();
+        // $('#end_date').val('').change();
+        // $('#close_date').val('').change();
         // $('#policy').html('<option value="" selected>Select Policy</option>').change();
         $('#policy_form_action').val('<?= base_url("client/policy/create"); ?>');
         $('#policy_status_field').hide()
@@ -590,31 +591,31 @@
 
                     // //console.log('search_term :', search_term)
 
-                    var enrollmentStatus = '';
-                    if (item.inception_type == 1) {
+                    // var enrollmentStatus = '';
+                    // if (item.inception_type == 1) {
 
-                        enrollmentStatus = 'N/A'
+                    //     enrollmentStatus = 'N/A'
 
-                    } else if (item.inception_type == 2) {
+                    // } else if (item.inception_type == 2) {
 
-                        if (item.open_for_enrollment == 1) {
+                    //     if (item.open_for_enrollment == 1) {
 
-                            enrollmentStatus =
-                                '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrolment" href="#" data-id="' +
-                                item.id + '" id="' + item.policy_id +
-                                '" class="btnOpenEnroll">Open</a>'
+                    //         enrollmentStatus =
+                    //             '<a data-toggle="tooltip" data-placement="top" title="Click To Close Enrolment" href="#" data-id="' +
+                    //             item.id + '" id="' + item.policy_id +
+                    //             '" class="btnOpenEnroll">Open</a>'
 
 
-                        } else if (item.open_for_enrollment == 0) {
+                    //     } else if (item.open_for_enrollment == 0) {
 
-                            enrollmentStatus =
-                                '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment" href="#" data-id="' +
-                                item.id + '" id="' + item.policy_id +
-                                '" class="btnOpenEnroll">Closed</a>'
+                    //         enrollmentStatus =
+                    //             '<a data-toggle="tooltip" data-placement="top" title="Click To Open Enrolment" href="#" data-id="' +
+                    //             item.id + '" id="' + item.policy_id +
+                    //             '" class="btnOpenEnroll">Closed</a>'
 
-                        }
+                    //     }
 
-                    }
+                    // }
 
                     var tpaValue = 'TPA Unavailable';
 
@@ -632,7 +633,6 @@
                             <td>${tpaValue}</td>
 
                             <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
-                            <td style="text-align: center;">${(enrollmentStatus)}</td>
                             <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                             <td>
                                 <div class="btn-group dropdown">
@@ -725,10 +725,12 @@
     $(document).ready(function() {
         /********* set the Policy_Type_id for Form Submit  *******/
         $('#policy_type').change(function() {
+            // alert('policy_type change');
 
             var policy_type_id = $(this).val();
+            // alert(policy_type_id);
 
-            if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
+            if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7 || policy_type_id > 10) {
                 $('#tpa').prop('required', false);
                 $('#tpa_danger').hide()
             } else {
@@ -804,19 +806,19 @@
 
 
                 //Open for enrollment yes or no
-                if (res.data.inception_type == 2) {
-                    $('#inception_type').prop('checked', true);
-                    $('#open_date').parent().show();
-                    $('#close_date').parent().show();
-                    $('#reminder_date').parent().show();
-                    $('.dateofdata').attr('required', true);
-                } else {
-                    $('#inception_type').prop('checked', false);
-                    $('#open_date').parent().hide();
-                    $('#close_date').parent().hide();
-                    $('#reminder_date').parent().hide();
-                    $('.dateofdata').attr('required', false);
-                }
+                // if (res.data.inception_type == 2) {
+                //     $('#inception_type').prop('checked', true);
+                //     $('#open_date').parent().show();
+                //     $('#close_date').parent().show();
+                //     $('#reminder_date').parent().show();
+                //     $('.dateofdata').attr('required', true);
+                // } else {
+                //     $('#inception_type').prop('checked', false);
+                //     $('#open_date').parent().hide();
+                //     $('#close_date').parent().hide();
+                //     $('#reminder_date').parent().hide();
+                //     $('.dateofdata').attr('required', false);
+                // }
 
                 //Policy Visibility in Web App
                 if (res.data.enrolment_visibility == 1) {
@@ -904,7 +906,8 @@
                     $('#third').show();
                     $('#base_policy_id').hide();
                     $('#base_policy').prop('required', false);
-
+                    $("#tpa").prop('required', false);
+                    $('#tpa_danger').hide();
                     $(".EB").hide();
                 }
 
@@ -1450,14 +1453,29 @@
             $('#base_policy').prop('required', false);
             $('#base_danger').hide();
         }
-       
-        if($('#inception_type').prop('checked')){
+
+        if ($(this).val() > 7) {
+
+            $('#first').show();
+            $('#second').show();
+            $('#third').show();
+            $('#base_policy_id').hide();
+            $('#base_policy').prop('required', false);
+            $(".EB").hide();
+            setTimeout(() => {
+                $("#tpa").prop('required', false);
+                $('#tpa_danger').hide();
+            }, 100);
             
-        }else{
-            $('#open_date').parent().hide();
-            $('#close_date').parent().hide();
-            $('#reminder_date').parent().hide();
         }
+       
+        // if($('#inception_type').prop('checked')){
+            
+        // }else{
+        //     $('#open_date').parent().hide();
+        //     $('#close_date').parent().hide();
+        //     $('#reminder_date').parent().hide();
+        // }
     })
 
 
@@ -1530,6 +1548,7 @@
     $(document).ready(function() {
         
         $('#base_policy').change(function() {
+            // alert('Base Policy Change');
 
             var client_policy_id = $(this).val() ? $(this).val() : 0;
             var policy_type = $('#policy_type').val()
@@ -1882,19 +1901,19 @@
                 $('#policy_status_field').show();
 
 
-                if (res.data.inception_type == 2) {
-                    $('#inception_type').prop('checked', true);
-                    $('#open_date').parent().show();
-                    $('#close_date').parent().show();
-                    $('#reminder_date').parent().show();
-                    $('.dateofdata').attr('required', true);
-                } else {
-                    $('#inception_type').prop('checked', false);
-                    $('#open_date').parent().hide();
-                    $('#close_date').parent().hide();
-                    $('#reminder_date').parent().hide();
-                    $('.dateofdata').attr('required', false);
-                }
+                // if (res.data.inception_type == 2) {
+                //     $('#inception_type').prop('checked', true);
+                //     $('#open_date').parent().show();
+                //     $('#close_date').parent().show();
+                //     $('#reminder_date').parent().show();
+                //     $('.dateofdata').attr('required', true);
+                // } else {
+                //     $('#inception_type').prop('checked', false);
+                //     $('#open_date').parent().hide();
+                //     $('#close_date').parent().hide();
+                //     $('#reminder_date').parent().hide();
+                //     $('.dateofdata').attr('required', false);
+                // }
 
 
                 if (res.data.enrolment_visibility == 1) {
@@ -2002,7 +2021,8 @@
                     $('#third').show();
                     $('#base_policy_id').hide();
                     $('#base_policy').prop('required', false);
-
+                    $("#tpa").prop('required', false);
+                    $('#tpa_danger').hide();
                     $(".EB").hide();
                 }
 
diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php
index d470750e..e5f19539 100755
--- a/app/Views/policy_gmc_terms.php
+++ b/app/Views/policy_gmc_terms.php
@@ -169,11 +169,11 @@
                                             style="width: 35%;;" type="number" name="self_max_age" id="self_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
-                                <td style="width: 11%;"><span class="self-age"
+                                <!-- <td style="width: 11%;"><span class="self-age"
                                         style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="self-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_self"
-                                        id="is_payable_employee_for_self"> </td>
+                                        id="is_payable_employee_for_self"> </td> -->
                             </tr>
                             <tr>
                                 <td></td>
@@ -202,11 +202,11 @@
                                             style="width: 35%;;" type="number" name="spouse_max_age" id="spouse_max_age"
                                             onchange="lowerIsEighteen(this)"></div>
                                 </td>
-                                <td style="width: 11%;"><span class="spouse-age"
+                                <!-- <td style="width: 11%;"><span class="spouse-age"
                                         style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="spouse-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_spouse"
-                                        id="is_payable_employee_for_spouse"> </td>
+                                        id="is_payable_employee_for_spouse"> </td> -->
                             </tr>
                             <tr>
                                 <td></td>
@@ -241,11 +241,11 @@
                                             style="width: 35%;;" type="number" name="child_max_age" id="child_max_age"
                                             oninput="this.value = this.value.replace(/\D/g, '').substring(0, 2)"></div>
                                 </td>
-                                <td style="width: 11%;"><span class="child-age"
+                                <!-- <td style="width: 11%;"><span class="child-age"
                                         style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span></td>
                                 <td style="width: 11%;"><input class="child-age" type="checkbox"
                                         style="margin-right: 70px;" name="is_payable_employee_for_child"
-                                        id="is_payable_employee_for_child"> </td>
+                                        id="is_payable_employee_for_child"> </td> -->
                             </tr>
                             <tr>
                                 <td></td>
@@ -304,12 +304,12 @@
                                                 name="other_member_max_age" id="other_member_max_age"
                                                 onchange="lowerIsEighteen(this)"></div>
                                     </td>
-                                    <td style="width: 11%;"><span class="other-member-age"
+                                    <!-- <td style="width: 11%;"><span class="other-member-age"
                                             style="margin-right: 20px;font-size: 12px;">Is Payable by employee:</span>
                                     </td>
                                     <td style="width: 11%;"><input class="other-member-age" type="checkbox"
                                             style="margin-right: 70px;" name="is_payable_employee_for_elders"
-                                            id="is_payable_employee_for_elders"> </td>
+                                            id="is_payable_employee_for_elders"> </td> -->
                                 </tr>
                             </tbody>
                         </table>
@@ -1373,46 +1373,46 @@
                                 $('#other_member_max_age').val(jsonObject[key].elders.max);
                             }
 
-                            if (key.includes("is_payable_employee")) {
+                            // if (key.includes("is_payable_employee")) {
 
-                                if (jsonObject[key]) {
+                            //     if (jsonObject[key]) {
 
-                                    if (jsonObject[key].self == 0) {
-                                        $('#is_payable_employee_for_self').prop('checked',
-                                            false);
-                                    } else {
-                                        $('#is_payable_employee_for_self').prop('checked',
-                                            true);
-                                    }
+                            //         if (jsonObject[key].self == 0) {
+                            //             $('#is_payable_employee_for_self').prop('checked',
+                            //                 false);
+                            //         } else {
+                            //             $('#is_payable_employee_for_self').prop('checked',
+                            //                 true);
+                            //         }
 
-                                    if (jsonObject[key].spouse == 0) {
-                                        $('#is_payable_employee_for_spouse').prop('checked',
-                                            false);
-                                    } else {
-                                        $('#is_payable_employee_for_spouse').prop('checked',
-                                            true);
-                                    }
+                            //         if (jsonObject[key].spouse == 0) {
+                            //             $('#is_payable_employee_for_spouse').prop('checked',
+                            //                 false);
+                            //         } else {
+                            //             $('#is_payable_employee_for_spouse').prop('checked',
+                            //                 true);
+                            //         }
 
-                                    if (jsonObject[key].childern == 0) {
-                                        $('#is_payable_employee_for_child').prop('checked',
-                                            false);
-                                    } else {
-                                        $('#is_payable_employee_for_child').prop('checked',
-                                            true);
-                                    }
+                            //         if (jsonObject[key].childern == 0) {
+                            //             $('#is_payable_employee_for_child').prop('checked',
+                            //                 false);
+                            //         } else {
+                            //             $('#is_payable_employee_for_child').prop('checked',
+                            //                 true);
+                            //         }
 
-                                    if (jsonObject[key].elders == 0) {
-                                        $('#is_payable_employee_for_elders').prop('checked',
-                                            false);
-                                    } else {
-                                        $('#is_payable_employee_for_elders').prop('checked',
-                                            true);
-                                    }
+                            //         // if (jsonObject[key].elders == 0) {
+                            //         //     $('#is_payable_employee_for_elders').prop('checked',
+                            //         //         false);
+                            //         // } else {
+                            //         //     $('#is_payable_employee_for_elders').prop('checked',
+                            //         //         true);
+                            //         // }
 
 
-                                }
+                            //     }
 
-                            }
+                            // }
 
                             if (key.includes("enrollment_display_key") && key != "") {