diff --git a/job b/job
index 1a1a0f1bcb077ec1ea384903ce3dabd2878d0660..d97e5dc18e7d287b9f2e558520861ae44c2f38da 100644
--- a/job
+++ b/job
@@ -7,4 +7,6 @@ output              = $(ProcId)/out
 error               = $(ProcId)/err
 log                 = $(ProcId)/log
 
++JobFlavour = $ENV(FLAVOUR)
+
 queue $ENV(NJOBS)
diff --git a/parallel b/parallel
index 160f63472583f6edfa060c5ac247db802a58e895..ae334794f5c4b102ca9d6b6b76463c3a724f4a08 100755
--- a/parallel
+++ b/parallel
@@ -1,6 +1,7 @@
 #!/bin/zsh
+set -e
 
-export NJOBS=2
+export NJOBS=`nproc`
 
 for i in {1..$NJOBS}
 do
diff --git a/submit b/submit
index 338c81f5d128e0991365fee264e26f2891122199..56409661fab07f845debab00db1e27995c8392cd 100755
--- a/submit
+++ b/submit
@@ -1,11 +1,22 @@
 #!/bin/zsh
+set -e
 
-#eval `/usr/bin/modulecmd zsh use -a /afs/desy.de/group/cms/modulefiles/`
-#eval `/usr/bin/modulecmd zsh load cmssw`
-#eval `scramv1 runtime -sh`
+if [[ $# == 0 ]]
+then
+    echo $0 JobFlavour
+    echo 'For FastSim, `espresso` might be enough, but use `microcentury` just to have a safe margin'
+    echo 'For FullSim, `longlunch` is certainly not enough, try `workday` or even `tomorrow`'
+    echo 'See also https://batchdocs.web.cern.ch/local/submit.html'
+    exit 1
+fi
+
+eval `/usr/bin/modulecmd zsh use -a /afs/desy.de/group/cms/modulefiles/`
+eval `/usr/bin/modulecmd zsh load cmssw`
+eval `scramv1 runtime -sh`
 
 export LD_LIBRARY_PATH_STORED=$LD_LIBRARY_PATH
-export NJOBS=1000
+export NJOBS=5000
+export FLAVOUR=$1
 
 for i in {1..$NJOBS}
 do