diff --git a/scripts/createHindScenarios.sh b/scripts/createHindScenarios.sh
index e8ec63943627423d9c6a5c64df2556dc8712b78a..3507479fdef4d1deef527b3669164a54fa5498cd 100755
--- a/scripts/createHindScenarios.sh
+++ b/scripts/createHindScenarios.sh
@@ -23,9 +23,15 @@ do
   if [ -z "$header" ]; then
      header=( "${array[@]}" )
   else
-     scenario="${array[0]}"
-     scenario_dir=$output_dir/$scenario
-     echo "$scenario in $scenario_dir"
+     ensemble="${array[0]}"
+     scenario="${array[1]}"
+     scenario_dir=$output_dir/$ensemble/$scenario
+     echo "$scenario for $ensemble in $scenario_dir"
+
+     if [ ! -d "$output_dir/$ensemble" ]; then
+         mkdir $output_dir/$ensemble
+     fi
+
      if [ ! -d "$scenario_dir" ]; then
         mkdir $scenario_dir
         mkdir $scenario_dir/calib
diff --git a/scripts/runCalibAndPlum.sh b/scripts/runCalibAndPlum.sh
index 8f3b8f89523dff48dbc56d9f56664143973a6d07..b157b8db3a3246e69c8edb8e5a45b42fcd31dc67 100755
--- a/scripts/runCalibAndPlum.sh
+++ b/scripts/runCalibAndPlum.sh
@@ -5,8 +5,10 @@ if [ $# -ne 1 ]; then
 	exit 0
 fi
 
-jobName=${1//\/}c # remove slash from path as qsub doesnt allow it
+jobName=${1//\//_}c # remove slash from path as qsub doesnt allow it
+jobName=${jobName/hind1970/h_}
 echo $jobName
+calibJob=${jobName}_c
 
-qsub -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1/calib
-qsub -hold_jid $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1
+qsub -N $calibJob /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1/calib
+qsub -N $jobName -hold_jid $calibJob /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh $1