diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index 5090282..f4038f9 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -12,7 +12,6 @@ FOLDER = '2015_04/20150417'
 FILE = 'MgE_plus'
 ALPHA=0
 """
-
 E1 = 710
 E2 = 720
 TIME = 1 #min
@@ -23,10 +22,11 @@ FOLDER = '2015_04/20150417'
 FILE = 'Fe_plus'
 ALPHA=0
 
+
 print "\Starting energy scan - Parameters: ",
 print E1,E2,TIME,DELAY,MODE ,OFFSET ,FOLDER ,FILE ,ALPHA
 
-start = time.localtime
+start = time.localtime()
 
 def wait_channel(name, value, type):
     print "Waiting " + str(name) + " = " + str(value)
@@ -68,13 +68,16 @@ print "Finished Energy scan"
 cmd = "/sls/X07MA/data/x07maop/bin/modify_otf.pl "
 folder = "~/Data1/" + FOLDER + "/";
 name = caget("MSG").split(' ')[0]
+if name == "Welcome"":
+    name = caget("MSG").split(' ')[0]
 name = folder + name;        
 newName = folder + "/" + time.strftime("/%Y%m%d_%H%M_", start) + FILE + "_0000.txt";             
 cmd = cmd + name + " " + newName;
-System.out.println("Converting data file: " + cmd);               
+print("Converting data file: " + cmd);               
 import os
 os.system(cmd)
-        
+print("Success")        
+
 #~/Data1/2015_06/20150623/23Jun_11_08_Fe_plus.txt 
 #~/Data1/2015_06/20150623/20150623_1144_Fe_plus_0000.txt