diff --git a/LSL2/STPROC/NCR_ACTIONS.txt b/LSL2/STPROC/NCR_ACTIONS.txt
index f076d11..1616b16 100644
--- a/LSL2/STPROC/NCR_ACTIONS.txt
+++ b/LSL2/STPROC/NCR_ACTIONS.txt
@@ -152,17 +152,19 @@ READ_RECORD:
 	//    OrigFileError   = 100 : @FM : KeyID
 	//    Status          = 0
 	//    Record          = ''
-	If {SHIFT} then
+	
+	Shift = Record<NCR_SHIFT$>	
+	If Num(Shift) then
 	    Begin Case
-	        Case {SHIFT} EQ 1
+	        Case Shift EQ 1
 	            Record<NCR_SHIFT$> = 'A'
-	        Case {SHIFT} EQ 2
+	        Case Shift EQ 2
 	            Record<NCR_SHIFT$> = 'B'
-	        Case {SHIFT} EQ 3
+	        Case Shift EQ 3
 	            Record<NCR_SHIFT$> = 'C'
-	        Case {SHIFT} EQ 4
+	        Case Shift EQ 4
 	            Record<NCR_SHIFT$> = 'D'
-	        Case {SHIFT} EQ 5
+	        Case Shift EQ 5
 	            Record<NCR_SHIFT$> = '5'
 	        Case Otherwise$
 	            Null
@@ -186,23 +188,25 @@ READONLY_RECORD:
 	//    OrigFileError   = 100 : @FM : KeyID
 	//    Status          = 0
 	//    Record          = ''
-	
-	If {SHIFT} then
+
+	Shift = Record<NCR_SHIFT$>
+	If Num(Shift) then
 	    Begin Case
-	        Case {SHIFT} EQ 1
+	        Case Shift EQ 1
 	            Record<NCR_SHIFT$> = 'A'
-	        Case {SHIFT} EQ 2
+	        Case Shift EQ 2
 	            Record<NCR_SHIFT$> = 'B'
-	        Case {SHIFT} EQ 3
+	        Case Shift EQ 3
 	            Record<NCR_SHIFT$> = 'C'
-	        Case {SHIFT} EQ 4
+	        Case Shift EQ 4
 	            Record<NCR_SHIFT$> = 'D'
-	        Case {SHIFT} EQ 5
+	        Case Shift EQ 5
 	            Record<NCR_SHIFT$> = '5'
 	        Case Otherwise$
 	            Null
 	    End Case
 	end
+	
 return
 
 WRITE_RECORD_PRE:
@@ -211,22 +215,25 @@ WRITE_RECORD_PRE:
 	CassNo      = {WO_MAT_CASS_NO}
 	WoMatKey    = WorkOrderNo : '*' : CassNo
 	SAPBatchNo  = Xlate('WO_MAT', WOMatKey, 'SAP_BATCH_NO', 'X')
-	If {SHIFT} then
+	Shift       = Record<NCR_SHIFT$>
+	If Num(Shift) then
 	    Begin Case
-	        Case {SHIFT} EQ 1
+	        Case Shift EQ 1
 	            Record<NCR_SHIFT$> = 'A'
-	        Case {SHIFT} EQ 2
+	        Case Shift EQ 2
 	            Record<NCR_SHIFT$> = 'B'
-	        Case {SHIFT} EQ 3
+	        Case Shift EQ 3
 	            Record<NCR_SHIFT$> = 'C'
-	        Case {SHIFT} EQ 4
+	        Case Shift EQ 4
 	            Record<NCR_SHIFT$> = 'D'
-	        Case {SHIFT} EQ 5
+	        Case Shift EQ 5
 	            Record<NCR_SHIFT$> = '5'
 	        Case Otherwise$
 	            Null
 	    End Case
 	end
+	SaveRecord = Record
+	
 	If SAPBatchNo NE '' then
 		NCRNo      = Name
 		OrigRejQty = Sum(obj_NCR('RejQty',NCRNo:@RM:OrigRecord))
@@ -808,5 +815,3 @@ LogRecord:
 	
 return
 
-
-
diff --git a/LSL2/STPROC/RDS_ACTIONS.txt b/LSL2/STPROC/RDS_ACTIONS.txt
index 1ea7b07..103324f 100644
--- a/LSL2/STPROC/RDS_ACTIONS.txt
+++ b/LSL2/STPROC/RDS_ACTIONS.txt
@@ -565,15 +565,17 @@ READ_RECORD:
     //    OrigFileError   = 100 : @FM : KeyID
     //    Status          = 0
     //    Record          = ''
-    If Num({SHIFT}) then
+    
+    Shift = Record<RDS_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<RDS_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<RDS_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<RDS_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<RDS_SHIFT$> = 'D'
     		Case Otherwise$
     			Null
@@ -597,15 +599,17 @@ READONLY_RECORD:
     //    OrigFileError   = 100 : @FM : KeyID
     //    Status          = 0
     //    Record          = ''
-    If Num({SHIFT}) then
+    
+	Shift = Record<RDS_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<RDS_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<RDS_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<RDS_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<RDS_SHIFT$> = 'D'
     		Case Otherwise$
     			Null
@@ -616,15 +620,16 @@ return
 
 WRITE_RECORD_PRE:
 
-    If Num({SHIFT}) then
+	Shift = Record<RDS_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<RDS_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<RDS_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<RDS_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<RDS_SHIFT$> = 'D'
     		Case Otherwise$
     			Null
@@ -978,7 +983,3 @@ Restore_System_Variables:
 
 return
 
-
-
-
-
diff --git a/LSL2/STPROC/REACT_RUN_ACTIONS.txt b/LSL2/STPROC/REACT_RUN_ACTIONS.txt
index d80ee79..bf0a12b 100644
--- a/LSL2/STPROC/REACT_RUN_ACTIONS.txt
+++ b/LSL2/STPROC/REACT_RUN_ACTIONS.txt
@@ -297,15 +297,17 @@ READ_RECORD:
     //    OrigFileError   = 100 : @FM : KeyID
     //    Status          = 0
     //    Record          = ''
-    If Num({SHIFT}) then
+    
+    Shift = Record<REACT_RUN_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<REACT_RUN_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<REACT_RUN_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<REACT_RUN_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<REACT_RUN_SHIFT$> = 'D'
     		Case Otherwise$
     			Null
@@ -329,15 +331,17 @@ READONLY_RECORD:
     //    OrigFileError   = 100 : @FM : KeyID
     //    Status          = 0
     //    Record          = ''
-    If Num({SHIFT}) then
+    
+    Shift = Record<REACT_RUN_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<REACT_RUN_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<REACT_RUN_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<REACT_RUN_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<REACT_RUN_SHIFT$> = 'D'
     		Case Otherwise$
     			Null
@@ -348,15 +352,16 @@ return
 
 WRITE_RECORD_PRE:
     
-    If Num({SHIFT}) then
+    Shift = Record<REACT_RUN_SHIFT$>
+    If Num(Shift) then
     	Begin Case
-    		Case {SHIFT} EQ 1
+    		Case Shift EQ 1
     			Record<REACT_RUN_SHIFT$> = 'A'
-    		Case {SHIFT} EQ 2
+    		Case Shift EQ 2
     			Record<REACT_RUN_SHIFT$> = 'B'
-    		Case {SHIFT} EQ 3
+    		Case Shift EQ 3
     			Record<REACT_RUN_SHIFT$> = 'C'
-    		Case {SHIFT} EQ 4
+    		Case Shift EQ 4
     			Record<REACT_RUN_SHIFT$> = 'D'
     		Case Otherwise$
     			Null