diff --git a/bob/bio/base/script/grid_search.py b/bob/bio/base/script/grid_search.py
index 1599ff2e80cc0ddd871cccc21e2dd33446ae6393..975843f5987e56bf036b5732ee4d2d4bcdc57874 100755
--- a/bob/bio/base/script/grid_search.py
+++ b/bob/bio/base/script/grid_search.py
@@ -90,9 +90,6 @@ def command_line_options(command_line_parameters):
   parser.add_argument('-G', '--gridtk-database-directory', metavar='DIR', default = 'grid_db',
       help = 'Directory where the submitted.sql3 files should be written into (will create sub-directories on need)')
 
-  parser.add_argument('-w', '--write-commands',
-      help = '(optional) The file name where to write the calls into (will not write the dependencies, though)')
-
   parser.add_argument('-q', '--dry-run', action='store_true',
       help = 'Just write the commands to console and mimic dependencies, but do not execute the commands')
 
@@ -246,6 +243,9 @@ def directory_parameters(directories):
   # - scoring
   parameters += ['--score-directories', _join_dirs(4, 'nonorm'), _join_dirs(4, 'ztnorm')]
 
+  # - Experiment.info
+  parameters += ['--experiment-info-file', _join_dirs(4, 'Experiment.info')]
+
   # the sub-dorectory, given on command line
   parameters += ['--sub-directory', args.sub_directory]
 
@@ -298,18 +298,6 @@ def execute_dependent_task(command_line, directories, dependency_level):
   if args.parameters is not None:
     command_line += args.parameters[1:]
 
-  # write the command to file?
-  if args.write_commands:
-    index = command_line.index('--gridtk-database-file')
-    command_file = os.path.join(os.path.dirname(command_line[index+1]), args.write_commands)
-    bob.io.base.create_directories_safe(os.path.dirname(command_file))
-    with open(command_file, 'w') as f:
-      f.write('bin/verify.py ')
-      for p in command_line:
-        f.write(p + ' ')
-      f.close()
-    logger.info("Wrote command line into file '%s'", command_file)
-
   # extract dependencies
   global job_ids
   dependencies = []
diff --git a/bob/bio/base/test/test_scripts.py b/bob/bio/base/test/test_scripts.py
index 0226f6de17bba1a9cf449d48801b316f651995dd..c7ac7681cfdd3360e04ac24a702bdd2149341f5b 100644
--- a/bob/bio/base/test/test_scripts.py
+++ b/bob/bio/base/test/test_scripts.py
@@ -581,6 +581,12 @@ def test_grid_search():
     assert bob.bio.base.script.grid_search.task_count == 6
     # but no job in the grid
     assert bob.bio.base.script.grid_search.job_count == 0
+    # assert that the Experiment.info files are at the right location
+    for p in (1,2):
+      for f in (1,2):
+        for s in (1,2):
+          if 2*p>f:
+            assert os.path.exists(os.path.join(test_dir, "test_grid_search/Default/P%d/F%d/S%d/Experiment.info"%(p,f,s)))
 
     # now, in the grid...
     parameters = [
@@ -591,7 +597,6 @@ def test_grid_search():
         '-G', test_dir,
         '-T', test_dir,
         '-R', test_dir,
-        '-w', 'Job.txt',
         '-g', 'grid',
         '-v',
         '--', '--dry-run',
@@ -613,7 +618,6 @@ def test_grid_search():
         '-G', test_dir,
         '-T', test_dir,
         '-R', test_dir,
-        '-w', 'Job.txt',
         '-l', '4', '-L', '-1', '-v',
         '--', '--imports', 'bob.io.image',
         '--dry-run',
diff --git a/version.txt b/version.txt
index 29dae8dfcc3252179d0d6b059345e7e1c40dbf85..1737b85d147c88ebf73602c5a1747315e7714805 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.2.2b0
\ No newline at end of file
+3.3.0b0