diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 7b362a9b..578dfca7 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1021,7 +1021,7 @@ class APIController extends Controller implements LoggedController
             if (!empty($nearest_hub))
             {
                 $jo->setHub($nearest_hub);
-                $jo->setStatus(JOStatus::ASSIGNED);
+                $jo->setStatus(JOStatus::RIDER_ASSIGN);
             }
 
             $em->persist($jo);
@@ -1035,7 +1035,7 @@ class APIController extends Controller implements LoggedController
             $em->persist($event);
 
             // check JO status
-            if ($jo->getStatus() == JOStatus::ASSIGNED)
+            if ($jo->getStatus() == JOStatus::RIDER_ASSIGNED)
             {
                 // add event logs for hub and rider assignments
                 $hub_assign_event = new JOEvent();
diff --git a/src/Ramcar/JOStatus.php b/src/Ramcar/JOStatus.php
index d31447db..5ba8f5d1 100644
--- a/src/Ramcar/JOStatus.php
+++ b/src/Ramcar/JOStatus.php
@@ -4,13 +4,13 @@ namespace App\Ramcar;
 
 class JOStatus extends NameValue
 {
-    const PENDING       = 'pending';
-    const RIDER_ASSIGN  = 'rider_assign';
-    const ASSIGNED      = 'assigned';
-    const IN_TRANSIT    = 'in_transit';
-    const IN_PROGRESS   = 'in_progress';
-    const CANCELLED     = 'cancelled';
-    const FULFILLED     = 'fulfilled';
+    const PENDING       = 'pending';            // NOTE: JO has no hub assigned
+    const RIDER_ASSIGN  = 'rider_assign';       // NOTE: JO has hub assigned but no rider assigned
+    const ASSIGNED      = 'assigned';           // NOTE: JO has hub and rider assigned
+    const IN_TRANSIT    = 'in_transit';         // NOTE: JO's rider is on his way
+    const IN_PROGRESS   = 'in_progress';        // NOTE: JO fulfillment in progress
+    const CANCELLED     = 'cancelled';          // NOTE: JO is cancelled
+    const FULFILLED     = 'fulfilled';          // NOTE: JO is fulfilled
 
     const COLLECTION = [
         'pending' => 'For Dispatch',