diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index 633a06d3dffd5d1be757d3783cea09905679fa8e..44f25f1476c45e115da2723e8caf4e2ec0b88766 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -35,8 +35,8 @@ inputs:
     'sbg:y': 318.2810363769531
   - id: skymodel
     type: File
-    'sbg:x': 1428.3411865234375
-    'sbg:y': 273.64007568359375
+    'sbg:x': 1335.2567138671875
+    'sbg:y': 148.68453979492188
   - id: timeresolution
     type: float
     'sbg:x': 2021.81787109375
@@ -45,6 +45,30 @@ inputs:
     type: float
     'sbg:x': 1999.5889892578125
     'sbg:y': 170.7563934326172
+  - id: demix_timestep
+    type: int
+    'sbg:x': 1371.962646484375
+    'sbg:y': 307.4278259277344
+  - id: demix_freqstep
+    type: int
+    'sbg:x': 1465.0855712890625
+    'sbg:y': 450.8930358886719
+  - id: demix_baseline
+    type: string
+    'sbg:x': 1585.496826171875
+    'sbg:y': 588.0062866210938
+  - id: target_source
+    type: string
+    'sbg:x': 1439.47314453125
+    'sbg:y': -325.6144104003906
+  - id: ntimechunk
+    type: int
+    'sbg:x': 1149.4033203125
+    'sbg:y': 349.2409362792969
+  - id: subtract_sources
+    type: 'string[]?'
+    'sbg:x': 1257.9327392578125
+    'sbg:y': -290.095703125
 outputs:
   - id: msout
     outputSource:
@@ -175,8 +199,21 @@ steps:
           - flagamp/augmented_steps
       - id: step_name
         default: demixer
+      - id: baseline
+        source: demix_baseline
+      - id: demixtimestep
+        source: demix_timestep
+      - id: demixfreqstep
+        source: demix_freqstep
+      - id: ntimechunk
+        source: ntimechunk
       - id: skymodel
         source: skymodel
+      - id: subtractsources
+        source:
+          - subtract_sources
+      - id: targetsource
+        source: target_source
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.DemixerStepGenerator.cwl
@@ -241,5 +278,3 @@ steps:
     'sbg:y': -55.93873977661133
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: StepInputExpressionRequirement
-  - class: InlineJavascriptRequirement