diff --git a/docs/SUT_ondemand.doc b/docs/SUT_ondemand.doc
index 4537cfbdcf056174f850bb1e3bf8fe2acb476c5a..d0983e4cc11d39d0ad382411711183b353e6f8f1 100644
Binary files a/docs/SUT_ondemand.doc and b/docs/SUT_ondemand.doc differ
diff --git a/docs/SUT_ondemand.pdf b/docs/SUT_ondemand.pdf
index 8bbb03f49ebf4b89bd0947fe370fdfebc5e009ce..8b087b61801a2d3b3d9282fe090a0a2e85d7755c 100644
Binary files a/docs/SUT_ondemand.pdf and b/docs/SUT_ondemand.pdf differ
diff --git a/python/CONTROL.temp b/python/CONTROL.temp
deleted file mode 100644
index 78d64a5fa4f4dcd59a68d728bbb47e10b6d78ccc..0000000000000000000000000000000000000000
--- a/python/CONTROL.temp
+++ /dev/null
@@ -1,40 +0,0 @@
-DAY1
-DAY2
-DTIME 3
-TYPE AN FC FC FC FC FC FC FC FC FC FC FC AN FC FC FC FC FC FC FC FC FC FC FC
-TIME 00 00 00 00 00 00 00 00 00 00 00 00 12 12 12 12 12 12 12 12 12 12 12 12
-STEP 00 01 02 03 04 05 06 07 08 09 10 11 00 01 02 03 04 05 06 07 08 09 10 11
-ACCTYPE FC
-ACCTIME 00/12
-ACCMAXSTEP 12
-CLASS EI
-STREAM OPER
-NUMBER OFF
-EXPVER 1
-GRID 5000  
-LEFT -15000
-LOWER 30000
-UPPER 75000
-RIGHT 45000
-LEVEL 60
-LEVELIST 55/to/60
-RESOL 63
-GAUSS 1
-ACCURACY 16
-OMEGA 0
-OMEGADIFF 0
-ETA 0
-ETADIFF 0
-DPDETA 1
-SMOOTH 0
-FORMAT GRIB1
-ADDPAR 186/187/188/235/139/39
-PREFIX EI
-ECSTORAGE 0
-ECTRANS 1
-ECFSDIR ectmp:/${USER}/econdemand/
-MAILFAIL ${USER} 
-MAILOPS ${USER}
-GRIB2FLEXPART 0
-EOF
-
diff --git a/python/FlexpartTools.py b/python/FlexpartTools.py
index 67e8a74a3f01f98e4cb3876aa455d2b5eebc7ec3..fbb2935f9f023bff10f8ae8b2b6eb7877a0e3d30 100644
--- a/python/FlexpartTools.py
+++ b/python/FlexpartTools.py
@@ -196,7 +196,7 @@ def interpret_args_and_control(*args,**kwargs):
         c.request=args.request
 
     if c.request != '0':
-        marsfile = os.path.join(c.inputdir, 'mars_request.csv')
+        marsfile = os.path.join(c.inputdir, 'mars_requests.csv')
         if os.path.isfile(marsfile):
             os.remove(marsfile)
 
@@ -577,6 +577,11 @@ class Control:
 
             if not hasattr(self,'request'):
                 self.request='0'
+            elif self.request != 0:
+                marsfile = os.path.join(self.inputdir,
+                                        'mars_requests.csv')
+                if os.path.isfile(marsfile):
+                    silentremove(marsfile)
 
         return
     def __str__(self):
@@ -674,11 +679,12 @@ class MARSretrieval:
         '''
 
         # Get all class attributes and their values as a dictionary
-        attrs = vars(self)
+        attrs = vars(self).copy()
         del attrs['server']
+        del attrs['public']
 
         # open a file to store all requests to
-        with open(os.path.join(inputdir, 'mars_request.csv'), 'a') as f:
+        with open(os.path.join(inputdir, 'mars_requests.csv'), 'a') as f:
             f.write(str(request_number) + ', ')
             f.write(', '.join(str(attrs[key])
                         for key in sorted(attrs.iterkeys())))
@@ -1474,8 +1480,8 @@ class EIFlexpart:
                 key_vals=[]
                 for k in l:
                     key_vals.append(str(k))
-
-            index_vals.append(key_vals)
+    
+                index_vals.append(key_vals)
 
 
         valsdict={}
diff --git a/python/getMARSdata.py b/python/getMARSdata.py
index 4aedb838451bc7407d2d2d6273e1eb27a95939f9..4e40ed5ee240b028982a447300d5a88f73ca39c6 100755
Binary files a/python/getMARSdata.py and b/python/getMARSdata.py differ