diff --git a/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py b/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py
index efd28a1951ff914a603ad8d59034f44711d4815a..abd6d489a1bdd734ba57a597ffa7d1170f03fb35 100644
--- a/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/calibration_pipeline.py
@@ -190,6 +190,10 @@ class calibration_pipeline(control):
                 input_data_mapfile,
                 data_start_time=vdsinfo['start_time'],
                 data_end_time=vdsinfo['end_time'],
+                demix_always=
+                    py_parset.getStringVector('PreProcessing.demix_always'),
+                demix_if_needed=
+                    py_parset.getStringVector('PreProcessing.demix_if_needed'),
                 parset=ndppp_parset)['mapfile']
 
         # *********************************************************************
diff --git a/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py b/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
index 1a30f32d1974b467e9cb002d1064e0f63d1a5507..6a9ca3014ba844ea428ef28c66c968fa474065d4 100755
--- a/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/msss_calibrator_pipeline.py
@@ -235,11 +235,15 @@ class msss_calibrator_pipeline(control):
                 data_mapfile,
                 data_start_time=vdsinfo['start_time'],
                 data_end_time=vdsinfo['end_time'],
+                demix_always=
+                    py_parset.getStringVector('PreProcessing.demix_always'),
+                demix_if_needed=
+                    py_parset.getStringVector('PreProcessing.demix_if_needed'),
                 parset=ndppp_parset,
                 parmdb_mapfile=parmdb_mapfile,
                 sourcedb_mapfile=sourcedb_mapfile)['mapfile']
 
-        demix_mapfile = dppp_mapfile
+#        demix_mapfile = dppp_mapfile
 
 #        # Old Demixing method: performed now by ndppp
 #        # Demix the relevant A-team sources
diff --git a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
index e3674e949a7e833fb5dbb21ff5273773b13be22b..a3c8b49da1e9810d63fda8d97127dc92f4b3a4d2 100755
--- a/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/msss_target_pipeline.py
@@ -335,6 +335,10 @@ class msss_target_pipeline(control):
                 data_mapfile,
                 data_start_time=vdsinfo['start_time'],
                 data_end_time=vdsinfo['end_time'],
+                demix_always=
+                    py_parset.getStringVector('PreProcessing.demix_always'),
+                demix_if_needed=
+                    py_parset.getStringVector('PreProcessing.demix_if_needed'),
                 parset=ndppp_parset,
                 parmdb_mapfile=parmdb_mapfile,
                 sourcedb_mapfile=sourcedb_mapfile,
diff --git a/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py b/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py
index cd482ba9070f01d30f5ef2c80ff8f658a621311a..96335a15e06148a9cdb6ae8c2f994580021fee57 100644
--- a/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py
+++ b/CEP/Pipeline/recipes/sip/bin/preprocessing_pipeline.py
@@ -188,6 +188,10 @@ class preprocessing_pipeline(control):
                 (input_data_mapfile, output_data_mapfile),
                 data_start_time=vdsinfo['start_time'],
                 data_end_time=vdsinfo['end_time'],
+                demix_always=
+                    py_parset.getStringVector('PreProcessing.demix_always'),
+                demix_if_needed=
+                    py_parset.getStringVector('PreProcessing.demix_if_needed'),
                 parset=ndppp_parset)
 
         # *********************************************************************
diff --git a/CEP/Pipeline/recipes/sip/tasks.cfg.in b/CEP/Pipeline/recipes/sip/tasks.cfg.in
index f0022552dcfc1177f4bcbd3a4ea68dc822bb1ab8..a0180c3a984c9d8b2c6b625192fc8b2d94d2f828 100644
--- a/CEP/Pipeline/recipes/sip/tasks.cfg.in
+++ b/CEP/Pipeline/recipes/sip/tasks.cfg.in
@@ -4,8 +4,6 @@ executable = %(lofarroot)s/bin/NDPPP
 dry_run = False
 mapfile = %(runtime_directory)s/%(job_name)s/mapfiles/dppp.mapfile
 parset = %(runtime_directory)s/%(job_name)s/parsets/NDPPP.parset
-#demix_always =
-#demix_if_needed = CasA
 nproc = 1
 nthreads = 8
 clobber = False