diff --git a/LSL2/STPROC/NDW_RELEASE_CASSETTES_EVENTS.txt b/LSL2/STPROC/NDW_RELEASE_CASSETTES_EVENTS.txt
index 283dc0a..87ba853 100644
--- a/LSL2/STPROC/NDW_RELEASE_CASSETTES_EVENTS.txt
+++ b/LSL2/STPROC/NDW_RELEASE_CASSETTES_EVENTS.txt
@@ -270,17 +270,7 @@ PopulateControls:
         
         For each Ctrl in Ctrls using @VM setting vPos
             
-            Begin Case
-            	Case Ctrl EQ 'EDL_RX_QTY'
-            		Val = RxQty
-            	Case Ctrl EQ 'EDL_REL_QTY'
-            		Val = RelQty
-            	Case Ctrl EQ 'EDL_UNREL_QTY'
-            		Val = UnRelQty
-            	Case Otherwise$
-            		Val = Xlate('WO_LOG', WONo, Cols<0, vPos>, 'X')
-            End Case
-            
+            Val     = Xlate('WO_LOG', WONo, Cols<0, vPos>, 'X')
             Set_Property(@Window:'.':Ctrl, 'DEFPROP', Val)
             Running = Msg(@WINDOW, MsgUp, vPos, MSGINSTUPDATE$) ;* Update message
             
diff --git a/LSL2/STPROC/OBJ_WM_OUT.txt b/LSL2/STPROC/OBJ_WM_OUT.txt
index 7675df4..66cbe9a 100644
--- a/LSL2/STPROC/OBJ_WM_OUT.txt
+++ b/LSL2/STPROC/OBJ_WM_OUT.txt
@@ -933,7 +933,7 @@ AddShip:
 	
 	// Update work order SHIP_QTY_STATIC
 	WONo = Field(WMOutKey, '*', 1)
-	Service_Services('PostProcedure', 'WORK_ORDER_SERVICES', 'UpdateShippedQty':@VM:WONo, False$)
+	Work_Order_Services('UpdateShippedQty', WONo)
 	
 RETURN
 
@@ -1952,3 +1952,4 @@ ConvertCleanInsp:
 	
 RETURN
 
+
diff --git a/LSL2/STPROC/OBJ_WO_MAT.txt b/LSL2/STPROC/OBJ_WO_MAT.txt
index 1a44563..0714b0b 100644
--- a/LSL2/STPROC/OBJ_WO_MAT.txt
+++ b/LSL2/STPROC/OBJ_WO_MAT.txt
@@ -3962,7 +3962,7 @@ AddShip:
 	
 	// Update work order SHIP_QTY_STATIC
 	WONo = Field(WOMatKey, '*', 1)
-	Service_Services('PostProcedure', 'WORK_ORDER_SERVICES', 'UpdateShippedQty':@VM:WONo, False$)
+	Work_Order_Services('UpdateShippedQty', WONo)
 	
 RETURN
 
@@ -5565,3 +5565,4 @@ ExpCOA:
 	
 RETURN
 
+
diff --git a/LSL2/STPROC/RDS_ACTIONS.txt b/LSL2/STPROC/RDS_ACTIONS.txt
index df2ba68..2a630a6 100644
--- a/LSL2/STPROC/RDS_ACTIONS.txt
+++ b/LSL2/STPROC/RDS_ACTIONS.txt
@@ -1043,4 +1043,3 @@ Restore_System_Variables:
 
 return
 
-
diff --git a/LSL2/STPROC/WORK_ORDER_SERVICES.txt b/LSL2/STPROC/WORK_ORDER_SERVICES.txt
index c3aed23..9d8e33d 100644
--- a/LSL2/STPROC/WORK_ORDER_SERVICES.txt
+++ b/LSL2/STPROC/WORK_ORDER_SERVICES.txt
@@ -51,7 +51,7 @@ $Insert WM_OUT_EQUATES
 Declare subroutine  Error_Services, Work_Order_Services, Memory_Services, RList, Database_Services, SRP_JSON
 Declare subroutine  Btree.Extract, Set_Status, obj_WO_Log, obj_Notes, Print_Wo_Mat_In_Labels, Print_Wo_Mat_Out_Labels
 Declare subroutine  Print_Wmi_Labels, Print_Wmo_Labels, ErrMsg, Print_Cass_Labels, Logging_Services, Service_Services
-Declare subroutine  obj_WO_Mat_Log, WO_Mat_Services
+Declare subroutine  obj_WO_Mat_Log, WO_Mat_Services, Work_Order_Services
 Declare function    SRP_Array, Work_Order_Services, Memory_Services, Database_Services, SRP_Sort_Array, SRP_JSON
 Declare function    Company_Services, obj_Prod_Spec, Schedule_Services, Datetime, obj_WO_Log, obj_WO_Step, Memberof
 Declare function    Environment_Services, Logging_Services, Hold_Services
@@ -697,7 +697,7 @@ Service ReleaseCassettes(WONo)
         end
     end
     
-    Service_Services('PostProcedure', 'WORK_ORDER_SERVICES', 'UpdateReleasedQty':@VM:WONo, False$)
+    Work_Order_Services('UpdateReleasedQty', WONo)
     
     If ErrorMsg NE '' then Error_Services('Add', ErrorMsg)
     Response = DCount(UnReleasedCassNos, @VM)
@@ -1455,5 +1455,3 @@ ClearCursors:
     
 return
 
-
-
diff --git a/LSL2/STPROC/WO_MAT_ACTIONS.txt b/LSL2/STPROC/WO_MAT_ACTIONS.txt
index 990012c..1791ed5 100644
--- a/LSL2/STPROC/WO_MAT_ACTIONS.txt
+++ b/LSL2/STPROC/WO_MAT_ACTIONS.txt
@@ -58,7 +58,7 @@ Equ Comma$ to ','
 Declare function    Error_Services, Database_Services, Environment_Services, Logging_Services, obj_WO_Mat, Max
 Declare function    GaN_Services, Signature_Services, obj_WO_LOG, SRP_Array, MemberOf, Datetime
 Declare subroutine  Error_Services, Database_Services, Environment_Services, Logging_Services, Obj_SAP, obj_Notes
-Declare subroutine  SAP_Services, Material_Services, RList, Service_Services
+Declare subroutine  SAP_Services, Material_Services, RList, Work_Order_Services, Service_Services
 
 LogPath     = Environment_Services('GetApplicationRootPath') : '\LogFiles\WO_Mat'
 LogDate     = Oconv(Date(), 'D4/')
@@ -817,8 +817,8 @@ WRITE_RECORD:
 	end    
     
     If OrigRecord<WO_MAT_WAFER_QTY$> NE Record<WO_MAT_WAFER_QTY$> then
-        Service_Services('PostProcedure', 'WORK_ORDER_SERVICES', 'UpdateReceivedQty':@VM:WONo, False$)
-        Service_Services('PostProcedure', 'WORK_ORDER_SERVICES', 'UpdateReleasedQty':@VM:WONo, False$)
+    	Work_Order_Services('UpdateReceivedQty', WONo)
+    	Work_Order_Services('UpdateReleasedQty', WONo)
     end
 
     CurrWaferCount  = obj_WO_Mat('CurrWaferCnt', WOMatKeyID)