diff --git a/config/setup.properties b/config/setup.properties
index a1c9ccb..94947d0 100644
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,21 +1,22 @@
-#Wed Mar 06 10:25:41 CET 2019
-configFile={config}/config.properties
-configFileDevices={config}/devices.properties
+#Mon Sep 30 16:07:34 CEST 2019
+scriptPath={home}/script
+sessionsPath={home}/sessions
 configFileImageSources={config}/imaging.properties
+pluginsPath={home}/plugins
+configFileDevices={config}/devices.properties
+libraryPath={script}; {script}/Lib
 configFilePlugins={config}/plugins.properties
-configFileSettings={config}/settings.properties
-configFileTasks={config}/tasks.properties
+contextPath={home}/context
+extensionsPath={home}/extensions
 configFileUpdateStrategy={config}/update.properties
 configPath={home}/config
-contextPath={home}/context
 dataPath={home}/data
 devicesPath={home}/devices
-extensionsPath={home}/extensions
-imagesPath={outp}/images
-libraryPath={script}; {script}/Lib
+configFileVariables={config}/variables.properties
+configFileSettings={config}/settings.properties
 logPath={home}/log
-pluginsPath={home}/plugins
-scriptPath={home}/script
-scriptType=py
-sessionsPath={home}/sessions
 wwwPath={home}/www
+configFile={config}/config.properties
+imagesPath={outp}/images
+scriptType=py
+configFileTasks={config}/tasks.properties
diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py
index 3967f10..6a221f1 100644
--- a/script/templates/EnergyScan.py
+++ b/script/templates/EnergyScan.py
@@ -3,17 +3,19 @@ import time
 
 #Parameters
 """
-E1 = 510
+E1 = 800
 E2 = 590
 TIME = 1 #min
 DELAY = 2.0 #s
 MODE = 'CIRC +'
 OFFSET = -9.0
-FOLDER = 'TEST'
+FOLDER = '/sls/X11MA/data/X11MA/XAS/20190930/o_XAS_NCM111'
 FILE = 'pshell-test'
 ALPHA=0
 """
 
+FOLDER = 'XAS/20190930/o_XAS_NCM111'
+FILE = 'o_NCM111'
 
 count.initialize()
 data.initialize()
diff --git a/script/test/otf_NCM111.py b/script/test/otf_NCM111.py
new file mode 100644
index 0000000..700f12c
--- /dev/null
+++ b/script/test/otf_NCM111.py
@@ -0,0 +1,54 @@
+otf(start=845, end=885, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+
+
+#otf(start=520, end=570, time=5, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+#otf(start=480, end=510, time=2.5, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+#otf(start=270, end=320, time=1, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+#otf(start=120, end=180, time=10, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+
+
+
+
+
+'''    long acquisition Sn M-edge + O K-edge
+nr_loops=1000
+loop_count = 0
+while loop_count < nr_loops:
+    caput('X11MA-KEI12:RANGE', 10)
+    otf(start=480, end=510, time=5, delay=900, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    caput('X11MA-KEI12:RANGE', 9)
+    otf(start=520, end=570, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+#     '''
+
+'''    repeating scans C
+caput('X11MA-KEI12:RANGE', 10)
+nr_loops=2
+loop_count = 0
+while loop_count < nr_loops:
+    otf(start=270, end=320, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+
+#     '''
+
+
+'''    repeating scans Sn
+caput('X11MA-KEI12:RANGE', 10)
+nr_loops=5
+loop_count = 0
+while loop_count < nr_loops:
+    otf(start=480, end=510, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+
+#    '''
+
+
+'''    repeating scans O
+caput('X11MA-KEI12:RANGE', 9)
+nr_loops=2
+loop_count = 0
+while loop_count < nr_loops:
+    otf(start=520, end=570, time=5, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
+    loop_count = loop_count + 1
+
+#     '''
\ No newline at end of file
diff --git a/script/test/test2.py b/script/test/test2.py
new file mode 100644
index 0000000..e0369f7
--- /dev/null
+++ b/script/test/test2.py
@@ -0,0 +1 @@
+print('test')
\ No newline at end of file