diff --git a/LSL2/STPROC/COPY_LOT_OPERATION_RECORD_TO_SQL.txt b/LSL2/STPROC/COPY_LOT_OPERATION_RECORD_TO_SQL.txt
index f28c98d..4fa3ff0 100644
--- a/LSL2/STPROC/COPY_LOT_OPERATION_RECORD_TO_SQL.txt
+++ b/LSL2/STPROC/COPY_LOT_OPERATION_RECORD_TO_SQL.txt
@@ -14,7 +14,7 @@ Declare function SQL_Write, SQL_Write_MV, SQL_Format
 Ans = ""
 
 // Parse record into a dimensioned array for speed
-Dim Rec(24)
+Dim Rec(25)
 MatParse Record into Rec
 					    
 // List of key names and their values
@@ -54,3 +54,4 @@ Ans = SQL_Write(Connection, "LOT_OPERATION", Keys, DataFields);
 // Multi-valued Fields
 
 Return Ans
+
diff --git a/LSL2/STPROC/LOT_SERVICES.txt b/LSL2/STPROC/LOT_SERVICES.txt
index e53382c..b886d0f 100644
--- a/LSL2/STPROC/LOT_SERVICES.txt
+++ b/LSL2/STPROC/LOT_SERVICES.txt
@@ -53,7 +53,8 @@ Declare function PSN_Services, Return_To_Fab_Services
 Declare subroutine Database_Services, Btree.Extract, Lot_Services, Error_Services, Labeling_Services, SRP_Json, Logging_Services
 Declare subroutine SRP_Run_Command, Service_Services, obj_notes, Lot_Event_Services, Mona_Services
 
-$insert APP_INSERTS
+$Insert SERVICE_SETUP
+$Insert APP_INSERTS
 $Insert LOT_EQUATES
 $Insert TEST_WAFER_PROD_EQUATES
 $Insert Lot_Operation_Equates
@@ -65,6 +66,7 @@ $Insert RDS_EQUATES
 $Insert WO_LOG_EQUATES
 $Insert PROD_VER_EQUATES
 $Insert OPERATION_EQUATES
+$Insert IFX_EQUATES
 
 LogPath      = Environment_Services('GetApplicationRootPath') : '\LogFiles\Lot'
 LogDate      = Oconv(Date(), 'D4/')
@@ -106,7 +108,9 @@ end else
 	MonaResource = 'GRP_OPENINSIGHT_MES_OP_FE_DEV_LOTSERVICES'
 end
 
-GoToService
+GoToService else
+    Error_Services('Add', Service : ' is not a valid service request within the ' : ServiceModule : ' services module.')
+end
 
 Return Response or ""
 
@@ -1226,7 +1230,7 @@ Service OpenLot(LotId)
 		LotRec<LOT_OPEN$> = True$
 		Database_Services('WriteDataRow', 'LOT', LotId, LotRec, True$, False$, False$)
 		If Error_Services('NoError') then
-			Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'OPEN', 'Lot status set to Open.', '', 'SYSTEM')									 
+			Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'LOT_START', 'Lot created.', '', 'SYSTEM')									 
 		end else
 			ErrorMessage = 'Error setting lot ' : LotId : ' to open.' : Error_Services('GetMessage')
 		end
@@ -1409,7 +1413,7 @@ Service ReduceLotWaferCount(LotId, ReductionQty, OperatorId)
 				// Write Lot Event
 				Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'REDUCE_WAFER_QTY', 'Reduced wafer count by ' : ReductionQty, '', OperatorId, False$, '')
 				if LotNewWfrQty EQ 0  AND LotType EQ 'TW' then
-					ServiceParms = 'AutoCloseTestWaferLot' : @VM : LotId : @VM : 'SYSTEM'
+					ServiceParms = 'AutoCloseTestWaferLot' : SD$ : LotId : SD$ : 'SYSTEM'
 					Service_Services('PostProcedure', 'LOT_SERVICES', ServiceParms)
 					If Error_Services('HasError') then
 						Recipients   = Xlate('NOTIFICATION', 'FI_SUPPORT', NOTIFICATION_USER_ID$, 'X')
@@ -1465,7 +1469,7 @@ Service IncreaseLotWaferCount(LotId, IncreaseQty, OperatorId)
 					Database_Services('WriteDataRow', 'LOT', LotId, LotRec, True$, False$, False$)
 					If Error_Services('NoError') then
 						// Write Lot Event
-						Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'INCREASE_WAFER_QTY', 'Increased wafer count by ' : IncreaseQty, '', OperatorId, False$, '')
+						Lot_Event_Services('CreateLotEvent', LotId, Datetime(), 'BONUS_WAFER_QTY', 'Increased wafer count by ' : IncreaseQty, '', OperatorId, False$, '')
 					end else
 						ErrorMessage = 'Error in Increase Lot Wafer Count service, Error writing Lot Id ' : LotId : ' with new quantity.' 
 					end
@@ -1580,11 +1584,11 @@ Service CreateNewVoidedLotRecord(LotId, LegacyLotId, LotType=LOT_TYPES, Username
 	EndTick = GetTickCount()
 	Mona_Services('QueueLatencyAndCountMetrics', MonaResource, MetricName, StartTick, EndTick)    
     
-	
 	If ErrorMessage NE ''  then Error_Services('Add', ErrorMessage)
 	
 end service
 
+
 Service CanUserModifyLot(UserId)
     
     Begin Case
@@ -1614,4 +1618,3 @@ end service
 // Internal GoSubs
 //----------------------------------------------------------------------------------------------------------------------
 
-