diff --git a/lofar-cwl/steps/LoSoTo.Plot.cwl b/lofar-cwl/steps/LoSoTo.Plot.cwl
index c8533dbee135fdf76341f441aae98b270f29281e..b549648777789a28f3c01f3d4bc10688d91b0f6f 100644
--- a/lofar-cwl/steps/LoSoTo.Plot.cwl
+++ b/lofar-cwl/steps/LoSoTo.Plot.cwl
@@ -19,13 +19,25 @@ requirements:
       - entryname: $(inputs.input_h5parm.basename)
         entry: $(inputs.input_h5parm)
         writable: true
+      - entryname: run_losoto_plot.sh
+        entry: |
+          #!/bin/bash
+          set -e
+          
+          INPUT_H5PARM=$(inputs.input_h5parm.basename)
+          DO_PLOTS=$(inputs.execute)
+          if [ DO_PLOT ] do
+            losoto --verbose $INPUT_H5PARM parset.config
+          else
+            echo Skipped plotting
+          fi
 
 
 baseCommand: "losoto"
 
 arguments:
   - '--verbose'
-  - $(inputs.input_h5parm.basename)
+  - 
   - parset.config
 
 hints:
@@ -36,9 +48,13 @@ inputs:
   - id: input_h5parm
     type: File
     format: lofar:#H5Parm
+  - id: execute
+    type: boolean?
+    default: true
   - id: soltab
     type: string
     doc: "Tabs to plot"
+    
 
   - id: axesInPlot
     type: string[]?
@@ -127,7 +143,7 @@ inputs:
 
 outputs:
   - id: output_plots
-    type: File[]
+    type: File[]?
     outputBinding:
       glob: "$(inputs.prefix)*.png"
   - id: logfile
diff --git a/lofar-cwl/steps/utils.js b/lofar-cwl/steps/utils.js
index 2077e7bab63619084d2d767fd3603f464f4c319b..1df489a0fefd37e19a50496365b07bd27d490cf1 100644
--- a/lofar-cwl/steps/utils.js
+++ b/lofar-cwl/steps/utils.js
@@ -7,7 +7,8 @@ function get_losoto_config(step_name) {
     for(var field_name in inputs){
         if(field_name === 'input_h5parm' ||
            field_name === 'soltab' ||
-           field_name === 'ncpu') continue;
+           field_name === 'ncpu' || 
+           field_name === 'execute') continue;
 
         if(inputs[field_name] === null ||
            inputs[field_name] === 'null') continue;