diff --git a/LSL2/STPROC/WORK_ORDER_SERVICES.txt b/LSL2/STPROC/WORK_ORDER_SERVICES.txt
index f986b62..086f907 100644
--- a/LSL2/STPROC/WORK_ORDER_SERVICES.txt
+++ b/LSL2/STPROC/WORK_ORDER_SERVICES.txt
@@ -1231,19 +1231,23 @@ Service SignVoidNonEpp(WOMatKey, Username)
 						    Service_Services('PostProcedure', 'RDS_SERVICES', 'DetachRDSFromWO':@vm:RDSNo)
 						    If Error_Services('NoError') then
                                 LotEventParams = ''
-                                LotEventParams<1,1> = 'CreateLotEvent'
-                                LotEventParams<1,4> = DateTime()
-                                LotEventParams<1,5> = 'VOID'
-                                LotEventParams<1,6> = 'Lot voided by ' : Username
-                                LotEventParams<1,11> = Username
+                                LotEventParams<1,1> = 'CreateLotEvent' ; //Service Module
+                                LotEventParams<1,2> = ''; //Legacy Lot Id, set below
+                                LotEventParams<1,3> = DateTime(); //Datetime
+                                LotEventParams<1,4> = 'VOID'; //Event Type
+                                LotEventParams<1,5> = 'Lot voided by ' : Username; //Event Note
+                                LotEventParams<1,6> = ''; //Equipment id
+                                LotEventParams<1,7> = Username ;//User Id
+                                LotEventParams<1,8> = True$; //IsLegacyLotId
+                                LotEventParams<1,9> = ''; //Legacy Lot Type, set below
                                 If RDSNo NE '' then
                                     LotEventParams<1,2> = RDSNo
-                                    LotEventParams<1,3> = 'RDS'
-                                    Service_Services('PostProcedure', 'LOT_SERVICES', LotEventParams)
+                                    LotEventParams<1,9> = 'RDS'; //Legacy Lot Type
+                                    Service_Services('PostProcedure', 'LOT_EVENT_SERVICES', LotEventParams)
                                 end else
                                     LotEventParams<1,2> = WoMatKey
-                                    LotEventParams<1,3> = 'WO_MAT'
-                                    Service_Services('PostProcedure', 'LOT_SERVICES', LotEventParams)
+                                    LotEventParams<1,9> = 'WO_MAT'
+                                    Service_Services('PostProcedure', 'LOT_EVENT_SERVICES', LotEventParams)
                                 end
                                 If Error_Services('NoError') then
                                     //Add inventory transaction
@@ -1311,13 +1315,15 @@ Service SignVoidWMI(WMInKey, Username)
 					If Error_Services('NoError') then
 						LotEventParams = ''
 						LotEventParams<1,1> = 'CreateLotEvent'
-						LotEventParams<1,4> = DateTime()
-						LotEventParams<1,5> = 'VOID'
-						LotEventParams<1,6> = 'Lot voided by ' : Username
-						LotEventParams<1,11> = Username
 						LotEventParams<1,2> = WMInKey
-						LotEventParams<1,3> = 'WM_IN'
-						Service_Services('PostProcedure', 'LOT_SERVICES', LotEventParams)
+						LotEventParams<1,3> = DateTime()
+						LotEventParams<1,4> = 'VOID'
+						LotEventParams<1,5> = 'Lot voided by ' : Username
+						LotEventParams<1,6> = ''
+						LotEventParams<1,7> = Username
+						LotEventParams<1,8> = True$
+						LotEventParams<1,9> = 'WM_IN'
+						Service_Services('PostProcedure', 'LOT_EVENT_SERVICES', LotEventParams)
 						If Error_Services('NoError') then
 							//Check if WMO is also voided. If it is, remove it from the WO_MAT_KEY field in WO_LOG, and void the WO_MAT record
 							WMOKey = WMInKey; //the paired WMO key is the same as the WMIKey
@@ -1386,13 +1392,15 @@ Service SignVoidWMO(WMOutKey, Username)
 					If Error_Services('NoError') then
 						LotEventParams = ''
 						LotEventParams<1,1> = 'CreateLotEvent'
-						LotEventParams<1,4> = DateTime()
-						LotEventParams<1,5> = 'VOID'
-						LotEventParams<1,6> = 'Lot voided by ' : Username
-						LotEventParams<1,11> = Username
 						LotEventParams<1,2> = WMOutKey
-						LotEventParams<1,3> = 'WM_OUT'
-						Service_Services('PostProcedure', 'LOT_SERVICES', LotEventParams)
+						LotEventParams<1,3> = DateTime()
+						LotEventParams<1,4> = 'VOID'
+						LotEventParams<1,5> = 'Lot voided by ' : Username
+						LotEventParams<1,6> = ''
+						LotEventParams<1,7> = Username
+						LotEventParams<1,8> = True$
+						LotEventParams<1,9> = 'WM_OUT'
+						Service_Services('PostProcedure', 'LOT_EVENT_SERVICES', LotEventParams)
 						If Error_Services('NoError') then
 							//Check if WMI is also voided. If it is, remove it from the WO_MAT_KEY field in WO_LOG, and void the WO_MAT record
 							WMIKey = WMOutKey; //the paired WMO key is the same as the WMIKey
@@ -1558,3 +1566,4 @@ ClearCursors:
 return
 
 
+