diff --git a/scripts/run_prun.sh b/scripts/run_prun.sh
index c9e7705..30086cf 100644
--- a/scripts/run_prun.sh
+++ b/scripts/run_prun.sh
@@ -1,53 +1,55 @@
 #!/bin/bash
 
 ##
 ## @file run_prun.sh
 ##
 ## Description of the script file
 ##
 ## @author Jakub Cuth <Jakub.Cuth@cern.ch>
 ## @date 2016-04-26
 
 
 PRUN(){
 
     jobname=$1
     shift
     njobs=$1
     shift
     arguments=$*
 
     if [[ $target =~ compile ]]
     then
 
         echo NOT TESTED $target && exit 6
  prun \
+ --osMatching \
  --bexec "chmod 777 compile_grid.sh; ./compile_grid.sh  $DYTURBOVERSION;" \
  --exec "chmod 777 run_grid.sh; ./run_grid.sh %RNDM:0 ${arguments} ;" \
  --extFile dyturbo-${DYTURBOVERSION}.tar.gz \
  --nJobs $njobs \
  --outDS ${CERNGROUP}.${CERNUSER}.${jobname}_${gridv}/ \
  --outputs results.root,results.txt \
  --tmpDir /tmp/${CERNUSER} \
  --nGBPerJob=MAX \
  --destSE=ANALY_CERN_SLC6 \
  --rootVer=$ROOTVERSION --cmtConfig=$CMTVERSION 
 
     else
 
 prun \
+--osMatching \
 --exec "chmod 777 run_grid.sh; ./run_grid.sh %RNDM:0 ${arguments} ;" \
 --nJobs $njobs \
 --maxFileSize=25000000 \
 --outDS ${CERNGROUP}.${CERNUSER}.${jobname}_${gridv}/ \
 --outputs results.root,results.txt \
 --noCompile \
 --tmpDir /tmp/${CERNUSER} \
 --nGBPerJob=MAX \
 --destSE=ANALY_CERN_SLC6 \
 --rootVer=$ROOTVERSION --cmtConfig=$CMTVERSION $OFFICIAL
 
     fi
 }
 
 
diff --git a/scripts/submit_jobs.sh b/scripts/submit_jobs.sh
index a77bb7b..265dce0 100755
--- a/scripts/submit_jobs.sh
+++ b/scripts/submit_jobs.sh
@@ -1,544 +1,545 @@
 #!/bin/bash
 
 ##
 ## @file submit_jobs.sh
 ##
 ## Description of the script file
 ##
 ## @author Jakub Cuth <Jakub.Cuth@cern.ch>
 ## @date 2016-06-16
 
 #set -x
 
 help(){
     #echo " Help is on TODO list :), But you can read parse_input function to check possibilities"
 
     echo "
 USAGE: ./scripts/submit_jobs.sh TARGET OPTIONS --seeds N [--griduser USER --gridvoms VOMS]
 
 TARGETS : (Need to specify one of those)
     --local         Prepare for run locally.
     --grid          Prepare grid submission directory (compilation on local)
     --mogon         Prepare standard scripts for mogon (Mainz cluster).
     --lxbatch       Prepare standard scripts for lxbatch (CERN LXPLUS batch system).
     --help          Print this help and die.
 
 OPTIONS :
                [default]          {available options}    Description
 
     --infile   [input/default.in] {input file path}      Common input file with all settings.
     --proc     			  {z0,wp,wm}             Set the process (can be a comma separated list)
     --pdfset   			  {LHAPDFname}           PDF set from LHAPDF (can be a comma separated list)
     --order    			  {0,1,2}                Set order of the calculation 0:LL+LO 1: NLL+NLO 2: NNLL+NNLO
     --pdfvar   [0]                {int or all or array}  Set member number or run all
     --term     [ALL]              {ALL,BORN,CT,VJ,       Terms of the calculation
                                    VJREAL,VJVIRT}        
     --gparam   
     --kmuren   
     --kmufac   
     --seeds                       {int or range or list} Mandatory: Set range (for batch) or Njobs (grid)
     --griduser                    {GRID username}        Mandatory if the target is grid
     --gridvoms                    {voms settings}        To run with group privileges.
     --mbins    			  {bins,mlow,mhigh}      Invariant mass bins and range
     --yes      			  			 Submit jobs without asking confirmation
 
     "
 
 
 }
 
 main(){
     parse_input $*
     clear_files
     #
     submit_jobs
     #
     if [[ $target =~ lxplus|mogon|localrun  ]]
     then
         ask_submit
         $DRYRUN submit_jobs
     elif [[ $target =~ grid  ]]
     then
         echo
         echo " Your GRID username: $cernuser"
         echo " Your GRID group: $cerngroup"
         echo " Your GRID voms: $gridofficial"
         ask_submit
         # check panda voms proxy
         if ! voms-proxy-info || ! which prun
         then
             echo "Please setup panda and voms : "
             echo "setupATLAS "
             echo "lsetup rucio panda "
             echo "voms-proxy-init -voms atlas -valid 96:00"
             exit 7
         fi
         if [[ $DRYRUN =~ echo ]] 
         then
             echo "To submit to grid just type:"
         fi
         for gridpdf in $pdflist
         do
             $DRYRUN cd $dyturbo_project/GRID_$gridpdf
             $DRYRUN ./subm.sh
         done
     else
         echo "UKNOWN TARGET: $target"
     fi
 }
 
 parse_input(){
     target=unset
     proclist=unset
     order=unset
     termlist=ALL
     pdflist=unset
 
     #pdfvarlist=all
     #pdfvarlist="0 1 2 3"
     pdfvarlist=0
 
     infile=input/default.in
 
     #seedlist=100,201 # run 100 and 201
     #seedlist=100-201 # run form 100 to 201
     #seedlist=800    # run from 1 to 800
     seedlist=unset
 
     voms=unset
     cernuser=unset
 
     version=unset
 
     while [[ $# > 0 ]]
     do
         key=$1
         #echo debug key $key
         case $key in
             # TARGET
             --local)
                 target=localrun
                 ;;
             --grid)
                 target=grid
                 ;;
             --mogon)
                 target=mogon
                 ;;
             --lxbatch)
                 target=lxbatch
                 ;;
             --proc)
                 proclist="`echo $2|sed 's|,| |g'`"
                 shift
                 ;;
             --order)
                 order=$2
                 shift
                 ;;
             --term)
                 termlist="`echo $2|sed 's|,| |g'`"
                 shift
                 ;;
             --mbins)
                 mbins=$2
                 shift
                 ;;
             --pdfset)
                 pdflist="`echo $2|sed 's|,| |g'`"
                 shift
                 ;;
             --pdfvar)
                 pdfvarlist="`echo $2|sed 's|,| |g'`"
                 shift
                 ;;
             --infile)
                 infile=$2
                 shift
                 ;;
             --seeds)
                 seedlist=$2
                 shift
                 ;;
             --griduser)
                 cernuser=$2
                 shift
                 ;;
             --voms)
                 voms=$2
                 shift
                 ;;
             --version)
                 version=$2
                 shift
                 ;;
             --gparam)
                 gparam=$2
                 shift
                 ;;
             --kmuren)
                 kmuren=$2
                 shift
                 ;;
             --kmufac)
                 kmufac=$2
                 shift
                 ;;
             --yes)
                 YES=YES
                 ;;
             #  HELP and OTHER
             -h|--help)
                 help
                 exit 0
                 ;;
             *)
                 echo Uknown option: $key
                 help
                 exit 3
                 ;;
         esac
         shift
     done
 }
 
 submit_jobs(){
     program=dyturbo
     random_seed=seed
     # check infile
     if ! ls $infile > /dev/null
     then
         echo " Input file not found pleae set correct with '--infile name'  "
         exit 5
     fi
     # check seed
     if [[ $seedlist == unset ]]
     then
         echo " Seed argument is mandatory please set '--seeds [range/list]'"
         exit 5
     fi
     if [[ $target =~ grid ]]
     then
         [[ $cernuser == unset ]] \
             && echo " GRID usernaname is mandatory please set '--griduser NAME'" \
             && echo " You can also specify your voms by '--voms VOMS'" \
             &&   exit 6
     #else # not grid
         #[[ $seedlist =~ -|, ]]  || seedlist=1-$seedlist
     fi
     if [[ $order == unset ]]
     then
-	order=`grep order $infile | cut -d\# -f1 | cut -d= -f2 | xargs`
+	order=`grep order $infile | sed  "/fixedorder_only/ d" | cut -d\# -f1 | cut -d= -f2 | xargs`
     fi
     # check order term
     [[ $order == 1 ]] && [[ $termlist =~ VJREAL|VJVIRT ]] && echo "WRONG ORDER $order TO TERM $termlist" && return 3
 
     if [[ $proclist == unset ]]
     then
 	procid=`grep proc $infile | cut -d\# -f1 | cut -d= -f2 | xargs`
 	if [[ $procid == 1 ]]
 	then proclist=wp
 	elif [[ $procid == 2 ]]
 	then proclist=wm
 	elif [[ $procid == 3 ]]
 	then proclist=z0
 	fi
     fi
 	
     if [[ $pdflist == unset ]]
     then
 	pdflist=`grep LHAPDFset $infile | cut -d\# -f1 | cut -d= -f2 | xargs`
     fi
 
     # loops, loops and loops
     for pdfset in $pdflist 
     do
         if [[ $target =~ grid ]]
         then
             cubacores=0
             prepare_tarbal
         fi
         for process in $proclist
         do
             for terms in $termlist
             do
                 variations=$pdfvarlist
                 [[ $pdfvarlist =~ all ]] && variations=`get_PDF_Nmembers $pdfset`
                 for variation in $variations
                 do
                     qtregion=`echo o${order}t${terms} | sed "s/\.//g;s/ //g"`
                     prepare_script
                     [[ $target =~ mogon|lxbatch|localrun ]] &&  submit_job
                     [[ $target =~ grid ]]  && submit_job2grid
                 done # variation
             done #term
         done #proc
         [[ $target =~ grid ]] && finalize_grid_submission
     done #pdfsets
 }
 
 #directories 
 dyturbo_project=`pwd -P`
+echo " Your dyturboproject is : $dyturbo_project"
 batch_script_dir=$dyturbo_project/scripts/batch_scripts
 queue=atlasshort
 batch_template=$dyturbo_project/scripts/run_on_batch_tmpl.sh
 
 # this goes away
 in_files_dir=unset
 cubacores=unset
 job_name=unset
 in_file=unset
 sh_file=unset
 process=unset
 random_seed=unset
 loqtbin=unset
 terms=ALL
 hiqtbin=unset
 loybin=unset
 hiybin=unset
 sample=unset
 member=unset
 program=unset
 fiducial=unset
 detfiducial=0
 makelepcuts=false
 tarbalfile=unset
 seedlist=unset
 
 prepare_script(){
     # temporary add lhapdf to path
     PATH=$PATH:lhapdf6/bin
     if ! lhapdf-config --prefix > /dev/null
     then
         echo "Cannot reach lhapdf-config. Please setup the PATH to LHAPDF"
         exit 3
     fi
     result_dir=$dyturbo_project/results_${process}_${pdfset}_${terms}
     mkdir -p $batch_script_dir
     mkdir -p $result_dir
     #
     sample=${pdfset}_${variation}
     [[ ! $gparam == "" ]] && sample=${sample}_g$gparam
     [[ ! $kmuren == "" ]] && qtregion=R${kmuren/./}$qtregion
     [[ ! $kmufac == "" ]] && qtregion=F${kmufac/./}$qtregion
     job_name=${program}_${process}_${sample}_${qtregion}_${random_seed}
     sh_file=$batch_script_dir/$job_name.sh
     echo $job_name $seedlist
     #
     #mbins=32,40,200
     #[[ $process =~ z0 ]] && mbins=10,66,116
     # arguments
     arguments="input.in --proc $process --pdfset $pdfset --pdfvar $variation --order $order --term $terms"
     [[ ! $gparam == "" ]] && arguments="$arguments --gparam $gparam"
     [[ ! $mbins == "" ]] && arguments="$arguments  --mbins $mbins"
     [[ $target =~ lxbatch|mogon|localrun ]] && arguments=$arguments" --seed \$LSB_JOBINDEX "
     # make sure we make some noise on grid
     #[[ $target =~ mogon ]] && arguments=$arguments" --verbose "
     # job queue
     nprocessors=1
     cubacores=`grep cubacores $infile | cut -d\# -f1 | cut -d= -f2 | xargs`
     [[ $cubacores != "" ]] && [ $cubacores -gt 0 ] && nprocessors=$cubacores
     #walltime=100:00
     #queue=atlaslong
     walltime=5:00
     queue=atlasshort
     if [[ $program =~ dyres ]] || [[ $variation =~ all ]] || [[ $terms =~ [23]P ]]
     then
         walltime=20:00
         queue=atlaslong
     fi
     [[ $target =~ lxbatch ]] && queue=8nh && walltime=8:00
     #a prepare script
     cp $batch_template tmp
     sed -i "s|JOBNAME|$job_name|g               " tmp
     sed -i "s|SEEDLIST|$seedlist|g              " tmp
     sed -i "s|OUTDIR|$result_dir|g              " tmp
     sed -i "s|SETQUEUE|$queue|g                 " tmp
     sed -i "s|SETWALLTIME|$walltime|g           " tmp
     sed -i "s|DYTURBOROOTDIR|$dyturbo_project|g " tmp
     sed -i "s|DYTURBOINPUTFILE|$dyturbo_project/$infile|g       " tmp
     sed -i "s|SETNPROCESSORS|$nprocessors|g     " tmp
     sed -i "s|SETPROGARGUMETS|$arguments|g     " tmp
     sed -i "s|SETLHAPDFLIB|`lhapdf-config --libdir`/lib|g           " tmp
     sed -i "s|SETLHAPDFDATA|`lhapdf-config --datadir`|g " tmp
     [[ $target =~ lxbatch ]] && sed -i "s|^#BSUB -R.*$||g      "  tmp
     [[ $target =~ lxbatch ]] && sed -i "s|^#BSUB -app.*$|#BSUB -M 2000000|g " tmp
     [[ $target =~ lxbatch ]] && sed -i "s|/jobdir/|/pool/|g      "  tmp
     mv tmp $sh_file
     chmod +x $sh_file
 }
 
 submit_job(){
     if [[ $target == localrun ]]
     then
         # pickup random number
         export LSB_JOBINDEX=1
         $DRYRUN $sh_file
     else
         if [ -a $result_dir/$job_name.root ]
         then
             echo "Output already exists, skipping submission."
         else
             $DRYRUN bsub < $sh_file
         fi
     fi
 }
 
 clear_files(){
     echo -n "Clearing setup files .. "
     if [[ $(bjobs -o name 2> /dev/null | grep dyturbo) ]] 
     then
         echo -n "There are jobs running, skip clearing .. "
         #rm -f scripts/batch_scripts/*.sh
         #rm -f scripts/infiles/*.in
     else
         rm -f scripts/batch_scripts/*.sh
         #rm -f scripts/infiles/*.in
     fi
     rm -f scripts/infiles/*.tar
     rm -f scripts/infiles/*.tar.gz
     rm -f scripts/cmd_list
     echo "Done"
 }
 
 submit_job2grid(){
     echo "PRUN $job_name $seedlist $arguments" >> scripts/grid_submit.cmd
 }
 
 prepare_tarbal(){
     griddir=GRID_$pdfset
     [[ $version == unset ]] && gridv=v`date +%s` || gridv=$version
     DYTURBOVERSION=`grep PACKAGE_VERSION config.h | cut -d\" -f2`
     # check you have cvmfs rootconfig
     rootprefix=`root-config --prefix`
     #if [[ $rootprefix =~ /cvmfs/*.cern.ch/.*/[56].[0-9][0-9].[0-9][0-9]-(x86_64|i686)-*-gcc ]]
     if [[ $rootprefix =~ /cvmfs/atlas.cern.ch/.*/[56].[0-9][0-9].[0-9][0-9]-(x86_64|i686)-slc[56]-gcc ]]
     then
         ROOTVERSION=`basename $rootprefix | cut -d- -f1`
         CMTVERSION=`basename $rootprefix | cut -d- -f2-`
     else
         echo "Current ROOT path is '$rootprefix'"
         echo "Your root setup is not comming from cvmfs, please do 'lsetup root'."
         exit 4
     fi
     # prepare executables or tarbal
     if [[ $target =~ compile ]]
     then
         echo "NOT TESTED $target" && exit 6
         echo "Making a tarbal.. please wait"
         if ! make dist > /dev/null
         then
             echo "Compilation problem.. Try to 'make install'. I am exiting."
             exit 3
         fi
     else
         echo "Making a executable... please wait"
         if ! make install > /dev/null
         then
             echo "Compilation problem.. Try to 'make install'. I am exiting."
             exit 3
         fi
         # test the lhapdf
         PATH=$PATH:lhapdf6/bin
         if ! lhapdf-config --prefix > /dev/null
         then
             echo "Cannot reach lhapdf-config. Please setup the PATH to LHAPDF"
             exit 3
         fi
     fi
     # official mode
     gridofficial=" " # space at the end
     cerngroup=user
     if [[ $voms != unset ]]
     then
         gridofficial=" --official --voms $voms"
         cerngroup=group
     fi
     # prepare PRUN command
     cat  scripts/run_prun.sh              >  scripts/grid_submit.cmd
     echo ""                               >> scripts/grid_submit.cmd
     echo "gridv=$gridv"                   >> scripts/grid_submit.cmd
     echo "CERNUSER=$cernuser"             >> scripts/grid_submit.cmd
     echo "CERNGROUP=$cerngroup"           >> scripts/grid_submit.cmd
     echo "OFFICIAL=\"$gridofficial\""     >> scripts/grid_submit.cmd
     echo "DYTURBOVERSION=$DYTURBOVERSION" >> scripts/grid_submit.cmd
     echo "ROOTVERSION=$ROOTVERSION"       >> scripts/grid_submit.cmd
     echo "CMTVERSION=$CMTVERSION"         >> scripts/grid_submit.cmd
     echo "target=$target"                 >> scripts/grid_submit.cmd
     echo ""                               >> scripts/grid_submit.cmd
     echo "# Setup rucio and panda "       >> scripts/grid_submit.cmd
     echo "# lsetup rucio panda"           >> scripts/grid_submit.cmd
     echo "# voms-proxy-init -voms atlas -valid 96:00" >> scripts/grid_submit.cmd
 }
 
 finalize_grid_submission(){
     CP="rsync -a"
     #echo "compressing... $tarbalfile"
     #gzip $tarbalfile
     if [[ $target =~ compile ]]
     then
         # put source code
         $CP dyturbo-${DYTURBOVERSION}.tar.gz $griddir/
     else
         # prepare folders
         mkdir -p $griddir/bin
         mkdir -p $griddir/lib
         mkdir -p $griddir/LHAPDF
         # copy exec
         $CP bin/* $griddir/bin/
 #        $CP chaplin-*/lib/*.so* $griddir/lib/
 #        $CP chaplin-*/lib/*.la  $griddir/lib/
         $CP lib/*.so* $griddir/lib/
         $CP lib/*.la  $griddir/lib/
         $CP `lhapdf-config --libdir`/libLHAPDF.so $griddir/lib/
         # copy pdfset
         lhapdfdir=$LHAPDF_DATA_PATH #`lhapdf-config --datadir`
         $CP $lhapdfdir/$pdfset $griddir/LHAPDF
         $CP $lhapdfdir/lhapdf.conf $griddir/LHAPDF
         $CP $lhapdfdir/pdfsets.index $griddir/LHAPDF
     fi
     # submision scripts
     cat scripts/grid_submit.cmd > $griddir/subm.sh
     chmod +x $griddir/subm.sh
     # on-site scripts
     sed "s|SETTARGET|$target|g" scripts/compile_grid.sh > $griddir/compile_grid.sh
     sed "s|SETTARGET|$target|g" scripts/run_grid.sh     > $griddir/run_grid.sh
     $CP scripts/setup.sh $griddir/setup.sh
     # add inputfile
     $CP input/default.in $griddir/
     $CP $infile $griddir/input.in
     #
     #ls -hla --color=auto $griddir
     #echo
     #echo "Go to GRID folder 'cd GRID' edit subm.sh (change user name, role) and run it './subm.sh' "
 }
 
 get_PDF_Nmembers(){
     pdfname=$1
     pdfdir=lhapdf6/share/LHAPDF
     [ -d $pdfdir  ] || pdfdir=`lhapdf-config --datadir`
     nmem=`ls -1 $pdfdir/$pdfname/$pdfname*.dat | wc -l`
     nmem=$((nmem-1))
     seq 0 $nmem
 }
 
 DRYRUN=echo 
 ask_submit(){
     if [[ ! $YES == "" ]]
     then
             DRYRUN=
     else
         read -p "Do you want to submit jobs ? " -n 1 -r
         echo    # (optional) move to a new line
         if [[ $REPLY =~ ^[Yy]$ ]]
         then
             DRYRUN=
         fi
     fi
 }
 
 
 ## run MAIN
 main $*