diff --git a/lofar-cwl/steps/LoSoTo.Interpolate.cwl b/lofar-cwl/steps/LoSoTo.Interpolate.cwl
index e087b14174d7a61f786833728307e910ca4f3993..15d5f32e542b2497ace32af767efa9418e37891b 100644
--- a/lofar-cwl/steps/LoSoTo.Interpolate.cwl
+++ b/lofar-cwl/steps/LoSoTo.Interpolate.cwl
@@ -78,7 +78,7 @@ outputs:
     format: lofar:#H5Parm
     outputBinding:
       glob: $(inputs.input_h5parm.basename)
-  - id: log
+  - id: logfile
     type: File
     outputBinding:
       glob: $(inputs.input_h5parm.basename)-losoto.log
diff --git a/lofar-cwl/steps/LoSoTo.Smooth.cwl b/lofar-cwl/steps/LoSoTo.Smooth.cwl
index 92358c32f055746c39737befa9ebc9415bab7225..d1b095a822b781c7761570ea8e0bc12a923da6e0 100644
--- a/lofar-cwl/steps/LoSoTo.Smooth.cwl
+++ b/lofar-cwl/steps/LoSoTo.Smooth.cwl
@@ -82,7 +82,7 @@ outputs:
     format: lofar:#H5Parm
     outputBinding:
       glob: $(inputs.input_h5parm.basename)
-  - id: log
+  - id: logfile
     type: File
     outputBinding:
       glob: $(inputs.input_h5parm.basename)-losoto.log
diff --git a/subworkflow/bandpass.cwl b/subworkflow/bandpass.cwl
index 5c3d573f681fa1bc3cb4f2c24b5d690e1ba31fe8..63f7dc6355cfdbe1cbf68ffe531c192b9eaf637b 100644
--- a/subworkflow/bandpass.cwl
+++ b/subworkflow/bandpass.cwl
@@ -44,10 +44,10 @@ outputs:
       - flagextend/log
       - merge/log
       - duplicateAbkp2/log
-      - smooth/log
-      - bandpass/log
-      - interp/log
-      - smoothb/log
+      - smooth/logfile
+      - bandpass/logfile
+      - interp/logfile
+      - smoothb/logfile
     type: 'File[]'
     linkMerge: merge_flattened
     'sbg:x': 2315.6181640625
@@ -188,7 +188,7 @@ steps:
         default: false
     out:
       - id: output_h5parm
-      - id: log
+      - id: logfile
     run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
     'sbg:x': 1500
     'sbg:y': -50
@@ -212,7 +212,7 @@ steps:
         default: true
     out:
       - id: output_h5parm
-      - id: log
+      - id: logfile
     run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
     'sbg:x': 1650
     'sbg:y': -50
@@ -236,7 +236,7 @@ steps:
         default: true
     out:
       - id: output_h5parm
-      - id: log
+      - id: logfile
     run: ../lofar-cwl/steps/LoSoTo.Interpolate.cwl
     'sbg:x': 1800
     'sbg:y': -50
@@ -257,7 +257,7 @@ steps:
         default: true
     out:
       - id: output_h5parm
-      - id: log
+      - id: logfile
     run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
     label: smoothb
     'sbg:x': 1950
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 764f861b72f9862f3ba27fff28ccc72eda68f462..22c1943c16b78a2cbb0dda3145fdd8bab11476be 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -198,18 +198,19 @@ outputs:
       - prep/check_Ateam_separation.png 
       - pa/inspection
       - fr/inspection
+      - bp/inspection
     type: File[]
     'sbg:x': 2000
     'sbg:y': -600
   - id: solutions
     outputSource:
-      - fr/outsolutions
+      - bp/outsolutions
     type: File
     'sbg:x': 2000
     'sbg:y': -500
   - id: msout
     outputSource:
-      - fr/msout
+      - bp/msout
     type: 'Directory[]'
     'sbg:x': 2000
     'sbg:y': 0
@@ -224,6 +225,7 @@ outputs:
       - prep/logfiles
       - pa/logfiles
       - fr/logfiles
+      - bp/logfiles
     type: 'File[]'
     linkMerge: merge_flattened
     'sbg:x': 2000
@@ -278,6 +280,8 @@ steps:
         source: max_separation_arcmin
       - id: A-Team_skymodel
         source: A-Team_skymodel
+      - id: calibrator_path_skymodel
+        source: calibrator_path_skymodel
     out:
       - id: outh5parm
       - id: logfiles
@@ -351,5 +355,47 @@ steps:
     label: FR
     'sbg:x': 700
     'sbg:y': 0
+  - id: bp
+    in:
+      - id: msin
+        source:
+          - fr/msout
+      - id: h5parm
+        source:
+          - fr/outh5parm
+      - id: refant
+        source: refant
+      - id: inh5parm_logfile
+        source:
+          - fr/outh5parm_logfile
+      - id: flagunconverged
+        source: flagunconverged
+      - id: propagatesolutions
+        source: propagatesolutions
+      - id: ampRange
+        source: ampRange
+      - id: skipInternational
+        source: skip_international
+      - id: max2interpolate
+        source: max2interpolate
+      - id: bandpass_freqresolution
+        source: bandpass_freqresolution
+      - id: avg_freqresolution
+        source: avg_freqresolution
+      - id: do_smooth
+        source: do_smooth
+      - id: insolutions
+        source: fr/outsolutions
+    out:
+      - id: msout
+      - id: outsolutions
+      - id: inspection
+      - id: logfiles
+      - id: outh5parm
+      - id: outh5parm_logfile
+    run: ./prefactor_calibrator/bp.cwl
+    label: BP
+    'sbg:x': 1000
+    'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
diff --git a/workflows/prefactor_calibrator/bp.cwl b/workflows/prefactor_calibrator/bp.cwl
index 63f1b80cd6a3c3dc376e6f54e754bd8ec2e1f311..7a7d1bc7ecb63b298dd087369705040c9054dbb9 100644
--- a/workflows/prefactor_calibrator/bp.cwl
+++ b/workflows/prefactor_calibrator/bp.cwl
@@ -202,7 +202,8 @@ steps:
       - id: soltab
         default: sol000/bandpass
       - id: axesInPlot
-        default: freq
+        default:
+          - freq
       - id: axisInTable
         default: ant
       - id: axisInCol
@@ -230,7 +231,8 @@ steps:
       - id: soltab
         default: sol000/bandpass
       - id: axesInPlot
-        default: freq
+        default:
+          - freq
       - id: axisInCol
         default: ant
       - id: plotFlag
@@ -309,6 +311,8 @@ steps:
       - id: msout
       - id: BLsmooth.log
       - id: apply_cal.log
+      - id: apply_pa.log
+      - id: apply_fr.log
       - id: calib_cal.log
       - id: outh5parm
     run: ../../subworkflow/apply_calibrate_bp.cwl
diff --git a/workflows/prefactor_calibrator/pa.cwl b/workflows/prefactor_calibrator/pa.cwl
index eef56e3e7efd7fd5200ac64ca17574301e40bd94..7ff28e55f778217567c7d4e3da33fc23ef593e49 100644
--- a/workflows/prefactor_calibrator/pa.cwl
+++ b/workflows/prefactor_calibrator/pa.cwl
@@ -361,7 +361,7 @@ steps:
     out:
       - id: msout
       - id: BLsmooth.log
-      - id: applyPA.log
+      - id: apply_cal.log
       - id: calib_cal.log
       - id: outh5parm
       - id: applybeam.log