diff --git a/config/jcae.properties b/config/jcae.properties
index 6ce6441..80787c5 100755
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,4 +1,4 @@
-#Thu Jan 18 11:07:41 CET 2018
+#Thu Apr 26 17:55:10 CEST 2018
 ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321
 ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
 ch.psi.jcae.ChannelFactory.timeout=100
@@ -9,3 +9,4 @@ ch.psi.jcae.impl.DefaultChannelService.timeout=5000
 ch.psi.jcae.ContextFactory.autoAddressList=true
 ch.psi.jcae.ContextFactory.useShellVariables=false
 ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
+ch.psi.jcae.ContextFactory.maxSendArrayBytes=
diff --git a/config/plugins.properties b/config/plugins.properties
index a1f7066..dbc6b91 100755
--- a/config/plugins.properties
+++ b/config/plugins.properties
@@ -4,7 +4,7 @@ Correlation.java=disabled
 Sender.java=disabled
 MXSC-1.9.0.jar=disabled
 Nilson.java=disabled
-CameraCalibrationDialog.java=enabled
+CameraCalibrationDialog.java=disabled
 ScalarPanel.java=disabled
 CameraConfigDialog.java=disabled
 Inventory.java=disabled
diff --git a/config/setup.properties b/config/setup.properties
index a40f43c..a54ff8f 100755
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -12,6 +12,7 @@ devicesPath={home}/devices
 extensionsPath={home}/extensions
 imagesPath={outp}/images
 libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
+#libraryPath={extensions}/JyNI.jar;{extensions};/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/lib-dynload;/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7;/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages;{script}; {script}/Lib; src/main/assembly/script/tutorial
 logPath={outp}/log
 pluginsPath={home}/plugins
 scriptPath={home}/script
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index ebaeeb7..20907e5 100755
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Wed Mar 21 12:02:58 CET 2018
+#Wed May 16 15:31:51 CEST 2018
 colormap=Flame
 colormapAutomatic=true
 colormapMax=25300.0
@@ -22,9 +22,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=http\://gfa-lc6-64\:8889
-spatialCalOffsetX=0.0
-spatialCalOffsetY=0.0
-spatialCalScaleX=1.0
-spatialCalScaleY=1.0
+spatialCalOffsetX=-634.4956973840979
+spatialCalOffsetY=-509.5307480984911
+spatialCalScaleX=-26.954178679632527
+spatialCalScaleY=-35.8422927936001
 spatialCalUnits=mm
 transpose=false
diff --git a/devices/Image Averager.properties b/devices/Image Averager.properties
index 0ec2e3d..2d7a85f 100644
--- a/devices/Image Averager.properties	
+++ b/devices/Image Averager.properties	
@@ -1,4 +1,4 @@
-#Tue Mar 06 11:10:32 CET 2018
+#Tue May 15 17:44:18 CEST 2018
 colormap=Flame
 colormapAutomatic=true
 colormapMax=50660.0
diff --git a/plugins/MXSC-1.9.0.jar b/plugins/MXSC-1.9.0.jar
index 36f7cca..0a6c3da 100755
Binary files a/plugins/MXSC-1.9.0.jar and b/plugins/MXSC-1.9.0.jar differ
diff --git a/plugins/ScreenPanel2.form.txt b/plugins/ScreenPanel2.form.for
similarity index 100%
rename from plugins/ScreenPanel2.form.txt
rename to plugins/ScreenPanel2.form.for
diff --git a/script/TerstRetCall.py b/script/TerstRetCall.py
new file mode 100644
index 0000000..b459e3a
--- /dev/null
+++ b/script/TerstRetCall.py
@@ -0,0 +1,8 @@
+#from TestRet import *
+
+print run("TestRet")
+print _
+print "PASS"
+
+
+print get_return()
\ No newline at end of file
diff --git a/script/TestRet.py b/script/TestRet.py
new file mode 100644
index 0000000..e020c93
--- /dev/null
+++ b/script/TestRet.py
@@ -0,0 +1,14 @@
+#print __name__
+#from startup import *
+
+is_panel = get_exec_pars().source != CommandSource.ui  #Must be checked before callin "run"
+
+
+print is_panel, get_exec_pars().source
+ret = []
+
+for i in range(10):    
+    ret.extend([i])
+print "OK"
+
+set_return(ret)
diff --git a/script/local.py b/script/local.py
index f866e4f..79ac353 100755
--- a/script/local.py
+++ b/script/local.py
@@ -8,6 +8,16 @@ import ch.psi.pshell.crlogic.CrlogicPositioner as CrlogicPositioner
 import ch.psi.pshell.crlogic.CrlogicSensor as CrlogicSensor
 
 
+
+###################################################################################################
+# Layout setup
+###################################################################################################
+import ch.psi.pshell.data.LayoutSF as LayoutSF
+
+LayoutSF.setExperimentArguments([PiezoRoll1, testd, pv, motor, pe, cv, en, sin])
+
+
+
 #Libraries
 #import Jama.Matrix
 #sys.path.append('/Users/gobbo_a/dev/pshell/config/home/script/Lib/diffcalc')
diff --git a/script/spectrum.py b/script/spectrum.py
index 7fec967..755df39 100755
--- a/script/spectrum.py
+++ b/script/spectrum.py
@@ -1,4 +1,4 @@
-set_exec_pars(persist=False)
+set_exec_pars(save=False)
 set_preference(Preference.PLOT_DISABLED, True)
 
 plots = None
diff --git a/script/test/TestJyNI.py b/script/test/TestJyNI.py
new file mode 100644
index 0000000..838905b
--- /dev/null
+++ b/script/test/TestJyNI.py
@@ -0,0 +1,26 @@
+import datetime
+
+#sys.path.insert(0, "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/lib-dynload")
+print datetime.__doc__
+
+#sys.path.insert(0, "/Users/gobbo_a/dev/pshell/pshell/build/libs/Lib")
+#sys.path.insert(0, "/Users/gobbo_a/dev/pshell/config/home/extensions/JyNI.jar") 
+#sys.path.insert(0, "/Users/gobbo_a/dev/pshell/config/home/disabled/JYNI") 
+
+#sys.path.insert(0, "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7")
+#sys.path.insert(0, "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages")
+#sys.path.insert(0, "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core")
+#sys.path.insert(0, "/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages")
+print "Start"
+print sys.path
+import numpy
+
+print sys.path
+
+
+
+import datetime
+print datetime.__doc__
+import sys
+
+import numpy
\ No newline at end of file
diff --git a/script/test/TestRet.py b/script/test/TestRet.py
new file mode 100644
index 0000000..e3b7c13
--- /dev/null
+++ b/script/test/TestRet.py
@@ -0,0 +1,10 @@
+
+
+ret = []
+
+for i in range(10):    
+    ret.extend([i])
+print "X"
+
+set_return(ret)
+
diff --git a/script/test/test.scan b/script/test/test.scan
index a97407d..1da3a1b 100644
--- a/script/test/test.scan
+++ b/script/test/test.scan
@@ -1 +1 @@
-[ "Change event series", [ ], [ [ "Channel", "TESTIOC:TESTSINUS:SinCalc?monitored=true", 2, 0.1, "Enabled" ] ], false, [ ], "", 50, 0.0, 0.1, true, true, true, true, "", "", "Default", "h5", 0, null, null, "Positioner", false ]
\ No newline at end of file
+[ "Continuous", [ [ "Device", "motor", 0.0, 5.0, 0.1 ] ], [ [ "Device", "sin", 2, 0.1, "Enabled" ] ], false, [ ], "", 1, 0.0, 0.1, false, false, true, true, "", "", "Default", "h5", 0, null, null, "Positioner", false, false ]
\ No newline at end of file
diff --git a/script/test/test1.py b/script/test/test1.py
index 7f82d67..301b3f5 100755
--- a/script/test/test1.py
+++ b/script/test/test1.py
@@ -2,8 +2,8 @@
 Line Scan
 '''
 
-import ch.psi.pshell.data.LayoutSF as LayoutSF
-LayoutSF.setExperimentArguments([sin, out])
+#import ch.psi.pshell.data.LayoutSF as LayoutSF
+#LayoutSF.setExperimentArguments([sin, out])
 
 
 print get_exec_pars().path
diff --git a/script/test/test33.py b/script/test/test33.py
index c2423fa..9f30a4f 100755
--- a/script/test/test33.py
+++ b/script/test/test33.py
@@ -1,7 +1,7 @@
 start = time.time()
 
 #setup_plotting( enable_table=False)
-#set_exec_pars(accumulate = False, persist = False)
+#set_exec_pars(keep = False, save = False)
 #set_preference(Preference.PLOT_TYPES, {det.getDataMatrix():"ch.psi.pshell.plot.MatrixPlotRenderer"})
 #tscan(det.getDataMatrix(), 1000,0.00)
 
diff --git a/script/test/test_cam.scan b/script/test/test_cam.scan
new file mode 100644
index 0000000..e000e65
--- /dev/null
+++ b/script/test/test_cam.scan
@@ -0,0 +1 @@
+[ "Time series", [ ], [ [ "CamServer", "http://localhost:8889/simulation_sp intensity", 3, -1.0, "Enabled" ], [ "CamServer", "http://localhost:8889/simulation_sp?channel=intensity", 1, 0, "Enabled" ], [ "CamServer", "tcp://Alexandres-MBP.psi.ch:11112?channel=intensity", 1, 0, "Enabled" ], [ "CamServer", "tcp://Alexandres-MBP.psi.ch:11112      intensity", 1, 0, "Enabled" ] ], false, [ ], "", 5, 50.0, 0.1, true, true, false, true, "", "", "Default", "h5", 0, null, null, "Time", false, true ]
\ No newline at end of file