diff --git a/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/Makefile.am b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
index 6f7f447716a3bf645825cc39c9c538d57f4e948a..ce53ac3eddc4e0fdd8fb60f8c46f0ac55755a860 100644
--- a/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
+++ b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
@@ -24,4 +24,9 @@ WH_Correlator.cc		\
 AH_BGLProcessing.cc		
 #WH_Collect.cc
 
+configfilesdir=$(bindir)
+configfiles_DATA	=	\
+TFC_BGLProcessing.machinefile	\
+TFC_BGLProcessing.log_prop	
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..74ba1990dfbc677166a90c79bc26579bebf6d288
--- /dev/null
+++ b/CEP/Demo/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile
@@ -0,0 +1,7 @@
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
diff --git a/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/Makefile.am b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/Makefile.am
index 9e8a97190e6333b3fb667cdd0fca585d7707bc09..2b2a9defd1501b20d9faf28899079d96f12840a3 100644
--- a/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/Makefile.am
+++ b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/Makefile.am
@@ -25,4 +25,9 @@ WH_SBCollect.cc			\
 AH_InputSection.cc		\
 BufferController.cc	
 
+configfilesdir=$(bindir)
+configfiles_DATA		=	\
+TFC_InputSection.machinefile		\
+TFC_InputSection.log_prop		
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..7f9e2a4f55a42cd11963a824d82eb5bd071f9835
--- /dev/null
+++ b/CEP/Demo/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile
@@ -0,0 +1,11 @@
+# if you change this file, you should also change the hosts in TFlopCorrelator.cfg
+lofar11
+lofar12
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
+
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/Makefile.am
index 6f7f447716a3bf645825cc39c9c538d57f4e948a..ce53ac3eddc4e0fdd8fb60f8c46f0ac55755a860 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/Makefile.am
@@ -24,4 +24,9 @@ WH_Correlator.cc		\
 AH_BGLProcessing.cc		
 #WH_Collect.cc
 
+configfilesdir=$(bindir)
+configfiles_DATA	=	\
+TFC_BGLProcessing.machinefile	\
+TFC_BGLProcessing.log_prop	
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.log_prop b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.machinefile b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..74ba1990dfbc677166a90c79bc26579bebf6d288
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Attic/TFC_BGLProcessing.machinefile
@@ -0,0 +1,7 @@
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
index 6f7f447716a3bf645825cc39c9c538d57f4e948a..ce53ac3eddc4e0fdd8fb60f8c46f0ac55755a860 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/Makefile.am
@@ -24,4 +24,9 @@ WH_Correlator.cc		\
 AH_BGLProcessing.cc		
 #WH_Collect.cc
 
+configfilesdir=$(bindir)
+configfiles_DATA	=	\
+TFC_BGLProcessing.machinefile	\
+TFC_BGLProcessing.log_prop	
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..74ba1990dfbc677166a90c79bc26579bebf6d288
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/src/TFC_BGLProcessing.machinefile
@@ -0,0 +1,7 @@
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/Makefile.am
index 9e8a97190e6333b3fb667cdd0fca585d7707bc09..2b2a9defd1501b20d9faf28899079d96f12840a3 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/Makefile.am
@@ -25,4 +25,9 @@ WH_SBCollect.cc			\
 AH_InputSection.cc		\
 BufferController.cc	
 
+configfilesdir=$(bindir)
+configfiles_DATA		=	\
+TFC_InputSection.machinefile		\
+TFC_InputSection.log_prop		
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.log_prop b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.machinefile b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..7f9e2a4f55a42cd11963a824d82eb5bd071f9835
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Attic/TFC_InputSection.machinefile
@@ -0,0 +1,11 @@
+# if you change this file, you should also change the hosts in TFlopCorrelator.cfg
+lofar11
+lofar12
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
+
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Makefile.am b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Makefile.am
index 9e8a97190e6333b3fb667cdd0fca585d7707bc09..2b2a9defd1501b20d9faf28899079d96f12840a3 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Makefile.am
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/Makefile.am
@@ -25,4 +25,9 @@ WH_SBCollect.cc			\
 AH_InputSection.cc		\
 BufferController.cc	
 
+configfilesdir=$(bindir)
+configfiles_DATA		=	\
+TFC_InputSection.machinefile		\
+TFC_InputSection.log_prop		
+
 include $(lofar_sharedir)/Makefile.common
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop
new file mode 100644
index 0000000000000000000000000000000000000000..c8288c9751c7b475e3d48b75a94ce6a8c2018978
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.log_prop
@@ -0,0 +1,14 @@
+# Configure the rootLogger
+log4cplus.rootLogger=INFO, STDOUT
+log4cplus.LCS.Common=INFO, STDOUT
+log4cplus.logger.TRC=TRACE, NOLOG
+log4cplus.logger.TRC.additivity=false
+log4cplus.additivity=false
+# Define the STDOUT appender
+log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
+log4cplus.appender.STDOUT.Threshhold=TRACE2
+log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
+log4cplus.appender.STDOUT.layout.ConversionPattern=%-5p [%x]%c{3} - %m%n
+log4cplus.appender.STDOUT.logToStdErr=false
+log4cplus.appender.STDOUT.ImmediateFlush=true
+log4cplus.appender.NOLOG=log4cplus::NullAppender
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile
new file mode 100644
index 0000000000000000000000000000000000000000..7f9e2a4f55a42cd11963a824d82eb5bd071f9835
--- /dev/null
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/TFC_InputSection.machinefile
@@ -0,0 +1,11 @@
+# if you change this file, you should also change the hosts in TFlopCorrelator.cfg
+lofar11
+lofar12
+lofar13
+lofar14
+lofar4
+lofar5
+lofar6
+lofar7
+lofar8
+