diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 7f4fdb4..f95893f 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -23,25 +23,30 @@ FOLDER = '2015_04/20150417'
 FILE = 'Fe_plus'
 """
 
-print "Scan"
+print "\nStarting energy scan - Parameters: ",
 print E1,E2,TIME,DELAY,MODE ,OFFSET ,FOLDER ,FILE ,ALPHA
 
-"""
+
+def wait_channel(name, value, type):
+    print "Waiting " + str(name) + " = " + str(value)
+    cawait(name, value, type)
+    print "Done"
+
 #Pre-actions
-#cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
+#wait_channel('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's')
 caput('X07MA-ID:MODE', MODE)
 time.sleep(1.0)
 if MODE == 'LINEAR':
     caput('X07MA-ID:ALPHA', ALPHA)
-#cawait('X07MA-ID:DONE', 'DONE', type = 's')
+wait_channel('X07MA-ID:DONE', 'DONE', type = 's')
 caput('X07MA-ID:ENERGY-OFFS', OFFSET)
-#cawait('X07MA-ID:DONE', 'DONE', type = 's')
+wait_channel('X07MA-ID:DONE', 'DONE', type = 's')
 caput('E1', E1)
 caput('E2', E2)
 caput('TIME', TIME)
 caput('FOLDER', FOLDER)
 caputq('X07MA-PHS-E:GO.A', E1)
-cawait('X07MA-PHS:alldone', '1', type = 's')
+wait_channel('X07MA-PHS:alldone', '1', type = 's')
 time.sleep(0.5)
 caput('FILE', FILE)
 time.sleep(0.1)
@@ -52,6 +57,7 @@ time.sleep(DELAY)
 caput('START', '1')
 
 #Post-actions
-cawait('START', 'STOP', type = 's')
-"""
+wait_channel('START', 'STOP', type = 's')
+
 time.sleep(2.0)
+print "Finished Energy scan"
\ No newline at end of file