diff --git a/app/Http/Controllers/CharacteristicsController.php b/app/Http/Controllers/CharacteristicsController.php
index e91eb5c..41b6251 100644
--- a/app/Http/Controllers/CharacteristicsController.php
+++ b/app/Http/Controllers/CharacteristicsController.php
@@ -794,6 +794,7 @@ class CharacteristicsController extends Controller
 
                 if ($char['motor_pump_pumpset_status'] == '3') {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -801,6 +802,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -808,6 +810,7 @@ class CharacteristicsController extends Controller
                         }
                         $curPumpMarkBy = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? $curPumpMarkBy;
                     } elseif ($modelType == 'NAME_PLATE') {
+                        $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
                         $napExpecTim = $napExpecTim + $expectedTime;
                         $curNamePlateMarkStat = 'Marked';
                         $curNamePlateMarkBy = ($char['name_plate_marked_by'] == 'jothi') ? 'Admin' : $char['name_plate_marked_by'] ?? $curNamePlateMarkBy;
@@ -839,12 +842,12 @@ class CharacteristicsController extends Controller
                         'name_plate_expected_time' => (string) $napExpecTim,
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => '3',
-                        'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
-                        'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                        'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                        'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
+                        'name_plate_machine_name' => $curNpMach,
+                        'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
+                        'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                         'pending_released_status' => $char['pending_released_status'] ?? 0,
                         'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -913,10 +916,10 @@ class CharacteristicsController extends Controller
                         'pump_expected_time' => (string) $pumExpecTim,
                         'pump_marked_by' => $curPumpMarkBy,
                         'motor_pump_pumpset_status' => '3',
-                        // 'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
+                        'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
                         'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        // 'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                        // 'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                        'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
+                        'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                         'pending_released_status' => $char['pending_released_status'] ?? 0,
                         'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -964,6 +967,7 @@ class CharacteristicsController extends Controller
                     // $values = array_merge($values1 ?? [], $values2 ?? [], $values3 ?? [], $values4 ?? [], $values5 ?? []);
                 } elseif ($hasMvhs == true) {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -971,6 +975,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -978,6 +983,7 @@ class CharacteristicsController extends Controller
                         }
                         $curPumpMarkBy = ($char['pump_marked_by'] == 'jothi') ? 'Admin' : $char['pump_marked_by'] ?? $curPumpMarkBy;
                     } elseif ($modelType == 'NAME_PLATE') {
+                        $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
                         $napExpecTim = $napExpecTim + $expectedTime;
                         $curNamePlateMarkStat = 'Marked';
                         $curNamePlateMarkBy = ($char['name_plate_marked_by'] == 'jothi') ? 'Admin' : $char['name_plate_marked_by'] ?? $curNamePlateMarkBy;
@@ -1008,9 +1014,9 @@ class CharacteristicsController extends Controller
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => null,
                         'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
-                        'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
+                        'name_plate_machine_name' => $curNpMach,
                         'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
                         'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
@@ -1021,6 +1027,7 @@ class CharacteristicsController extends Controller
                     // $values = array_merge($values1 ?? [], $values2 ?? [], $values3 ?? [], $values4 ?? [], $values5 ?? []);
                 } else {
                     if ($modelType == 'MOTOR') {
+                        $curMMach = $char['motor_machine_name'] ?? $curMMach;
                         $motPhysiCnt = $motPhysiCnt + 1;
                         $motExpecTim = $motExpecTim + $expectedTime;
                         if ($motPhysiCnt >= $mvhsCnt) {
@@ -1028,6 +1035,7 @@ class CharacteristicsController extends Controller
                         }
                         $curMotorMarkBy = ($char['motor_marked_by'] == 'jothi') ? 'Admin' : $char['motor_marked_by'] ?? $curMotorMarkBy;
                     } elseif ($modelType == 'PUMP') {
+                        $curPMach = $char['pump_machine_name'] ?? $curPMach;
                         $pumPhysiCnt = $pumPhysiCnt + 1;
                         $pumExpecTim = $pumExpecTim + $expectedTime;
                         if ($pumPhysiCnt >= $mvhsCnt) {
@@ -1068,12 +1076,12 @@ class CharacteristicsController extends Controller
                         'name_plate_expected_time' => (string) $napExpecTim,
                         'name_plate_marked_by' => $curNamePlateMarkBy,
                         'motor_pump_pumpset_status' => null,
-                        'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                        'motor_machine_name' => $char['motor_machine_name'] ?? $curMMach,
-                        'pump_machine_name' => $char['pump_machine_name'] ?? $curPMach,
+                        'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
+                        'motor_machine_name' => $curMMach,
+                        'pump_machine_name' => $curPMach,
                         'name_plate_machine_name' => $char['name_plate_machine_name'] ?? $curNpMach,
-                        'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                        'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                        'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
+                        'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
                         'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                         'pending_released_status' => $char['pending_released_status'] ?? 0,
                         'has_work_flow_id' => $char['has_work_flow_id'] ?? $curWorkFlow,
@@ -1110,15 +1118,26 @@ class CharacteristicsController extends Controller
                     //     ], 404);
                 }
 
+                if ($modelType == 'MOTOR') {
+                    $curMMach = $char['motor_machine_name'] ?? $curMMach;
+                } elseif ($modelType == 'PUMP') {
+                    $curPMach = $char['pump_machine_name'] ?? $curPMach;
+                } elseif ($modelType == 'NAME_PLATE') {
+                    $curNpMach = $char['name_plate_machine_name'] ?? $curNpMach;
+                }
+
                 $manStat = (intval($curStat->man_marked_status ?? 0) ?: 0) + 1;
                 // $manStat = ($curStat->man_marked_status == null || $curStat->man_marked_status == '' || $curStat->man_marked_status == '0') ? 0 : (int) $curStat->man_marked_status;
                 $values = [
                     'man_marked_status' => (string) $manStat,
                     'man_marked_datetime' => $char['man_marked_datetime'] ?? now(),
                     'man_marked_by' => ($char['man_marked_by'] == 'jothi') ? 'Admin' : $char['man_marked_by'] ?? $curManualMarkBy,
-                    'winded_serial_number' => $char['winded_serial_number'] ?? $curWindNo,
-                    'part_validation_1' => $char['part_validation_1'] ?? $curPart1,
-                    'part_validation_2' => $char['part_validation_2'] ?? $curPart2,
+                    'winded_serial_number' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curWindNo : ($char['winded_serial_number'] ?? $curWindNo),
+                    'motor_machine_name' => $curMMach,
+                    'pump_machine_name' => $curPMach,
+                    'name_plate_machine_name' => $curNpMach,
+                    'part_validation_1' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart1 : ($char['part_validation_1'] ?? $curPart1),
+                    'part_validation_2' => (Str::contains($curHead, 'PUMPSET', ignoreCase: true) && $modelType == 'PUMP') ? $curPart2 : ($char['part_validation_2'] ?? $curPart2),
                     'samlight_logged_name' => $char['samlight_logged_name'] ?? $slUser,
                     'updated_by' => $userName ?? null,
                 ];