diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp
index f6d3905..1a9f753 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp
@@ -543,50 +543,65 @@ static void restoreInventory(ServiceBooking* booking)
 
 /*
 Function: processBookingCancellation
-Description: Cancels jobs and updates the status of a given booking. Sends notifications to the
-             specified user, resets technician assignment if needed, and restores inventory items.
-Parameter: ServiceBooking* booking - Pointer to the booking being cancelled
-           util::ServiceJobStatus newServiceBookingStatus - New status to assign to the booking
-           const std::string& notificationTitle - Title of the booking cancellation notification
-           const std::string& notificationMessage - Message body of the booking cancellation notification
-           User* notifyUser - User to notify about the cancellation
-           util::ServiceJobStatus jobCardStatus - New status to assign to associated job cards
-           const std::string& jobNotificationTitle - Title of the job cancellation notification
-           const std::string& jobNotificationMessage - Message body of the job cancellation notification
-           util::Map<std::string, JobCard*>& jobs - Collection of job cards to update
-           ServiceManagementService& currentService - Reference to the service for sending notifications
+Description: Handles cancellation or reassignment of a service booking based on user type.
+             Cancels associated job cards, updates booking status, clears technician assignments,
+             restores inventory, and sends appropriate notifications.
+Parameters:
+    ServiceBooking* booking - The booking to cancel or reset
+    util::Map<std::string, JobCard*>& jobs - Collection of job cards to update
+    ServiceManagementService& currentService - Service layer for notifications
+    util::UserType userType - Type of user initiating cancellation (CUSTOMER or TECHNICIAN)
 Return type: void
 */
 static void processBookingCancellation(ServiceBooking* booking,
-    util::ServiceJobStatus newServiceBookingStatus,
-    const std::string& notificationTitle,
-    const std::string& notificationMessage,
-    User* notifyUser,
-    util::ServiceJobStatus jobCardStatus,
-    const std::string& jobNotificationTitle,
-    const std::string& jobNotificationMessage,
-    util::Map<std::string, JobCard*>& jobs, ServiceManagementService& currentService)
+    util::Map<std::string, JobCard*>& jobs,
+    ServiceManagementService& currentService,
+    util::UserType userType)
 {
-    if (!booking || !notifyUser)
+    if (!booking)
     {
         return;
     }
     for (int jobIterator = 0; jobIterator < jobs.getSize(); ++jobIterator)
     {
         JobCard* jobCard = jobs.getValueAt(jobIterator);
-        if (jobCard && jobCard->getBookingId() == booking->getId())
+        if (!jobCard || jobCard->getBookingId() != booking->getId() || jobCard->getStatus() == util::ServiceJobStatus::CANCELLED)
         {
-            jobCard->setStatus(jobCardStatus);
-            currentService.sendNotification(notifyUser, jobNotificationTitle, jobNotificationMessage);
+            continue;
+        }
+        jobCard->setStatus(util::ServiceJobStatus::CANCELLED);
+        if (userType == util::UserType::CUSTOMER)
+        {
+            if (User* technician = booking->getAssignedTechnician())
+            {
+                const std::string jobTitle = "Job Cancelled";
+                const std::string jobMessage = "Your job card has been cancelled and the inventory has been restocked.";
+                currentService.sendNotification(technician, jobTitle, jobMessage);
+            }
         }
     }
-    booking->setStatus(newServiceBookingStatus);
-    currentService.sendNotification(notifyUser, notificationTitle, notificationMessage);
-    if (newServiceBookingStatus == util::ServiceJobStatus::PENDING)
+    if (userType == util::UserType::CUSTOMER)
     {
-        booking->setAssignedTechnician(nullptr);
-        booking->setAssignedTechnicianId("");
+        booking->setStatus(util::ServiceJobStatus::CANCELLED);
+        if (User* technician = booking->getAssignedTechnician())
+        {
+            const std::string title = "Customer Service Cancelled";
+            const std::string message = "Your assigned job card has been cancelled and the inventory has been restocked.";
+            currentService.sendNotification(technician, title, message);
+        }
     }
+    else if (userType == util::UserType::TECHNICIAN)
+    {
+        booking->setStatus(util::ServiceJobStatus::PENDING);
+        if (User* customer = booking->getCustomer())
+        {
+            const std::string title = "Technician Unavailable";
+            const std::string message = "Your booking has been reset to pending and we will reassign a new technician shortly.";               
+            currentService.sendNotification(customer, title, message);
+        }
+    }
+    booking->setAssignedTechnician(nullptr);
+    booking->setAssignedTechnicianId("");
     restoreInventory(booking);
 }
 
@@ -624,21 +639,13 @@ void ServiceManagementService::cancelCustomerServiceBookings(const std::string&
         {
             continue;
         }
-        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING &&
+            booking->getStatus() != util::ServiceJobStatus::STARTED && 
+            booking->getStatus() != util::ServiceJobStatus::IN_PROGRESS)
         {
             continue;
         }
-        User* assignedTechnician = booking->getAssignedTechnician();
-        std::string titleToTechnician = "Customer Service Cancelled";
-        std::string messageToTechnician = "The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.";
-        std::string jobTitle = "Job Cancelled";
-        std::string jobMessage = "The job has been cancelled. Your job card has been cancelled and the inventory has been restocked.";
-        processBookingCancellation(booking, 
-            util::ServiceJobStatus::CANCELLED,
-            titleToTechnician, messageToTechnician, assignedTechnician,
-            util::ServiceJobStatus::CANCELLED,
-            jobTitle, jobMessage, jobs, *this
-        );
+        processBookingCancellation(booking, jobs, *this, util::UserType::CUSTOMER);
     }
 }
 
@@ -676,7 +683,9 @@ void ServiceManagementService::cancelTechnicianJobs(const std::string& technicia
         {
             continue;
         }
-        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING &&
+            booking->getStatus() != util::ServiceJobStatus::STARTED &&
+            booking->getStatus() != util::ServiceJobStatus::IN_PROGRESS)
         {
             continue;
         }
@@ -685,14 +694,7 @@ void ServiceManagementService::cancelTechnicianJobs(const std::string& technicia
         {
             continue;
         }
-        std::string title = "Technician Unavailable";
-        std::string message = "Your assigned technician is no longer available. Your booking has been reset to pending and we will reassign a new technician shortly.";
-        processBookingCancellation(booking,
-            util::ServiceJobStatus::PENDING,
-            title, message, customer,
-            util::ServiceJobStatus::CANCELLED,
-            title, message, jobs, *this
-        );
+        processBookingCancellation(booking, jobs, *this, util::UserType::TECHNICIAN);
     }
 }