diff --git a/checkEnvironment.sh b/checkEnvironment.sh
deleted file mode 100644
index 8e2d1eca..00000000
--- a/checkEnvironment.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-HOST=$1
-
-if [ -f ./environment_checks.txt ]
-then
-	rm ./environment_checks.txt
-fi
-
-ENVIRONMENT_PARAMETERS=""
-TMPDIR=""
-GROUP=""
-if [ "${HOST}" == "zinc-finger.gcc.rug.nl" ]
-then
-    	ENVIRONMENT_PARAMETERS="parameters_zinc-finger.csv"
-        TMPDIR="tmp05"
-elif [ "${HOST}" == "leucine-zipper.gcc.rug.nl" ]
-then
-    	ENVIRONMENT_PARAMETERS="parameters_leucine-zipper.csv"
-        TMPDIR="tmp06"
-elif [ "${HOST}" == "calculon" ]
-then
-    	ENVIRONMENT_PARAMETERS="parameters_calculon.csv"
-        TMPDIR="tmp04"
-else
-    	echo "unknown host: tmpTest01 will be the tmpdir"
-    	ENVIRONMENT_PARAMETERS="parameters_host.csv"
-        TMPDIR="tmpTest01"
-fi
-
-THISDIR=$(pwd)
-if [[ $THISDIR == *"/groups/umcg-gaf/"* ]]
-then
-	GROUP="umcg-gaf" 
-elif [[ $THISDIR == *"/groups/umcg-gd/"* ]] 
-then
-	GROUP="umcg-gd"
-elif [[ $THISDIR == *"/groups/umcg-testgroup/"* ]] 
-then
-	GROUP="umcg-testgroup"
-else
-	echo "this is not a known group, please run only in umcg-gd or umcg-gaf group"
-fi
-
-printf "${ENVIRONMENT_PARAMETERS}\t${TMPDIR}\t${GROUP}" > ./environment_checks.txt
diff --git a/generate_template.sh b/generate_template.sh
index 3a5c1b5f..e7394ab0 100755
--- a/generate_template.sh
+++ b/generate_template.sh
@@ -3,12 +3,11 @@
 module load NGS_DNA/3.2.4
 module list 
 HOST=$(hostname)
-##Running script for checking the environment variables
-sh ${EBROOTNGS_DNA}/checkEnvironment.sh ${HOST}
+thisDir=$(pwd)
 
-ENVIRONMENT_PARAMETERS=$(awk '{print $1}' ./environment_checks.txt)
-TMPDIR=$(awk '{print $2}' ./environment_checks.txt)
-GROUP=$(awk '{print $3}' ./environment_checks.txt)
+ENVIRONMENT_PARAMETERS="parameters_${HOST%%.*}.csv"
+TMPDIR=$(cd ../../ && ${thisDir} )
+GROUP=$(cd ../../../ && ${thisDir} )
 
 PROJECT=projectXX
 WORKDIR="/groups/${GROUP}/${TMPDIR}"
@@ -38,6 +37,11 @@ then
     	rm -rf ${WORKDIR}/generatedscripts/${PROJECT}/out.csv
 fi
 
+echo "tmpName,${TMPDIR}" > ${WORKDIR}/generatedscripts/${PROJECT}/tmpdir_parameters.csv 
+
+perl ${EBROOTNGS_DNA}/convertParametersGitToMolgenis.pl ${WORKDIR}/generatedscripts/${PROJECT}/tmpdir_parameters.csv > \
+${WORKDIR}/generatedscripts/${PROJECT}/tmpdir_parameters_converted.csv
+
 perl ${EBROOTNGS_DNA}/convertParametersGitToMolgenis.pl ${EBROOTNGS_DNA}/parameters.csv > \
 ${WORKDIR}/generatedscripts/${PROJECT}/out.csv
 
@@ -51,6 +55,7 @@ sh $EBROOTMOLGENISMINCOMPUTE/molgenis_compute.sh \
 -p ${WORKDIR}/generatedscripts/${PROJECT}/out.csv \
 -p ${WORKDIR}/generatedscripts/${PROJECT}/environment_parameters.csv \
 -p ${WORKDIR}/generatedscripts/${PROJECT}/group_parameters.csv \
+-p ${WORKDIR}/generatedscripts/${PROJECT}/tmpdir_parameters_converted.csv \
 -p ${EBROOTNGS_DNA}/batchIDList${BATCH}.csv \
 -p ${WORKDIR}/generatedscripts/${PROJECT}/${PROJECT}.csv \
 -w ${EBROOTNGS_DNA}/create_in-house_ngs_projects_workflow.csv \
@@ -62,6 +67,7 @@ group_parameters=${WORKDIR}/generatedscripts/${PROJECT}/group_parameters.csv;\
 groupname=${GROUP};\
 ngsversion=$(module list | grep -o -P 'NGS_DNA(.+)');\
 environment_parameters=${WORKDIR}/generatedscripts/${PROJECT}/environment_parameters.csv;\
+tmpdir_parameters=${WORKDIR}/generatedscripts/${PROJECT}/tmpdir_parameters_converted.csv;\
 batchIDList=${EBROOTNGS_DNA}/batchIDList${BATCH}.csv;\
 worksheet=${WORKDIR}/generatedscripts/${PROJECT}/${PROJECT}.csv" \
 -weave \
diff --git a/parameters_calculon.csv b/parameters_calculon.csv
index 0cc8bb44..9edb2048 100644
--- a/parameters_calculon.csv
+++ b/parameters_calculon.csv
@@ -1,5 +1,4 @@
 queue,ll
-tmpName,tmp04
 prmName,prm02
 root,/
 appsDir,${root}/apps/
diff --git a/parameters_leela.csv b/parameters_leela.csv
new file mode 100644
index 00000000..9edb2048
--- /dev/null
+++ b/parameters_leela.csv
@@ -0,0 +1,5 @@
+queue,ll
+prmName,prm02
+root,/
+appsDir,${root}/apps/
+toolChain,goolf-1.7.20
diff --git a/parameters_leucine-zipper.csv b/parameters_leucine-zipper.csv
index 51b2151f..19393368 100644
--- a/parameters_leucine-zipper.csv
+++ b/parameters_leucine-zipper.csv
@@ -1,5 +1,4 @@
 queue,lz-compute
-tmpName,tmp06
 prmName,prm02
 root,/
 appsDir,${root}/apps/
diff --git a/parameters_zinc-finger.csv b/parameters_zinc-finger.csv
index 03730876..9edb2048 100644
--- a/parameters_zinc-finger.csv
+++ b/parameters_zinc-finger.csv
@@ -1,5 +1,4 @@
 queue,ll
-tmpName,tmp05
 prmName,prm02
 root,/
 appsDir,${root}/apps/