diff --git a/scripts/runPlum.sh b/scripts/runPlum.sh
index ea3a8dd4ceaa5e557e1774515d849cbf45e8bde3..b88adcf0c4e52a72302c8bca399c77f7afa892a8 100755
--- a/scripts/runPlum.sh
+++ b/scripts/runPlum.sh
@@ -4,7 +4,7 @@
 #$ -l h_vmem=8G 
 #$ -R y
 
-while getopts ":s:b:p:" opt; do
+while getopts ":s:b:p:r:" opt; do
   case ${opt} in
     b )
       build=${OPTARG}
@@ -15,6 +15,9 @@ while getopts ":s:b:p:" opt; do
     p )
       prune=${OPTARG}
       ;;
+    r )
+      r_summary=${OPTARG}
+      ;;
   esac
 done
 
@@ -28,10 +31,34 @@ fi
 build="${build:-.}"
 echo BUILD $build
 
-PATH=$PATH:/exports/csce/eddie/geos/groups/LURG/models/gams/gams24.7_linux_x64_64_sfx
+if [[ -e /exports/csce/eddie/geos/groups/LURG/models ]]; then
+  echo Edinburgh
+  . /etc/profile.d/modules.sh
+  module load java
+  GAMSPATH=/exports/csce/eddie/geos/groups/LURG/models/gams/gams24.7_linux_x64_64_sfx
+  PLUMPATH=/exports/csce/eddie/geos/groups/LURG/models/PLUM
+fi
+
+if [[ $HNAME =~ "kea" ]]; then
+  module load app/gams/24.3.1
+  module load app/jdk/1.8.0 
+  module list
+  GAMSPATH=/app/gams-24.3.1/gams24.3_linux_x64_64_sfx
+  PLUMPATH=$PWD
+fi
+
+if [[ $HNAME =~ "fh1" ]]; then
+  module load devel/jdk/1.8.0_102
+  module list
+  #kind of hardwired to my GAMS installation
+  GAMSPATH=~ku7787/software/gams/gams24.6_linux_x64_64_sfx
+  PLUMPATH=$PROJECT/PLUM
+fi
+
+PATH=$PATH:$GAMSPATH
 export PATH
 
-classesdir=/exports/csce/eddie/geos/groups/LURG/models/PLUM/$build/classes
+classesdir=$PLUMPATH/$build/classes
 if [ ! -d "$classesdir" ]; then
     echo $classesdir does not exist. Stopping!
     exit -1
@@ -40,24 +67,32 @@ fi
 buildver="$(cat $classesdir/buildver)"
 echo buildversion: $buildver
 
-. /etc/profile.d/modules.sh
-module load java
+scenariodir=$PLUMPATH/output/$scenario
+if [ ! -d "$scenariodir" ]; then
+    echo Directory for scenario $scenariodir does not exist. Stopping!
+    exit -1
+fi
 
 echo "starting"
-runcmd="java -Xmx1G -XX:+PrintGC -classpath /exports/csce/eddie/geos/groups/LURG/models/gams/gams24.7_linux_x64_64_sfx/apifiles/Java/api/GAMSJavaAPI.jar:$classesdir -DBUILDVER=$buildver -DCONFIG_FILE=/exports/csce/eddie/geos/groups/LURG/models/PLUM/output/$scenario/config.properties ac.ed.lurg.ModelMain"
+runcmd="java -Xmx1G -XX:+PrintGC -classpath $GAMSPATH/apifiles/Java/api/GAMSJavaAPI.jar:$classesdir -DBUILDVER=$buildver -DCONFIG_FILE=$scenariodir/config.properties ac.ed.lurg.ModelMain"
 echo $runcmd
 $runcmd
 echo "finished"
 
-module load R
-R < /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/summariseLandUseOneSim.R  --no-save --args $1
+if [[ $r_summary =~ "y" ]]; then
+   echo "Running R summarising script"
+   module load R
+   R < $PLUMPATH/plumv2/scripts/summariseLandUseOneSim.R  --no-save --args $scenario
+else
+   echo "Not running R summarising script"
+fi
 
-if [[ $prune =~ "n" ]]; then
-	echo "Not pruning outputs"
+if [[ $prune =~ "y" ]]; then
+   echo "Pruning outputs, to save disk space"
+   cd $scenariodir
+   tar -zcvf forLpjg.tar.gz 2*
+   $PLUMPATH/plumv2/scripts/pruneOutputs.sh $scenariodir
 else
-	echo "Pruning outputs, to save disk space"
-	cd /exports/csce/eddie/geos/groups/LURG/models/PLUM/output/$1
-	tar -zcvf forLpjg.tar.gz 2*
-	/exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/pruneOutputs.sh /exports/csce/eddie/geos/groups/LURG/models/PLUM/output/$1
+   echo "Not pruning outputs"
 fi
 
diff --git a/scripts/scheduleScenarios.sh b/scripts/scheduleScenarios.sh
index 724339c29dcc73e2f4d6eac51d6ff28991df764b..1c0b198229c0517aa7482852735ae4b738aeef37 100755
--- a/scripts/scheduleScenarios.sh
+++ b/scripts/scheduleScenarios.sh
@@ -29,8 +29,8 @@ do
 
      jobName="$(echo $ensemble | sed 's,\.\/,,' | sed 's,\/,_,g')_$scenario"
 
-     echo "qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh -s $ensemble/$scenario"
-     qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh -s $ensemble/$scenario
+     echo "qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh -s $ensemble/$scenario" -r y -p y
+     qsub -hold_jid calib -N $jobName /exports/csce/eddie/geos/groups/LURG/models/PLUM/plumv2/scripts/runPlum.sh -s $ensemble/$scenario -r y -p y
   fi
 done < $filename