diff --git a/src/run-policy/submit-pol-job b/src/run-policy/submit-pol-job
index 25d1a56e5184e187d17b6a70b377ffc5e69c9393..86cd0545b17e67cde81ee6254b7f3522e3edf507 100755
--- a/src/run-policy/submit-pol-job
+++ b/src/run-policy/submit-pol-job
@@ -13,7 +13,6 @@ time="24:00:00"
 partition="amd-hdr100,medium"
 outdir="/data/rc/gpfs-policy/data"
 policy="./policy-def/list-path-external"
-policy_dirplus="./policy-def/list-path-dirplus"
 outfile=""
 
 ############################################################
@@ -37,7 +36,7 @@ Wraps the  run-mmpol.sh script for applying a policy file. Must be run directly
 as root or via the run-submit-pol-job.py script. The default policy file is
 ./policy/list-path-external
 
-Usage: $0 [ -h ] [ -o | --outdir ] [ -f | --outfile ] [ --with-dirs ] 
+Usage: $0 [ -h ] [ -o | --outdir ] [ -f | --outfile ] [ -P | --policy ] 
           [ -N | --nodes ] [ -c | --cores ] [ -p | --partition ] 
           [ -t | --time ] [ -m | --mem ]
           device
@@ -57,7 +56,7 @@ Path:
     -f|--outfile        Name of the policy output file
 
 Policy Options:
-    --with-dirs         Change to ./policy/list-path-dirplus (default: False)
+    -P|--policy         Path to policy file to apply to the given GPFS device
 
 sbatch options:
     -N|--nodes          Number of nodes to run the job on (default: 1)
@@ -70,7 +69,7 @@ EOF
 exit 0
 }
 
-args=$(getopt -a -o ho:f:N:c:p:t:m: --long help,outdir:,outfile:,with-dirs,nodes:,cores:,partition:,time:,mem: -- "$@")
+args=$(getopt -a -o ho:f:P:N:c:p:t:m: --long help,outdir:,outfile:,policy:,nodes:,cores:,partition:,time:,mem: -- "$@")
 
 if [[ $? -gt 0 ]]; then
   usage
@@ -81,15 +80,15 @@ eval set -- ${args}
 while :
 do
   case $1 in
-    -h | --help)        help                       ;;
-    -o | --outdir)      outdir=$2                  ; shift 2 ;;
-    -f | --outfile)     outfile=$2                 ; shift 2 ;;
-    --with-dirs)        policy="${policy_dirplus}" ; shift 1 ;;
-    -N | --nodes)       nodes=$2                   ; shift 2 ;;
-    -c | --cores)       cores=$2                   ; shift 2 ;;
-    -p | --partition)   partition=$2               ; shift 2 ;;
-    -t | --time)        time=$2                    ; shift 2 ;;
-    -m | --mem-per-cpu) mem_per_cpu=$2             ; shift 2 ;;
+    -h | --help)        help            ;;
+    -o | --outdir)      outdir=$2       ; shift 2 ;;
+    -f | --outfile)     outfile=$2      ; shift 2 ;;
+    -P | --policy)      policy=$2       ; shift 2 ;;
+    -N | --nodes)       nodes=$2        ; shift 2 ;;
+    -c | --cores)       cores=$2        ; shift 2 ;;
+    -p | --partition)   partition=$2    ; shift 2 ;;
+    -t | --time)        time=$2         ; shift 2 ;;
+    -m | --mem-per-cpu) mem_per_cpu=$2  ; shift 2 ;;
     --) shift; break ;;
     *) >&2 echo Unsupported option: $1
        usage ;;