diff --git a/script/Diagnostics/ParkAllWireScanners.py b/script/Diagnostics/ParkAllWireScanners.py
index c57e3a1..d11c5ec 100644
--- a/script/Diagnostics/ParkAllWireScanners.py
+++ b/script/Diagnostics/ParkAllWireScanners.py
@@ -2,8 +2,13 @@ run("Devices/Elements")
 
 for scanner in get_wire_scanners():
     try:
-        print scanner, caget(scanner + ":ENC_1_BS")
-        #caputq(scanner + ":GARAGE_SEL.PROC", 1)
-        #caputq(scanner + ":INIT.PROC", 1)    
+        if caget(scanner + ":MOTOR_1_HOMED",i)!= 1:
+            print scanner + " is not homed"
+        if (caget(scanner + ":WIRE_SP", 'i') != 0) or (caget(scanner + ":INIT_DONE", 'i') != 1):
+            print scanner + " is not parked... Parking"
+            #caputq(scanner + ":GARAGE_SEL.PROC", 1)
+            #caputq(scanner + ":INIT.PROC", 1)    
+        else
+            print scanner + " is parked - pos: " + caget(scanner + ":MOTOR_1.RBV", 's')        
     except:
-         print "Unable to park " + scanner
\ No newline at end of file
+         print "Error accessing: " + scanner
\ No newline at end of file