diff --git a/app/Http/Controllers/CharacteristicApprovalController.php b/app/Http/Controllers/CharacteristicApprovalController.php
index f1b412b..a8ee45f 100644
--- a/app/Http/Controllers/CharacteristicApprovalController.php
+++ b/app/Http/Controllers/CharacteristicApprovalController.php
@@ -58,23 +58,24 @@ class CharacteristicApprovalController extends Controller
             }
         }
 
-        // foreach ($levels as $lvl => $column) {
-        //     if ($record->$column == 'Hold') {
+        foreach ($levels as $lvl => $column)
+        {
+            if ($record->$column == 'Hold') {
 
-        //         if ($lvl == $level) {
-        //             return view('approval.already-processed', [
-        //                 'status' => 'On Hold',
-        //             ]);
-        //         }
-        //         else
-        //         {
-        //             return view('approval.already-processed', [
-        //                 'status'     => 'Hold',
-        //                 'message'    => 'On Hold',
-        //             ]);
-        //         }
-        //     }
-        // }
+                if ($lvl == $level) {
+                    return view('approval.already-processed', [
+                        'status' => 'On Hold',
+                    ]);
+                }
+                // else
+                // {
+                //     return view('approval.already-processed', [
+                //         'status'     => 'Hold',
+                //         'message'    => 'On Hold',
+                //     ]);
+                // }
+            }
+        }
 
         $allowedMailStatusByLevel = [
             1 => 'Sent',
@@ -355,8 +356,6 @@ class CharacteristicApprovalController extends Controller
             ], 403);
         }
 
-
-
         $workflowRecords = RequestCharacteristic::where('plant_id', $record->plant_id)
             ->where('machine_id', $record->machine_id)
             ->where('aufnr', $record->aufnr)
@@ -369,6 +368,10 @@ class CharacteristicApprovalController extends Controller
             $approvedAtColumn => Carbon::now(),
         ];
 
+        if (in_array($status, ['Approved', 'Rejected'])) {
+            $updateData['trigger_at'] = null;
+        }
+
         foreach ($pendingRecords as $rec) {
             $rec->update($updateData);
         }