diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml
new file mode 100644
index 000000000..b667edfd0
--- /dev/null
+++ b/CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:scalar name="Temperature"/>
+    <data:scalar name="Heat-Flux"/>
+
+    <mesh name="Fluid-Mesh">
+        <use-data name="Temperature"/>
+        <use-data name="Heat-Flux"/>
+    </mesh>
+
+    <mesh name="Solid-Mesh">
+        <use-data name="Temperature"/>
+        <use-data name="Heat-Flux"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh" provide="yes"/>
+        <read-data name="Heat-Flux" mesh="Fluid-Mesh"/>
+        <write-data name="Temperature" mesh="Fluid-Mesh"/>
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Fluid-Mesh" from="Fluid"/>
+        <use-mesh name="Solid-Mesh" provide="yes"/>
+        <read-data name="Temperature" mesh="Solid-Mesh"/>
+        <write-data name="Heat-Flux" mesh="Solid-Mesh"/>
+        <mapping:nearest-neighbor direction="read" from="Fluid-Mesh" to="Solid-Mesh" constraint="consistent" timing="initial"/>
+        <mapping:nearest-neighbor direction="write" from="Solid-Mesh" to="Fluid-Mesh" constraint="consistent" timing="initial"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid"/>
+
+    <coupling-scheme:serial-implicit>
+        <timestep-length value="0.01"/>
+        <max-time value="1"/>
+        <max-iterations value="200"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Temperature" mesh="Fluid-Mesh" from="Fluid" to="Solid"/>
+        <exchange data="Heat-Flux" mesh="Fluid-Mesh" from="Solid" to="Fluid"/>
+        <relative-convergence-measure limit="1.0e-6" data="Temperature" mesh="Fluid-Mesh"/>
+        <extrapolation-order value="0"/>
+        <acceleration:IQN-ILS>
+            <data mesh="Fluid-Mesh" name="Heat-Flux" />
+            <initial-relaxation value="0.01" />
+            <max-used-iterations value="80" />
+            <timesteps-reused value="10" />
+            <filter type="QR1" limit="1e-8" />
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml
index e9be123fb..445ebb39e 100644
--- a/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml
+++ b/CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml
@@ -40,7 +40,7 @@
     <write-data name="Heat-Flux" mesh="Nutils-Mesh-CC" />
   </participant>    
 
-  <m2n:sockets from="OpenFOAM" to="Nutils" exchange-directory=".." distribution-type="gather-scatter"/>
+  <m2n:sockets from="OpenFOAM" to="Nutils" exchange-directory=".."/>
 
   <coupling-scheme:serial-implicit>
     <timestep-length value="0.01"/>
@@ -50,10 +50,10 @@
     <exchange data="Temperature" mesh="OpenFOAM-Mesh" from="OpenFOAM" to="Nutils"/>
     <exchange data="Heat-Flux" mesh="OpenFOAM-Mesh" from="Nutils" to="OpenFOAM"/>
     <relative-convergence-measure limit="1.0e-5" data="Temperature" mesh="OpenFOAM-Mesh"/>
-    <post-processing:aitken>
+    <acceleration:aitken>
       <data mesh="OpenFOAM-Mesh" name="Heat-Flux" />
       <initial-relaxation value="0.01" />
-    </post-processing:aitken>
+    </acceleration:aitken>
   </coupling-scheme:serial-implicit>
 
   </solver-interface>
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun
index bd058b839..ffa213537 100755
--- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun
+++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun
@@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then
     exit
 fi
 
-# Link to the precice-config for the serial run
-echo "Setting up the preCICE configuration file for a serial simulation"
-ln -s -f precice-config_serial.xml precice-config.xml
-
 # Participant 1: Inner-Fluid
 Participant1="Inner-Fluid"
 Solver1="buoyantSimpleFoam"
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel
index a0659948f..42aaa6a6b 100755
--- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel
+++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel
@@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then
     exit
 fi
 
-# Link to the precice-config for the parallel run
-echo "Setting up the preCICE configuration file for a parallel simulation"
-ln -s -f precice-config_parallel.xml precice-config.xml
-
 # Participant 1: inner-fluid
 Participant1="Inner-Fluid"
 Solver1="buoyantSimpleFoam"
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml
new file mode 100644
index 000000000..481294013
--- /dev/null
+++ b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config.xml
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<precice-configuration>
+  <log>
+      <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+  </log>
+  <solver-interface dimensions="3">
+    <data:scalar name="Heat-Transfer-Coefficient-Solid"/>
+    <data:scalar name="Sink-Temperature-Solid"/>
+    <data:scalar name="Heat-Transfer-Coefficient-Inner-Fluid"/>
+    <data:scalar name="Sink-Temperature-Inner-Fluid"/>
+    <data:scalar name="Heat-Transfer-Coefficient-Outer-Fluid"/>
+    <data:scalar name="Sink-Temperature-Outer-Fluid"/>
+    <mesh name="Solid-to-Inner-Fluid">
+      <use-data name="Sink-Temperature-Solid"/>
+      <use-data name="Heat-Transfer-Coefficient-Solid"/>
+      <use-data name="Sink-Temperature-Inner-Fluid"/>
+      <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
+    </mesh>
+    <mesh name="Solid-to-Outer-Fluid">
+      <use-data name="Sink-Temperature-Solid"/>
+      <use-data name="Heat-Transfer-Coefficient-Solid"/>
+      <use-data name="Sink-Temperature-Outer-Fluid"/>
+      <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
+    </mesh>
+    <mesh name="Inner-Fluid-to-Solid">
+      <use-data name="Sink-Temperature-Inner-Fluid"/>
+      <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
+      <use-data name="Sink-Temperature-Solid"/>
+      <use-data name="Heat-Transfer-Coefficient-Solid"/>
+    </mesh>
+    <mesh name="Outer-Fluid-to-Solid">
+      <use-data name="Sink-Temperature-Outer-Fluid"/>
+      <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
+      <use-data name="Sink-Temperature-Solid"/>
+      <use-data name="Heat-Transfer-Coefficient-Solid"/>
+    </mesh>
+    <participant name="Solid">
+      <use-mesh name="Solid-to-Inner-Fluid" provide="yes"/>
+      <use-mesh name="Inner-Fluid-to-Solid" from="Inner-Fluid"/>
+      <write-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Solid"/>
+      <write-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
+      <read-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Inner-Fluid"/>
+      <read-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
+      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Inner-Fluid" from="Inner-Fluid-to-Solid"/>
+      <use-mesh name="Solid-to-Outer-Fluid" provide="yes"/>
+      <use-mesh name="Outer-Fluid-to-Solid" from="Outer-Fluid"/>
+      <write-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Solid"/>
+      <write-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
+      <read-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Outer-Fluid"/>
+      <read-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
+      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Outer-Fluid" from="Outer-Fluid-to-Solid"/>
+    </participant>
+    <participant name="Inner-Fluid">
+      <use-mesh name="Inner-Fluid-to-Solid" provide="yes"/>
+      <use-mesh name="Solid-to-Inner-Fluid" from="Solid"/>
+      <write-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Inner-Fluid"/>
+      <write-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
+      <read-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
+      <read-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
+      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Inner-Fluid-to-Solid" from="Solid-to-Inner-Fluid"/>
+    </participant>
+    <participant name="Outer-Fluid">
+      <use-mesh name="Outer-Fluid-to-Solid" provide="yes"/>
+      <use-mesh name="Solid-to-Outer-Fluid" from="Solid"/>
+      <write-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Outer-Fluid"/>
+      <write-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
+      <read-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
+      <read-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
+      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Outer-Fluid-to-Solid" from="Solid-to-Outer-Fluid"/>
+    </participant>
+    <m2n:sockets to="Inner-Fluid" from="Solid" exchange-directory="." />
+    <coupling-scheme:parallel-explicit>
+      <timestep-length value="1"/>
+      <max-time value="500"/>
+      <participants first="Solid" second="Inner-Fluid"/>
+      <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
+      <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
+      <exchange data="Sink-Temperature-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
+      <exchange data="Heat-Transfer-Coefficient-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
+    </coupling-scheme:parallel-explicit>
+    <m2n:sockets to="Outer-Fluid" from="Solid" exchange-directory="." />
+    <coupling-scheme:parallel-explicit>
+      <timestep-length value="1"/>
+      <max-time value="500"/>
+      <participants first="Solid" second="Outer-Fluid"/>
+      <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
+      <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
+      <exchange data="Sink-Temperature-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
+      <exchange data="Heat-Transfer-Coefficient-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
+    </coupling-scheme:parallel-explicit>
+  </solver-interface>
+</precice-configuration>
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml
deleted file mode 100644
index d43350abe..000000000
--- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_parallel.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<precice-configuration>
-  <log>
-      <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-  </log>
-  <solver-interface dimensions="3">
-    <data:scalar name="Heat-Transfer-Coefficient-Solid"/>
-    <data:scalar name="Sink-Temperature-Solid"/>
-    <data:scalar name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-    <data:scalar name="Sink-Temperature-Inner-Fluid"/>
-    <data:scalar name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-    <data:scalar name="Sink-Temperature-Outer-Fluid"/>
-    <mesh name="Solid-to-Inner-Fluid">
-      <use-data name="Sink-Temperature-Solid"/>
-      <use-data name="Heat-Transfer-Coefficient-Solid"/>
-      <use-data name="Sink-Temperature-Inner-Fluid"/>
-      <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-    </mesh>
-    <mesh name="Solid-to-Outer-Fluid">
-      <use-data name="Sink-Temperature-Solid"/>
-      <use-data name="Heat-Transfer-Coefficient-Solid"/>
-      <use-data name="Sink-Temperature-Outer-Fluid"/>
-      <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-    </mesh>
-    <mesh name="Inner-Fluid-to-Solid">
-      <use-data name="Sink-Temperature-Inner-Fluid"/>
-      <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-      <use-data name="Sink-Temperature-Solid"/>
-      <use-data name="Heat-Transfer-Coefficient-Solid"/>
-    </mesh>
-    <mesh name="Outer-Fluid-to-Solid">
-      <use-data name="Sink-Temperature-Outer-Fluid"/>
-      <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-      <use-data name="Sink-Temperature-Solid"/>
-      <use-data name="Heat-Transfer-Coefficient-Solid"/>
-    </mesh>
-    <participant name="Solid">
-      <use-mesh name="Solid-to-Inner-Fluid" provide="yes"/>
-      <use-mesh name="Inner-Fluid-to-Solid" from="Inner-Fluid"/>
-      <write-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Solid"/>
-      <write-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
-      <read-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Inner-Fluid"/>
-      <read-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Inner-Fluid" from="Inner-Fluid-to-Solid"/>
-      <use-mesh name="Solid-to-Outer-Fluid" provide="yes"/>
-      <use-mesh name="Outer-Fluid-to-Solid" from="Outer-Fluid"/>
-      <write-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Solid"/>
-      <write-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
-      <read-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Outer-Fluid"/>
-      <read-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Outer-Fluid" from="Outer-Fluid-to-Solid"/>
-    </participant>
-    <participant name="Inner-Fluid">
-      <master:mpi-single/>
-      <use-mesh name="Inner-Fluid-to-Solid" provide="yes"/>
-      <use-mesh name="Solid-to-Inner-Fluid" from="Solid"/>
-      <write-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Inner-Fluid"/>
-      <write-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-      <read-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
-      <read-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
-      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Inner-Fluid-to-Solid" from="Solid-to-Inner-Fluid"/>
-    </participant>
-    <participant name="Outer-Fluid">
-      <master:mpi-single/>
-      <use-mesh name="Outer-Fluid-to-Solid" provide="yes"/>
-      <use-mesh name="Solid-to-Outer-Fluid" from="Solid"/>
-      <write-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Outer-Fluid"/>
-      <write-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-      <read-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
-      <read-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
-      <mapping:nearest-neighbor constraint="consistent" direction="read" to="Outer-Fluid-to-Solid" from="Solid-to-Outer-Fluid"/>
-    </participant>
-    <m2n:sockets to="Inner-Fluid" from="Solid" exchange-directory="." distribution-type="gather-scatter"/>
-    <coupling-scheme:parallel-explicit>
-      <timestep-length value="1"/>
-      <max-time value="500"/>
-      <participants first="Solid" second="Inner-Fluid"/>
-      <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
-      <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
-      <exchange data="Sink-Temperature-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
-      <exchange data="Heat-Transfer-Coefficient-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
-    </coupling-scheme:parallel-explicit>
-    <m2n:sockets to="Outer-Fluid" from="Solid" exchange-directory="." distribution-type="gather-scatter"/>
-    <coupling-scheme:parallel-explicit>
-      <timestep-length value="1"/>
-      <max-time value="500"/>
-      <participants first="Solid" second="Outer-Fluid"/>
-      <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
-      <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
-      <exchange data="Sink-Temperature-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
-      <exchange data="Heat-Transfer-Coefficient-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
-    </coupling-scheme:parallel-explicit>
-  </solver-interface>
-</precice-configuration>
diff --git a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml b/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml
deleted file mode 100644
index a18292c43..000000000
--- a/CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/precice-config_serial.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<precice-configuration>
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-    <solver-interface dimensions="3">
-        <data:scalar name="Heat-Transfer-Coefficient-Solid"/>
-        <data:scalar name="Sink-Temperature-Solid"/>
-        <data:scalar name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-        <data:scalar name="Sink-Temperature-Inner-Fluid"/>
-        <data:scalar name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-        <data:scalar name="Sink-Temperature-Outer-Fluid"/>
-        <mesh name="Solid-to-Inner-Fluid">
-            <use-data name="Sink-Temperature-Solid"/>
-            <use-data name="Heat-Transfer-Coefficient-Solid"/>
-            <use-data name="Sink-Temperature-Inner-Fluid"/>
-            <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-        </mesh>
-        <mesh name="Solid-to-Outer-Fluid">
-            <use-data name="Sink-Temperature-Solid"/>
-            <use-data name="Heat-Transfer-Coefficient-Solid"/>
-            <use-data name="Sink-Temperature-Outer-Fluid"/>
-            <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-        </mesh>
-        <mesh name="Inner-Fluid-to-Solid">
-            <use-data name="Sink-Temperature-Inner-Fluid"/>
-            <use-data name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-            <use-data name="Sink-Temperature-Solid"/>
-            <use-data name="Heat-Transfer-Coefficient-Solid"/>
-        </mesh>
-        <mesh name="Outer-Fluid-to-Solid">
-            <use-data name="Sink-Temperature-Outer-Fluid"/>
-            <use-data name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-            <use-data name="Sink-Temperature-Solid"/>
-            <use-data name="Heat-Transfer-Coefficient-Solid"/>
-        </mesh>
-        <participant name="Solid">
-            <use-mesh name="Solid-to-Inner-Fluid" provide="yes"/>
-            <use-mesh name="Inner-Fluid-to-Solid" from="Inner-Fluid"/>
-            <write-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Solid"/>
-            <write-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
-            <read-data mesh="Solid-to-Inner-Fluid" name="Sink-Temperature-Inner-Fluid"/>
-            <read-data mesh="Solid-to-Inner-Fluid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-            <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Inner-Fluid" from="Inner-Fluid-to-Solid"/>
-            <use-mesh name="Solid-to-Outer-Fluid" provide="yes"/>
-            <use-mesh name="Outer-Fluid-to-Solid" from="Outer-Fluid"/>
-            <write-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Solid"/>
-            <write-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Solid"/>
-            <read-data mesh="Solid-to-Outer-Fluid" name="Sink-Temperature-Outer-Fluid"/>
-            <read-data mesh="Solid-to-Outer-Fluid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-            <mapping:nearest-neighbor constraint="consistent" direction="read" to="Solid-to-Outer-Fluid" from="Outer-Fluid-to-Solid"/>
-        </participant>
-        <participant name="Inner-Fluid">
-            <use-mesh name="Inner-Fluid-to-Solid" provide="yes"/>
-            <use-mesh name="Solid-to-Inner-Fluid" from="Solid"/>
-            <write-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Inner-Fluid"/>
-            <write-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Inner-Fluid"/>
-            <read-data mesh="Inner-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
-            <read-data mesh="Inner-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
-            <mapping:nearest-neighbor constraint="consistent" direction="read" to="Inner-Fluid-to-Solid" from="Solid-to-Inner-Fluid"/>
-        </participant>
-        <participant name="Outer-Fluid">
-            <use-mesh name="Outer-Fluid-to-Solid" provide="yes"/>
-            <use-mesh name="Solid-to-Outer-Fluid" from="Solid"/>
-            <write-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Outer-Fluid"/>
-            <write-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Outer-Fluid"/>
-            <read-data mesh="Outer-Fluid-to-Solid" name="Sink-Temperature-Solid"/>
-            <read-data mesh="Outer-Fluid-to-Solid" name="Heat-Transfer-Coefficient-Solid"/>
-            <mapping:nearest-neighbor constraint="consistent" direction="read" to="Outer-Fluid-to-Solid" from="Solid-to-Outer-Fluid"/>
-        </participant>
-        <m2n:sockets to="Inner-Fluid" from="Solid" exchange-directory="." distribution-type="gather-scatter"/>
-        <coupling-scheme:parallel-explicit>
-            <timestep-length value="1"/>
-            <max-time value="500"/>
-            <participants first="Solid" second="Inner-Fluid"/>
-            <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
-            <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Inner-Fluid" from="Solid" to="Inner-Fluid" initialize="yes"/>
-            <exchange data="Sink-Temperature-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
-            <exchange data="Heat-Transfer-Coefficient-Inner-Fluid" mesh="Inner-Fluid-to-Solid" from="Inner-Fluid" to="Solid" initialize="yes"/>
-        </coupling-scheme:parallel-explicit>
-        <m2n:sockets to="Outer-Fluid" from="Solid" exchange-directory="." distribution-type="gather-scatter"/>
-        <coupling-scheme:parallel-explicit>
-            <timestep-length value="1"/>
-            <max-time value="500"/>
-            <participants first="Solid" second="Outer-Fluid"/>
-            <exchange data="Sink-Temperature-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
-            <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-to-Outer-Fluid" from="Solid" to="Outer-Fluid" initialize="yes"/>
-            <exchange data="Sink-Temperature-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
-            <exchange data="Heat-Transfer-Coefficient-Outer-Fluid" mesh="Outer-Fluid-to-Solid" from="Outer-Fluid" to="Solid" initialize="yes"/>
-        </coupling-scheme:parallel-explicit>
-    </solver-interface>
-</precice-configuration>
diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun b/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun
index f9e87f5eb..1883a89c8 100755
--- a/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun
+++ b/FSI/3D_Tube/OpenFOAM-CalculiX/Allrun
@@ -36,16 +36,12 @@ Solver1="pimpleDyMFoam"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
@@ -96,4 +92,4 @@ else
 fi
 
 echo ""
-echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed."
\ No newline at end of file
+echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed."
diff --git a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml
similarity index 91%
rename from FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml
rename to FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml
index 10f8637ff..e40fcc391 100644
--- a/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config_parallel.xml
+++ b/FSI/3D_Tube/OpenFOAM-CalculiX/precice-config.xml
@@ -25,7 +25,6 @@
       </mesh>
 
       <participant name="Fluid">
-	 <master:mpi-single/>
          <use-mesh name="Calculix_Mesh" from="Calculix" safety-factor="1.5"/>
          <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
          <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
@@ -37,12 +36,12 @@
 
       <participant name="Calculix">
          <use-mesh name="Calculix_Mesh" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Faces" from="Fluid"/>
+         <use-mesh name="Fluid-Mesh-Faces" from="Fluid"/>
          <write-data name="DisplacementDeltas0" mesh="Calculix_Mesh"/>
          <read-data  name="Forces0" mesh="Calculix_Mesh"/>
       </participant>
 
-      <m2n:sockets from="Fluid" to="Calculix" distribution-type="gather-scatter"/>
+      <m2n:sockets from="Fluid" to="Calculix" />
       
       <coupling-scheme:serial-implicit>
            <participants first="Fluid" second="Calculix"/>
@@ -54,13 +53,13 @@
            <relative-convergence-measure limit="1e-3" data="DisplacementDeltas0" mesh="Calculix_Mesh"/>
            <relative-convergence-measure limit="1e-3" data="Forces0" mesh="Calculix_Mesh"/>
 
-           <post-processing:IQN-IMVJ>
+           <acceleration:IQN-IMVJ>
             <data name="DisplacementDeltas0" mesh="Calculix_Mesh"/>
             <preconditioner type="residual-sum"/>
             <initial-relaxation value="0.1"/>
             <max-used-iterations value="10"/>
             <timesteps-reused value="1"/>
-           </post-processing:IQN-IMVJ>		
+           </acceleration:IQN-IMVJ>		
 	 
       </coupling-scheme:serial-implicit>
 
diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun b/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun
index bff0c6ae3..69ffe44a9 100755
--- a/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun
+++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/Allrun
@@ -48,16 +48,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml
new file mode 100644
index 000000000..fdc692105
--- /dev/null
+++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/precice-config.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Forces0"/>
+    <data:vector name="Displacements0"/>
+
+    <mesh name="Fluid-Mesh-Faces">
+        <use-data name="Forces0"/>
+    </mesh>
+
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <mesh name="Calculix_Mesh">
+        <use-data name="Forces0"/>
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Calculix_Mesh" from="Calculix"/>
+        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
+        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Calculix_Mesh" constraint="conservative" z-dead="true" />
+        <mapping:rbf-thin-plate-splines direction="read" from="Calculix_Mesh" to="Fluid-Mesh-Nodes" constraint="consistent" />
+    </participant>
+
+    <participant name="Calculix">
+        <use-mesh name="Calculix_Mesh" provide="yes"/>
+        <read-data name="Forces0" mesh="Calculix_Mesh"/>
+        <write-data name="Displacements0" mesh="Calculix_Mesh"/>
+        <watch-point mesh="Calculix_Mesh" name="point1" coordinate="0.6;0.2;0." />
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Calculix"/>
+
+    <coupling-scheme:serial-implicit>
+            <timestep-length value="0.001" />
+            <max-time value="10"/>
+            <participants first="Fluid" second="Calculix"/>
+            <exchange data="Forces0" mesh="Calculix_Mesh" from="Fluid" to="Calculix"/>
+            <exchange data="Displacements0" mesh="Calculix_Mesh" from="Calculix" to="Fluid" initialize="0" />
+
+            <max-iterations value="50"/>
+            <relative-convergence-measure limit="1e-4" data="Displacements0" mesh="Calculix_Mesh"/>
+            <relative-convergence-measure limit="1e-4" data="Forces0" mesh="Calculix_Mesh"/>
+            <extrapolation-order value="2"/>
+
+             <acceleration:IQN-ILS>
+                <data name="Displacements0" mesh="Calculix_Mesh"/>
+                <preconditioner type="residual-sum"/>
+                <filter type="QR1" limit="1e-6"/>
+                <initial-relaxation value="0.1"/> 
+                <max-used-iterations value="50"/>
+                <timesteps-reused value="10"/> 
+            </acceleration:IQN-ILS> 
+
+    </coupling-scheme:serial-implicit>
+
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid b/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid
index d97fda495..62cc3a5e9 100755
--- a/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid
+++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/runFluid
@@ -20,13 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
@@ -49,4 +42,4 @@ fi
 ./removeObsoleteFolders.sh
 
 echo ""
-echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed."
\ No newline at end of file
+echo "### NOTE ### Make sure to use the correct solver for your OpenFOAM version! (pimpleFoam for OpenFOAM v1806, OpenFOAM 6, or newer, vs pimpleDyMFoam for older) You may change this in your Fluid/system/controlDict file, if needed."
diff --git a/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid b/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid
index 870de0cb8..58614c9ab 100755
--- a/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid
+++ b/FSI/cylinderFlap/OpenFOAM-CalculiX/runSolid
@@ -9,7 +9,6 @@
 # The script "Allclean" cleans-up the result and log files.
 
 echo "Preparing and running the Solid participant..."
-echo "Note: run the script runFluid first. It sets up a link to the correct precice-config.xml file."
 
 # Prepare in silent mode
 cd Solid
@@ -17,4 +16,4 @@ cd Solid
 cd -
 
 # Run
-ccx_preCICE -i Solid/flap -precice-participant Calculix
\ No newline at end of file
+ccx_preCICE -i Solid/flap -precice-participant Calculix
diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml
new file mode 100644
index 000000000..fc40a0525
--- /dev/null
+++ b/FSI/cylinderFlap/OpenFOAM-FEniCS/precice-config.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Forces0"/>
+    <data:vector name="Displacements0"/>
+
+    <mesh name="Fluid-Mesh-Faces">
+        <use-data name="Forces0"/>
+    </mesh>
+
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <mesh name="Solid">
+        <use-data name="Forces0"/>
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid" from="fenics"/>
+        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
+        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Solid" constraint="conservative" z-dead="true"/>
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid" to="Fluid-Mesh-Nodes" constraint="consistent" z-dead="true"/>
+    </participant>
+
+    <participant name="fenics">
+        <use-mesh name="Solid" provide="yes"/>
+        <read-data name="Forces0" mesh="Solid"/>
+        <write-data name="Displacements0" mesh="Solid"/>
+        <watch-point mesh="Solid" name="point1" coordinate="0.6;0.2;0." />
+    </participant>
+
+    <m2n:sockets from="Fluid" to="fenics"/>
+
+    <coupling-scheme:serial-implicit>
+            <timestep-length value="0.005" />
+            <max-time value="10"/>
+            <participants first="Fluid" second="fenics"/>
+            <exchange data="Forces0" mesh="Solid" from="Fluid" to="fenics"/>
+            <exchange data="Displacements0" mesh="Solid" from="fenics" to="Fluid" initialize="0" />
+
+            <max-iterations value="50"/>
+            <relative-convergence-measure limit="1e-4" data="Displacements0" mesh="Solid"/>
+            <relative-convergence-measure limit="1e-4" data="Forces0" mesh="Solid"/>
+            <extrapolation-order value="2"/>
+
+             <acceleration:IQN-ILS>
+                <data name="Displacements0" mesh="Solid"/>
+                <preconditioner type="residual-sum"/>
+                <filter type="QR1" limit="1e-6"/>
+                <initial-relaxation value="0.1"/> 
+                <max-used-iterations value="50"/>
+                <timesteps-reused value="10"/> 
+            </acceleration:IQN-ILS> 
+
+    </coupling-scheme:serial-implicit>
+
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid b/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid
index 0d1b19fa4..4c96e7be9 100755
--- a/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid
+++ b/FSI/cylinderFlap/OpenFOAM-FEniCS/runFluid
@@ -20,19 +20,11 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
 checkMesh -case Fluid
 
-
 # Run
 cd Fluid
 	solver=$(getApplication)
diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun b/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun
index 079c89309..5b2791eb9 100755
--- a/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun
+++ b/FSI/cylinderFlap/OpenFOAM-deal.II/Allrun
@@ -45,16 +45,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml
new file mode 100644
index 000000000..f11d038a5
--- /dev/null
+++ b/FSI/cylinderFlap/OpenFOAM-deal.II/precice-config.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Force"/>
+    <data:vector name="Displacement"/>
+
+    <mesh name="Fluid-Mesh-Centers">
+        <use-data name="Force"/>
+   </mesh>
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+
+    <mesh name="Solid_nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+    <mesh name="Solid_faces">
+        <use-data name="Force"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid_nodes" from="Solid"/>
+        <use-mesh name="Solid_faces" from="Solid"/>
+        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
+        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
+        <!--export:vtk directory="coupling_data" /-->
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" z-dead="true"/>
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Solid_nodes" provide="yes"/>
+        <use-mesh name="Solid_faces" provide="yes"/>
+        <read-data name="Force"  mesh="Solid_faces"/>
+        <write-data name="Displacement" mesh="Solid_nodes"/>
+        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="0.6;0.2;0." />
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid"/>
+
+    <coupling-scheme:serial-implicit>
+        <timestep-length value="0.005"/>
+        <max-time value="10"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
+        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
+
+        <max-iterations value="100"/>
+        <absolute-convergence-measure limit="1e-6" data="Displacement" mesh="Solid_nodes"/>
+        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
+        <extrapolation-order value="2"/>
+
+        <acceleration:IQN-ILS>
+            <data name="Displacement" mesh="Solid_nodes"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR1" limit="1e-6"/>
+            <initial-relaxation value="0.1"/>
+            <max-used-iterations value="50"/>
+            <timesteps-reused value="10"/>
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun
index 079c89309..5b2791eb9 100755
--- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun
+++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/Allrun
@@ -45,16 +45,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml
new file mode 100644
index 000000000..ab8e5cc5f
--- /dev/null
+++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="2">
+
+    <data:vector name="Force"/>
+    <data:vector name="Displacement"/>
+
+    <mesh name="Fluid-Mesh-Centers">
+        <use-data name="Force"/>
+   </mesh>
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+
+    <mesh name="Solid_nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+    <mesh name="Solid_faces">
+        <use-data name="Force"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid_nodes" from="Solid"/>
+        <use-mesh name="Solid_faces" from="Solid"/>
+        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
+        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
+        <!--export:vtk directory="coupling_data" /-->
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" />
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Solid_nodes" provide="yes"/>
+        <use-mesh name="Solid_faces" provide="yes"/>
+        <read-data name="Force"  mesh="Solid_faces"/>
+        <write-data name="Displacement" mesh="Solid_nodes"/>
+        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="0.6;0.2;0." />
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid" />
+
+    <coupling-scheme:serial-implicit>
+        <timestep-length value="0.005"/>
+        <max-time value="10"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
+        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
+
+        <max-iterations value="100"/>
+        <absolute-convergence-measure limit="1e-6" data="Displacement" mesh="Solid_nodes"/>
+        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
+        <extrapolation-order value="2"/>
+
+        <acceleration:IQN-ILS>
+            <data name="Displacement" mesh="Solid_nodes"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR1" limit="1e-6"/>
+            <initial-relaxation value="0.1"/>
+            <max-used-iterations value="50"/>
+            <timesteps-reused value="10"/>
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml
deleted file mode 100644
index 5a66ce133..000000000
--- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_parallel.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="2">
-
-    <data:vector name="Force"/>
-    <data:vector name="Displacement"/>
-
-    <mesh name="Fluid-Mesh-Centers">
-        <use-data name="Force"/>
-   </mesh>
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-
-    <mesh name="Solid_nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-    <mesh name="Solid_faces">
-        <use-data name="Force"/>
-    </mesh>
-
-    <participant name="Fluid">
-        <master:mpi-single/>    
-        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid_nodes" from="Solid"/>
-        <use-mesh name="Solid_faces" from="Solid"/>
-        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
-        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
-        <!--export:vtk directory="coupling_data" /-->
-        <mapping:petrbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" />
-        <mapping:petrbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-    </participant>
-
-    <participant name="Solid">
-        <use-mesh name="Solid_nodes" provide="yes"/>
-        <use-mesh name="Solid_faces" provide="yes"/>
-        <read-data name="Force"  mesh="Solid_faces"/>
-        <write-data name="Displacement" mesh="Solid_nodes"/>
-        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="0.6;0.2;0." />
-    </participant>
-
-    <m2n:sockets from="Fluid" to="Solid" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-implicit>
-        <timestep-length value="0.005"/>
-        <max-time value="10"/>
-        <participants first="Fluid" second="Solid"/>
-        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
-        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
-
-        <max-iterations value="100"/>
-        <absolute-convergence-measure limit="1e-6" data="Displacement" mesh="Solid_nodes"/>
-        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
-        <extrapolation-order value="2"/>
-
-        <post-processing:IQN-ILS>
-            <data name="Displacement" mesh="Solid_nodes"/>
-            <preconditioner type="residual-sum"/>
-            <filter type="QR1" limit="1e-6"/>
-            <initial-relaxation value="0.1"/>
-            <max-used-iterations value="50"/>
-            <timesteps-reused value="10"/>
-        </post-processing:IQN-ILS>
-    </coupling-scheme:serial-implicit>
-
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml
deleted file mode 100644
index 516a4d4bd..000000000
--- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/precice-config_serial.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="2">
-
-    <data:vector name="Force"/>
-    <data:vector name="Displacement"/>
-
-    <mesh name="Fluid-Mesh-Centers">
-        <use-data name="Force"/>
-    </mesh>
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-
-    <mesh name="Solid_nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-   <mesh name="Solid_faces">
-        <use-data name="Force"/>
-    </mesh>
-
-    <participant name="Fluid">
-        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid_nodes" from="Solid"/>
-        <use-mesh name="Solid_faces" from="Solid"/>
-        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
-        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
-        <!--export:vtk directory="coupling_data" /-->
-        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" />
-        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-    </participant>
-
-    <participant name="Solid">
-        <use-mesh name="Solid_nodes" provide="yes"/>
-        <use-mesh name="Solid_faces" provide="yes"/>
-        <read-data name="Force"  mesh="Solid_faces"/>
-        <write-data name="Displacement" mesh="Solid_nodes"/>
-        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="0.6;0.2;0." />
-    </participant>
-
-    <m2n:sockets from="Fluid" to="Solid" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-implicit>
-        <timestep-length value="0.005"/>
-        <max-time value="10"/>
-        <participants first="Fluid" second="Solid"/>
-        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
-        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
-
-        <max-iterations value="100"/>
-        <absolute-convergence-measure limit="1e-6" data="Displacement" mesh="Solid_nodes"/>
-        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
-        <extrapolation-order value="2"/>
-
-        <post-processing:IQN-ILS>
-            <data name="Displacement" mesh="Solid_nodes"/>
-            <preconditioner type="residual-sum"/>
-            <filter type="QR1" limit="1e-6"/>
-            <initial-relaxation value="0.1"/>
-            <max-used-iterations value="50"/>
-            <timesteps-reused value="10"/>
-        </post-processing:IQN-ILS>
-    </coupling-scheme:serial-implicit>
-
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid
index b5c16ddbd..3223006a0 100755
--- a/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid
+++ b/FSI/cylinderFlap_2D/OpenFOAM-deal.II/runFluid
@@ -20,13 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/Allrun b/FSI/flap_perp/OpenFOAM-CalculiX/Allrun
index bff0c6ae3..69ffe44a9 100755
--- a/FSI/flap_perp/OpenFOAM-CalculiX/Allrun
+++ b/FSI/flap_perp/OpenFOAM-CalculiX/Allrun
@@ -48,16 +48,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml
new file mode 100644
index 000000000..99fe039f0
--- /dev/null
+++ b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Forces0"/>
+    <data:vector name="Displacements0"/>
+
+    <mesh name="Fluid-Mesh-Faces">
+        <use-data name="Forces0"/>
+    </mesh>
+
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <mesh name="Solid">
+        <use-data name="Forces0"/>
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid" from="Calculix"/>
+        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
+        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Solid" constraint="conservative" y-dead="true" />
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid" to="Fluid-Mesh-Nodes" constraint="consistent"/>
+        <watch-point mesh="Solid" name="point1" coordinate="-0.05;0;1" />
+    </participant>
+
+    <participant name="Calculix">
+        <use-mesh name="Solid" provide="yes"/>
+        <read-data name="Forces0" mesh="Solid"/>
+        <write-data name="Displacements0" mesh="Solid"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Calculix" />
+
+    <coupling-scheme:serial-explicit>
+        <timestep-length value="1e-2"/>
+        <max-time value="5"/>
+        <participants first="Fluid" second="Calculix"/>
+        <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
+        <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid"/>
+    </coupling-scheme:serial-explicit>
+
+<!-- 
+    <coupling-scheme:serial-implicit>
+            <timestep-length value="1.e-2" />
+            <max-time value="5."/>
+            <participants first="Fluid" second="Calculix"/>
+            <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
+            <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid" />
+
+            <max-iterations value="50"/>
+            <absolute-convergence-measure limit="1e-6" data="Displacements0" mesh="Solid"/>
+            <relative-convergence-measure limit="1e-2" data="Forces0" mesh="Solid"/>
+            <extrapolation-order value="2"/>
+ 
+            <acceleration:IQN-ILS>
+                <data name="Displacements0" mesh="Solid"/>
+                <preconditioner type="residual-sum"/>
+                <filter type="QR1" limit="1e-6"/>
+                <initial-relaxation value="0.01"/> 
+                <max-used-iterations value="50"/>
+                <timesteps-reused value="2"/> 
+            </acceleration:IQN-ILS> 
+
+    </coupling-scheme:serial-implicit>
+ -->
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml
deleted file mode 100644
index 4bb505821..000000000
--- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_parallel.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="3">
-
-    <data:vector name="Forces0"/>
-    <data:vector name="Displacements0"/>
-
-    <mesh name="Fluid-Mesh-Faces">
-        <use-data name="Forces0"/>
-    </mesh>
-
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacements0"/>
-    </mesh>
-
-    <mesh name="Solid">
-        <use-data name="Forces0"/>
-        <use-data name="Displacements0"/>
-    </mesh>
-
-    <participant name="Fluid">
-        <master:mpi-single/>
-        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid" from="Calculix"/>
-        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
-        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
-        <mapping:petrbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Solid" constraint="conservative" y-dead="true" />
-        <mapping:petrbf-thin-plate-splines direction="read" from="Solid" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-        <watch-point mesh="Solid" name="point1" coordinate="-0.05;0;1" />
-    </participant>
-
-    <participant name="Calculix">
-        <use-mesh name="Solid" provide="yes"/>
-        <read-data name="Forces0" mesh="Solid"/>
-        <write-data name="Displacements0" mesh="Solid"/>
-    </participant>
-
-    <m2n:sockets from="Fluid" to="Calculix" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-explicit>
-        <timestep-length value="1e-2"/>
-        <max-time value="5"/>
-        <participants first="Fluid" second="Calculix"/>
-        <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
-        <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid"/>
-    </coupling-scheme:serial-explicit>
-
-<!-- 
-    <coupling-scheme:serial-implicit>
-            <timestep-length value="1.e-2" />
-            <max-time value="5."/>
-            <participants first="Fluid" second="Calculix"/>
-            <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
-            <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid" />
-
-            <max-iterations value="50"/>
-            <absolute-convergence-measure limit="1e-6" data="Displacements0" mesh="Solid"/>
-            <relative-convergence-measure limit="1e-2" data="Forces0" mesh="Solid"/>
- 
-            <post-processing:IQN-ILS>
-                <data name="Displacements0" mesh="Solid"/>
-                <preconditioner type="residual-sum"/>
-                <filter type="QR1" limit="1e-6"/>
-                <initial-relaxation value="0.01"/> 
-                <max-used-iterations value="50"/>
-                <timesteps-reused value="2"/> 
-            </post-processing:IQN-ILS> 
-
-    </coupling-scheme:serial-implicit>
- -->
-
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml b/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml
deleted file mode 100644
index 7aff0958f..000000000
--- a/FSI/flap_perp/OpenFOAM-CalculiX/precice-config_serial.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="3">
-
-    <data:vector name="Forces0"/>
-    <data:vector name="Displacements0"/>
-
-    <mesh name="Fluid-Mesh-Faces">
-        <use-data name="Forces0"/>
-    </mesh>
-
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacements0"/>
-    </mesh>
-
-    <mesh name="Solid">
-        <use-data name="Forces0"/>
-        <use-data name="Displacements0"/>
-    </mesh>
-
-    <participant name="Fluid">
-        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid" from="Calculix"/>
-        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
-        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
-        <mapping:petrbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Solid" constraint="conservative" y-dead="true" />
-        <mapping:petrbf-thin-plate-splines direction="read" from="Solid" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-        <watch-point mesh="Solid" name="point1" coordinate="-0.05;0;1" />
-    </participant>
-
-    <participant name="Calculix">
-        <use-mesh name="Solid" provide="yes"/>
-        <read-data name="Forces0" mesh="Solid"/>
-        <write-data name="Displacements0" mesh="Solid"/>
-    </participant>
-
-    <m2n:sockets from="Fluid" to="Calculix" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-explicit>
-        <timestep-length value="1e-2"/>
-        <max-time value="5"/>
-        <participants first="Fluid" second="Calculix"/>
-        <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
-        <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid"/>
-    </coupling-scheme:serial-explicit>
- 
-<!-- 
-    <coupling-scheme:serial-implicit>
-            <timestep-length value="1.e-2" />
-            <max-time value="5."/>
-            <participants first="Fluid" second="Calculix"/>
-            <exchange data="Forces0" mesh="Solid" from="Fluid" to="Calculix"/>
-            <exchange data="Displacements0" mesh="Solid" from="Calculix" to="Fluid" />
-
-            <max-iterations value="50"/>
-            <absolute-convergence-measure limit="1e-6" data="Displacements0" mesh="Solid"/>
-            <relative-convergence-measure limit="1e-2" data="Forces0" mesh="Solid"/>
- 
-            <post-processing:IQN-ILS>
-                <data name="Displacements0" mesh="Solid"/>
-                <preconditioner type="residual-sum"/>
-                <filter type="QR1" limit="1e-6"/>
-                <initial-relaxation value="0.01"/> 
-                <max-used-iterations value="50"/>
-                <timesteps-reused value="2"/> 
-            </post-processing:IQN-ILS> 
-
-    </coupling-scheme:serial-implicit>
- -->
-
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/runFluid b/FSI/flap_perp/OpenFOAM-CalculiX/runFluid
index 16845e6b5..02e56e134 100755
--- a/FSI/flap_perp/OpenFOAM-CalculiX/runFluid
+++ b/FSI/flap_perp/OpenFOAM-CalculiX/runFluid
@@ -20,13 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
diff --git a/FSI/flap_perp/OpenFOAM-CalculiX/runSolid b/FSI/flap_perp/OpenFOAM-CalculiX/runSolid
index 870de0cb8..58614c9ab 100755
--- a/FSI/flap_perp/OpenFOAM-CalculiX/runSolid
+++ b/FSI/flap_perp/OpenFOAM-CalculiX/runSolid
@@ -9,7 +9,6 @@
 # The script "Allclean" cleans-up the result and log files.
 
 echo "Preparing and running the Solid participant..."
-echo "Note: run the script runFluid first. It sets up a link to the correct precice-config.xml file."
 
 # Prepare in silent mode
 cd Solid
@@ -17,4 +16,4 @@ cd Solid
 cd -
 
 # Run
-ccx_preCICE -i Solid/flap -precice-participant Calculix
\ No newline at end of file
+ccx_preCICE -i Solid/flap -precice-participant Calculix
diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml
new file mode 100644
index 000000000..93ae23e11
--- /dev/null
+++ b/FSI/flap_perp/OpenFOAM-FEniCS/precice-config.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Forces0"/>
+    <data:vector name="Displacements0"/>
+
+    <mesh name="Fluid-Mesh-Faces">
+        <use-data name="Forces0"/>
+    </mesh>
+
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <mesh name="Solid">
+        <use-data name="Forces0"/>
+        <use-data name="Displacements0"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Faces" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid" from="fenics"/>
+        <write-data name="Forces0" mesh="Fluid-Mesh-Faces"/>
+        <read-data name="Displacements0" mesh="Fluid-Mesh-Nodes"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Faces" to="Solid" constraint="conservative" z-dead="true"/>
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid" to="Fluid-Mesh-Nodes" constraint="consistent" z-dead="true"/>
+        <watch-point mesh="Solid" name="point1" coordinate="-0.05;0;1" />
+    </participant>
+
+    <participant name="fenics">
+        <use-mesh name="Solid" provide="yes"/>
+        <read-data name="Forces0" mesh="Solid"/>
+        <write-data name="Displacements0" mesh="Solid"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="fenics"/>
+<!-- 
+    <coupling-scheme:serial-explicit>
+        <timestep-length value="1e-2"/>
+        <max-time value="5"/>
+        <participants first="Fluid" second="fenics"/>
+        <exchange data="Forces0" mesh="Solid" from="Fluid" to="fenics"/>
+        <exchange data="Displacements0" mesh="Solid" from="fenics" to="Fluid"/>
+    </coupling-scheme:serial-explicit>
+  -->
+
+    <coupling-scheme:serial-implicit>
+            <timestep-length value="1.e-2" />
+            <max-time value="5.0"/>
+            <participants first="Fluid" second="fenics"/>
+            <exchange data="Forces0" mesh="Solid" from="Fluid" to="fenics"/>
+            <exchange data="Displacements0" mesh="Solid" from="fenics" to="Fluid" />
+
+            <max-iterations value="50"/>
+            <absolute-convergence-measure limit="1e-6" data="Displacements0" mesh="Solid"/>
+            <relative-convergence-measure limit="1e-2" data="Forces0" mesh="Solid"/>
+            <extrapolation-order value="2"/>
+ 
+            <acceleration:IQN-ILS>
+                <data name="Displacements0" mesh="Solid"/>
+                <preconditioner type="residual-sum"/>
+                <filter type="QR1" limit="1e-6"/>
+                <initial-relaxation value="0.01"/> 
+                <max-used-iterations value="50"/>
+                <timesteps-reused value="2"/> 
+            </acceleration:IQN-ILS> 
+
+    </coupling-scheme:serial-implicit>
+
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/flap_perp/OpenFOAM-FEniCS/runFluid b/FSI/flap_perp/OpenFOAM-FEniCS/runFluid
index 65f284804..d512d9e74 100755
--- a/FSI/flap_perp/OpenFOAM-FEniCS/runFluid
+++ b/FSI/flap_perp/OpenFOAM-FEniCS/runFluid
@@ -20,14 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
-
 
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
diff --git a/FSI/flap_perp/OpenFOAM-deal.II/Allrun b/FSI/flap_perp/OpenFOAM-deal.II/Allrun
index 079c89309..5b2791eb9 100755
--- a/FSI/flap_perp/OpenFOAM-deal.II/Allrun
+++ b/FSI/flap_perp/OpenFOAM-deal.II/Allrun
@@ -45,16 +45,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml
new file mode 100644
index 000000000..c797f4c4f
--- /dev/null
+++ b/FSI/flap_perp/OpenFOAM-deal.II/precice-config.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:vector name="Force"/>
+    <data:vector name="Displacement"/>
+    
+    <mesh name="Fluid-Mesh-Centers">
+       <use-data name="Force"/>
+   </mesh>
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+
+    <mesh name="Solid_nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+    <mesh name="Solid_faces">
+        <use-data name="Force"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid_nodes" from="Solid"/>
+        <use-mesh name="Solid_faces" from="Solid"/>
+        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
+        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" z-dead="true"/>
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
+        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="-0.05;1;0" />
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Solid_nodes" provide="yes"/>
+        <use-mesh name="Solid_faces" provide="yes"/>
+        <read-data name="Force" mesh="Solid_faces"/>
+        <write-data name="Displacement" mesh="Solid_nodes"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid"/>
+
+    <coupling-scheme:serial-implicit>
+        <timestep-length value="0.01"/>
+        <max-time value="5"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
+        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
+
+        <max-iterations value="50"/>
+        <relative-convergence-measure limit="1e-4" data="Displacement" mesh="Solid_nodes"/>
+        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
+        <extrapolation-order value="2"/>
+
+        <acceleration:IQN-ILS>
+            <data name="Displacement" mesh="Solid_nodes"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR1" limit="1e-6"/>
+            <initial-relaxation value="0.1"/>
+            <max-used-iterations value="50"/>
+            <timesteps-reused value="10"/>
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/flap_perp/OpenFOAM-deal.II/runFluid b/FSI/flap_perp/OpenFOAM-deal.II/runFluid
index 193375d3b..1a5b143a6 100755
--- a/FSI/flap_perp/OpenFOAM-deal.II/runFluid
+++ b/FSI/flap_perp/OpenFOAM-deal.II/runFluid
@@ -20,13 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config.xml b/FSI/flap_perp/SU2-CalculiX/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/flap_perp/SU2-CalculiX/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/flap_perp/SU2-CalculiX/precice-config.xml b/FSI/flap_perp/SU2-CalculiX/precice-config.xml
new file mode 100644
index 000000000..c5c3030df
--- /dev/null
+++ b/FSI/flap_perp/SU2-CalculiX/precice-config.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding='UTF-8'?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+   <solver-interface dimensions="3">
+      <data:vector name="Forces0"/>
+      <data:vector name="DisplacementDeltas0"/>
+
+      <mesh name="SU2_Mesh0">
+         <use-data name="Forces0"/>
+         <use-data name="DisplacementDeltas0"/>
+      </mesh>
+
+      <mesh name="Calculix_Mesh">
+         <use-data name="DisplacementDeltas0"/>
+         <use-data name="Forces0"/>
+      </mesh>
+
+      <participant name="SU2_CFD">
+         <use-mesh name="Calculix_Mesh" from="Calculix"/>
+         <use-mesh name="SU2_Mesh0" provide="yes"/>
+         <write-data name="Forces0" mesh="SU2_Mesh0"/>
+         <read-data  name="DisplacementDeltas0" mesh="SU2_Mesh0"/>
+         <mapping:nearest-neighbor
+            direction="write" from="SU2_Mesh0" to="Calculix_Mesh"
+            constraint="conservative" timing="initial"/>
+         <mapping:nearest-neighbor
+	        direction="read" from="Calculix_Mesh" to="SU2_Mesh0"
+            constraint="consistent" timing="initial"/>
+      </participant>
+
+      <participant name="Calculix">
+         <use-mesh name="Calculix_Mesh" provide="yes"/>
+         <write-data name="DisplacementDeltas0" mesh="Calculix_Mesh"/>
+         <read-data  name="Forces0"      mesh="Calculix_Mesh"/>
+        <watch-point mesh="Calculix_Mesh" name="point1" coordinate="-0.05;0.01;1" />
+      </participant>
+
+      <m2n:sockets from="SU2_CFD" to="Calculix"  exchange-directory="../" />
+      
+      <coupling-scheme:parallel-implicit>
+      <!--coupling-scheme:serial-implicit-->
+           <participants first="SU2_CFD" second="Calculix"/>
+           <max-timesteps value="400"/>
+           <timestep-length value="1e-2" />
+           <exchange data="Forces0" mesh="Calculix_Mesh" from="SU2_CFD" to="Calculix"/>
+           <exchange data="DisplacementDeltas0" mesh="Calculix_Mesh" from="Calculix" to="SU2_CFD" />
+           <max-iterations value="50"/>
+           <relative-convergence-measure limit="1e-3" data="DisplacementDeltas0" mesh="Calculix_Mesh"/>
+           <relative-convergence-measure limit="1e-3" data="Forces0" mesh="Calculix_Mesh"/>
+           <extrapolation-order value="2"/>
+
+           <acceleration:IQN-ILS>
+            <data name="DisplacementDeltas0" mesh="Calculix_Mesh"/>
+            <data name="Forces0" mesh="Calculix_Mesh"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR1" limit="1e-6"/>
+            <initial-relaxation value="0.5"/>
+            <max-used-iterations value="40"/>
+            <timesteps-reused value="10"/>
+           </acceleration:IQN-ILS>
+
+           <!-- <acceleration:aitken>
+              <data name="DisplacementDeltas0" mesh="Calculix_Mesh"/>
+              <initial-relaxation value="0.9"/>
+           </acceleration:aitken> -->
+           
+      </coupling-scheme:parallel-implicit>
+      <!--/coupling-scheme:serial-implicit-->
+
+
+
+
+
+
+   </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh b/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh
index c22b9b69c..2d329f9a2 100755
--- a/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh
+++ b/FSI/flap_perp/SU2-CalculiX/runTutorial_parallel.sh
@@ -1,8 +1,6 @@
 #! /bin/bash 
 
 
-ln -sf precice-config_parallel.xml precice-config.xml
-
 tmux has-session -t PreciceSU2-Calculix-newtonParallel 2>/dev/null
 if [ "$?" -eq 1 ] ; then 
     tmux new-session -d -s 'PreciceSU2-Calculix-newtonParallel'
diff --git a/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh b/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh
index a244af2ec..de486e22d 100755
--- a/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh
+++ b/FSI/flap_perp/SU2-CalculiX/runTutorial_serial.sh
@@ -1,8 +1,6 @@
 #! /bin/bash 
 
 
-ln -sf precice-config_serial.xml precice-config.xml
-
 tmux has-session -t PreciceSU2-Calculix-newtonParallel 2>/dev/null
 if [ "$?" -eq 1 ] ; then 
     tmux new-session -d -s 'PreciceSU2-Calculix-newtonParallel'
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun b/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun
index 079c89309..5b2791eb9 100755
--- a/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun
+++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/Allrun
@@ -45,16 +45,12 @@ Participant1="Fluid"
     if [ $parallel -eq 1 ]; then
         echo "  Decomposing the case..."
         decomposePar -force -case ${Participant1} > ${Participant1}_decomposePar.log 2>&1
-        echo "  Setting up the preCICE configuration file for a parallel simulation..."
-        ln -s -f precice-config_parallel.xml precice-config.xml 
         cd ${Participant1}
             nproc=$(getNumberOfProcessors)
         cd ..
         echo "  Starting the ${Participant1} participant in parallel..."
         mpirun -np ${nproc} ${Solver1} -parallel -case ${Participant1} > ${Participant1}.log 2>&1 &
     else
-        echo "  Setting up the preCICE configuration file for a serial simulation..."
-        ln -s -f precice-config_serial.xml precice-config.xml
         echo "  Starting the ${Participant1} participant in serial..."
         ${Solver1} -case ${Participant1} > ${Participant1}.log 2>&1 &
     fi
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml
deleted file mode 120000
index f12083976..000000000
--- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml
+++ /dev/null
@@ -1 +0,0 @@
-precice-config_serial.xml
\ No newline at end of file
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml
new file mode 100644
index 000000000..751a20808
--- /dev/null
+++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="2">
+
+    <data:vector name="Force"/>
+    <data:vector name="Displacement"/>
+    
+    <mesh name="Fluid-Mesh-Centers">
+       <use-data name="Force"/>
+   </mesh>
+    <mesh name="Fluid-Mesh-Nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+
+    <mesh name="Solid_nodes">
+        <use-data name="Displacement"/>
+    </mesh>
+    <mesh name="Solid_faces">
+        <use-data name="Force"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
+        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
+        <use-mesh name="Solid_nodes" from="Solid"/>
+        <use-mesh name="Solid_faces" from="Solid"/>
+        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
+        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
+        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative"/>
+        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
+        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="-0.05;1;0" />
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Solid_nodes" provide="yes"/>
+        <use-mesh name="Solid_faces" provide="yes"/>
+        <read-data name="Force" mesh="Solid_faces"/>
+        <write-data name="Displacement" mesh="Solid_nodes"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid"/>
+
+    <coupling-scheme:serial-implicit>
+        <timestep-length value="0.01"/>
+        <max-time value="5"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
+        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
+
+        <max-iterations value="50"/>
+        <relative-convergence-measure limit="1e-4" data="Displacement" mesh="Solid_nodes"/>
+        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
+        <extrapolation-order value="2"/>
+
+        <acceleration:IQN-ILS>
+            <data name="Displacement" mesh="Solid_nodes"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR1" limit="1e-6"/>
+            <initial-relaxation value="0.1"/>
+            <max-used-iterations value="50"/>
+            <timesteps-reused value="10"/>
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml
deleted file mode 100644
index c20ca34d7..000000000
--- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_parallel.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="2">
-
-    <data:vector name="Force"/>
-    <data:vector name="Displacement"/>
-    
-    <mesh name="Fluid-Mesh-Centers">
-       <use-data name="Force"/>
-   </mesh>
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-
-    <mesh name="Solid_nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-    <mesh name="Solid_faces">
-        <use-data name="Force"/>
-    </mesh>
-
-    <participant name="Fluid">
-	<master:mpi-single/>
-        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid_nodes" from="Solid"/>
-        <use-mesh name="Solid_faces" from="Solid"/>
-        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
-        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
-        <mapping:petrbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative"/>
-        <mapping:petrbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="-0.05;1;0" />
-    </participant>
-
-    <participant name="Solid">
-        <use-mesh name="Solid_nodes" provide="yes"/>
-        <use-mesh name="Solid_faces" provide="yes"/>
-        <read-data name="Force" mesh="Solid_faces"/>
-        <write-data name="Displacement" mesh="Solid_nodes"/>
-    </participant>
-
-    <m2n:sockets from="Fluid" to="Solid" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-implicit>
-        <timestep-length value="0.01"/>
-        <max-time value="5"/>
-        <participants first="Fluid" second="Solid"/>
-        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
-        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
-
-        <max-iterations value="50"/>
-        <relative-convergence-measure limit="1e-4" data="Displacement" mesh="Solid_nodes"/>
-        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
-        <extrapolation-order value="2"/>
-
-        <post-processing:IQN-ILS>
-            <data name="Displacement" mesh="Solid_nodes"/>
-            <preconditioner type="residual-sum"/>
-            <filter type="QR1" limit="1e-6"/>
-            <initial-relaxation value="0.1"/>
-            <max-used-iterations value="50"/>
-            <timesteps-reused value="10"/>
-        </post-processing:IQN-ILS>
-    </coupling-scheme:serial-implicit>
-
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml b/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml
deleted file mode 100644
index 205372bc4..000000000
--- a/FSI/flap_perp_2D/OpenFOAM-deal.II/precice-config_serial.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<precice-configuration>
-
-    <log>
-        <sink filter="%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
-    </log>
-
-    <solver-interface dimensions="2">
-
-    <data:vector name="Force"/>
-    <data:vector name="Displacement"/>
-    
-    <mesh name="Fluid-Mesh-Centers">
-        <use-data name="Force"/>
-    </mesh>
-    <mesh name="Fluid-Mesh-Nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-
-    <mesh name="Solid_nodes">
-        <use-data name="Displacement"/>
-    </mesh>
-    <mesh name="Solid_faces">
-       <use-data name="Force"/>
-    </mesh>
-
-    <participant name="Fluid">
-        <use-mesh name="Fluid-Mesh-Centers" provide="yes"/>
-        <use-mesh name="Fluid-Mesh-Nodes" provide="yes"/>
-        <use-mesh name="Solid_nodes" from="Solid"/>
-        <use-mesh name="Solid_faces" from="Solid"/>
-        <read-data name="Displacement" mesh="Fluid-Mesh-Nodes"/>
-        <write-data name="Force" mesh="Fluid-Mesh-Centers"/>
-        <mapping:rbf-thin-plate-splines direction="write" from="Fluid-Mesh-Centers" to="Solid_faces" constraint="conservative" />
-        <mapping:rbf-thin-plate-splines direction="read" from="Solid_nodes" to="Fluid-Mesh-Nodes" constraint="consistent"/>
-        <watch-point mesh="Solid_nodes" name="flap_tip" coordinate="-0.05;1" />
-        <export:vtk directory="preCICE-output" />
-    </participant>
-
-    <participant name="Solid">
-        <use-mesh name="Solid_nodes" provide="yes"/>
-        <use-mesh name="Solid_faces" provide="yes"/>
-        <read-data name="Force"  mesh="Solid_faces"/>
-        <write-data name="Displacement" mesh="Solid_nodes"/>
-        <export:vtk directory="preCICE-output" />
-</participant>
-
-    <m2n:sockets from="Fluid" to="Solid" distribution-type="gather-scatter"/>
-
-    <coupling-scheme:serial-explicit>
-        <timestep-length value="0.01"/>
-        <max-time value="5"/>
-        <participants first="Fluid" second="Solid"/>
-	<exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
-        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
-    </coupling-scheme:serial-explicit>
-
-    <!--
-    <coupling-scheme:serial-implicit>
-        <timestep-length value="0.01"/>
-        <max-time value="5"/>
-        <participants first="Fluid" second="Solid"/>
-        <exchange data="Force" mesh="Solid_faces" from="Fluid" to="Solid"/>
-        <exchange data="Displacement" mesh="Solid_nodes" from="Solid" to="Fluid" initialize="0"/>
-
-        <max-iterations value="50"/>
-        <relative-convergence-measure limit="1e-4" data="Displacement" mesh="Solid_nodes"/>
-        <relative-convergence-measure limit="1e-4" data="Force" mesh="Solid_faces"/>
-        <extrapolation-order value="2"/>
-
-         <post-processing:IQN-ILS>
-            <data name="Displacement" mesh="Solid_nodes"/>
-            <preconditioner type="residual-sum"/>
-            <filter type="QR1" limit="1e-6"/>
-            <initial-relaxation value="0.1"/>
-            <max-used-iterations value="50"/>
-            <timesteps-reused value="10"/>
-        </post-processing:IQN-ILS>
-      </coupling-scheme:serial-implicit>
-    -->
-    </solver-interface>
-
-</precice-configuration>
diff --git a/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid b/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid
index d890a7d42..f4b9b9102 100755
--- a/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid
+++ b/FSI/flap_perp_2D/OpenFOAM-deal.II/runFluid
@@ -20,13 +20,6 @@ fi
 
 echo "Preparing and running the Fluid participant..."
 
-# Prepare
-if [ $parallel -eq 1 ]; then
-    ln -s -f precice-config_parallel.xml precice-config.xml
-else
-    ln -s -f precice-config_serial.xml precice-config.xml
-fi
-
 rm -rfv Fluid/0/
 cp -r Fluid/0.orig/ Fluid/0/
 blockMesh -case Fluid
diff --git a/HT/partitioned-heat/fenics-fenics/precice-config.xml b/HT/partitioned-heat/fenics-fenics/precice-config.xml
index f87576526..6f7dd851c 100644
--- a/HT/partitioned-heat/fenics-fenics/precice-config.xml
+++ b/HT/partitioned-heat/fenics-fenics/precice-config.xml
@@ -36,7 +36,7 @@
       <read-data  name="Flux"        mesh="NeumannNodes"/>
     </participant>
 
-    <m2n:sockets distribution-type="gather-scatter" from="HeatDirichlet" to="HeatNeumann"/>
+    <m2n:sockets from="HeatDirichlet" to="HeatNeumann"/>
 
       <coupling-scheme:serial-implicit>
          <participants first="HeatDirichlet" second="HeatNeumann"/>
@@ -47,13 +47,13 @@
          <exchange data="Temperature" mesh="NeumannNodes" from="HeatNeumann"   to="HeatDirichlet" initialize="true"/>
          <relative-convergence-measure data="Flux"        mesh="NeumannNodes" limit="1e-5"/>
          <relative-convergence-measure data="Temperature" mesh="NeumannNodes" limit="1e-5"/>
-         <post-processing:IQN-ILS> 
+         <acceleration:IQN-ILS> 
             <data name="Temperature" mesh="NeumannNodes"/>
             <initial-relaxation value="0.01"/>
             <max-used-iterations value="3"/>
             <timesteps-reused value="1"/>
             <filter type="QR2" limit="1e-3"/>
-         </post-processing:IQN-ILS>
+         </acceleration:IQN-ILS>
       </coupling-scheme:serial-implicit>
     
   </solver-interface>
diff --git a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml
index e1df1ebdf..c1481e281 100755
--- a/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml
+++ b/SSI/loaded_beam/CalculiX-CalculiX/precice-config.xml
@@ -37,30 +37,29 @@
          <read-data  name="Forces0"      mesh="Calculix_Mesh2"/>
       </participant>
 
-      <m2n:sockets from="Calculix1" to="Calculix2"  exchange-directory="../" distribution-type="gather-scatter"/>
+      <m2n:sockets from="Calculix1" to="Calculix2"  exchange-directory="../" />
       
       <coupling-scheme:parallel-implicit>
-
          <participants first="Calculix1" second="Calculix2"/>
          <max-timesteps value="50"/>
          <timestep-length value="1e-2"/>
          <exchange data="Displacements0" mesh="Calculix_Mesh2" from="Calculix2" to="Calculix1" />
          <exchange data="Forces0" mesh="Calculix_Mesh2" from="Calculix1" to="Calculix2"/>
-         
          <max-iterations value="50"/>
+<!--      	   <min-iteration-convergence-measure min-iterations="5" data="Displacements0" mesh="Calculix_Mesh2"/>-->
          <relative-convergence-measure limit="1e-4" data="Displacements0" mesh="Calculix_Mesh2"/>
          <relative-convergence-measure limit="1e-4" data="Forces0" mesh="Calculix_Mesh2"/>
 
-         <post-processing:IQN-ILS>
-           <data name="Displacements0" mesh="Calculix_Mesh2"/>
-           <data name="Forces0" mesh="Calculix_Mesh2"/>
-           <preconditioner type="residual-sum"/>
-           <filter type="QR2" limit="1e-3"/>
-           <initial-relaxation value="0.1"/>
-           <max-used-iterations value="60"/>
-           <timesteps-reused value="10"/>
-         </post-processing:IQN-ILS>
-           
+         <acceleration:IQN-ILS>
+            <data name="Displacements0" mesh="Calculix_Mesh2"/>
+            <data name="Forces0" mesh="Calculix_Mesh2"/>
+            <preconditioner type="residual-sum"/>
+            <filter type="QR2" limit="1e-3"/>
+            <initial-relaxation value="0.1"/>
+            <max-used-iterations value="60"/>
+            <timesteps-reused value="10"/>
+         </acceleration:IQN-ILS>
+
       </coupling-scheme:parallel-implicit>
 
    </solver-interface>