diff --git a/app/Controllers/InsuranceCommissionController.php b/app/Controllers/InsuranceCommissionController.php
index 3798237a..f2907bf6 100644
--- a/app/Controllers/InsuranceCommissionController.php
+++ b/app/Controllers/InsuranceCommissionController.php
@@ -13,7 +13,7 @@ class InsuranceCommissionController extends AdminController
 
     public function __construct()
     {
-        set_session_context('Client');
+        set_session_context('InsuranceCommissionController');
         $this->myLogger = \Config\Services::mylogger();
         // Load rules file if present in writable config path
         // $rulesPath = WRITEPATH . 'config/insurance_rules.json';
@@ -122,7 +122,10 @@ class InsuranceCommissionController extends AdminController
         // Normalise department keys to lowercase for consistent lookups
         $this->rules = [];
         foreach ($parsed as $dept => $rules) {
-            $this->rules[strtolower($dept)] = $rules;
+            if($rules['is_deleted'] === false)
+            {
+                $this->rules[strtolower($dept)] = $rules;
+            }
         }
 
         // print_r($this->rules);die();
diff --git a/app/Libraries/RuleImportService.php b/app/Libraries/RuleImportService.php
index 3e471f57..a4169916 100644
--- a/app/Libraries/RuleImportService.php
+++ b/app/Libraries/RuleImportService.php
@@ -62,6 +62,7 @@ class RuleImportService
     
     protected array $expectedColumns;
     protected array $columnValidators;
+    protected array $incomingData;
     protected string $annotatedDir;
     protected string $department;
     protected string $uploadedCommissionFileID;
@@ -148,7 +149,7 @@ class RuleImportService
     {
         // dd($params);
         $startTime = microtime(true);
-        
+        $this->incomingData = $params;
         try {
             $this->department = $params['department'];
             $this->uploadedCommissionFileID = $params['id'];
@@ -898,13 +899,25 @@ class RuleImportService
      */
     protected function convertRowToRule(array $rowData): array
     {
+        $temp_rule_id = $this->generateRuleId($rowData);
+        //rule_e07f52d4366a2_32_oct2025_3_com
+
+        $conditions = $this->buildConditions($rowData);
+        $temp_rule_id .= '_'.$this->incomingData['id'].'_'. strtolower(date('MY')).'_'.(count($conditions));
+        $calculation = $this->buildCalculation($rowData);
+
+
+        $temp_rule_id .= '_'.substr($calculation['type'], 0, 3);
+
         $rule = [
-            'id' => $this->generateRuleId($rowData),
+            'id' => $temp_rule_id,
             'name' => $this->sanitize($rowData[self::COL_RULE_NAME] ?? ''),
             'department' => $this->department,
+            'is_deleted' => false,
             'file_id' => $this->uploadedCommissionFileID,
-            'conditions' => $this->buildConditions($rowData),
-            'calculation' => $this->buildCalculation($rowData)
+            'conditions' => $conditions,
+            'calculation' => $calculation
+            
         ];
 
         return $rule;