diff --git a/LSL2/STPROC/NDW_WAFER_COUNTS_EVENTS.txt b/LSL2/STPROC/NDW_WAFER_COUNTS_EVENTS.txt
index 0d8749c..3cf922a 100644
--- a/LSL2/STPROC/NDW_WAFER_COUNTS_EVENTS.txt
+++ b/LSL2/STPROC/NDW_WAFER_COUNTS_EVENTS.txt
@@ -1,9 +1,11 @@
 Compile function NDW_WAFER_COUNTS_EVENTS(CtrlEntId, Event, @PARAMS)
 #pragma precomp SRP_PreCompiler
 #window NDW_WAFER_COUNTS
-Declare function Reactor_Services, Database_Services, Get_Property, Error_Services, Environment_Services, Logging_Services
+Declare function   Reactor_Services, Database_Services, Get_Property, Error_Services, Environment_Services
+Declare function   SRP_Array, Logging_Services
 Declare subroutine Set_Property, Logging_Services
 
+$Insert EVENT_SETUP
 $Insert APP_INSERTS
 $Insert REACTOR_EQUATES
 
@@ -89,8 +91,9 @@ GetReactorMetrics:
     EPPData    = ''
     
     //Get ASM Reactors
-    ASMList     = Reactor_Services('GetReactorNumbers', 'ASM')
-    ASMList    := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
+    ASMList  = Reactor_Services('GetReactorNumbers', 'ASM')
+    ASMList := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
+    ASMList  = SRP_Array('SortSimpleList', ASMList, 'AscendingNumbers', @FM)
     
     //Get HTR Reactors
     HTRList = Reactor_Services('GetReactorNumbers', 'HTR')
@@ -110,7 +113,7 @@ GetReactorMetrics:
             ASMData<rPos, DATA_ASM_ARM_CNT$>  = MetricData<1, DATA_ASM_ARM_CNT$>
         end else
             ErrorMessage = Error_Services('GetMessage')
-            LogData      = Logging DTM : @FM : ErrorMessage
+            LogData      = LoggingDTM : @FM : ErrorMessage
             Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) 
         end
     Next reactor
@@ -128,7 +131,7 @@ GetReactorMetrics:
             HTRData<rPos, DATA_HTR_ARM_CNT$>  = MetricData<1, DATA_HTR_ARM_CNT$> 
         end else
             ErrorMessage = Error_Services('GetMessage')
-            LogData      = Logging DTM : @FM : ErrorMessage
+            LogData      = LoggingDTM : @FM : ErrorMessage
             Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
         end
 
@@ -148,7 +151,7 @@ GetReactorMetrics:
             EPPData<rPos, DATA_EPP_LOWER_QUARTZ_THK$> = MetricData<1, DATA_EPP_LOWER_QUARTZ_THK$>
         end else
             ErrorMessage = Error_Services('GetMessage')
-            LogData      = Logging DTM : @FM : ErrorMessage
+            LogData      = LoggingDTM : @FM : ErrorMessage
             Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$)
         end
     Next reactor
diff --git a/LSL2/STPROC/TEST_DANIEL3.txt b/LSL2/STPROC/TEST_DANIEL3.txt
index 4ad6177..50c6269 100644
--- a/LSL2/STPROC/TEST_DANIEL3.txt
+++ b/LSL2/STPROC/TEST_DANIEL3.txt
@@ -95,9 +95,14 @@ $Insert PS_EQUATES
 Main:
 *	Messaging_Services('SendMessage', 'RunProcedure', 'Request', '', 'All', 'RTP27,REACTOR_SERVICES', '', '', '')
 	debug
+	    ASMList     = Reactor_Services('GetReactorNumbers', 'ASM')
+    ASMList    := @FM : Reactor_Services('GetReactorNumbers', 'ASM+')
+    
+    ASMList = SRP_Array('SortSimpleList', ASMList, 'AscendingNumbers', @FM)
+	
 *	LoadInstAckReq = Xlate('RDS', 646209, 'LOAD_INST_ACK_REQ', 'X')
-	DefPrinter = Get_Printer( "CURRENTDEVICE")
-	Printers   = Get_Printer( "DEVICES" )
+*	DefPrinter = Get_Printer( "CURRENTDEVICE")
+*	Printers   = Get_Printer( "DEVICES" )
 *	SelPrinter = Printer_Select()
 
 *	Stage = Rds_Services('GetCurrentStage', 646209)          
@@ -4300,3 +4305,4 @@ return
 * return 
 *
 
+