diff --git a/CMakeLists.txt b/CMakeLists.txt
index d480f91..9bb6af6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,4 +33,4 @@ add_subdirectory("sf-buffer")
 add_subdirectory("sf-stream")
 add_subdirectory("sf-writer")
 #add_subdirectory("jf-live-writer")
-#add_subdirectory("jf-live-daq")
\ No newline at end of file
+#add_subdirectory("jf-live-daq")
diff --git a/scripts/JF02-buffer-worker.sh b/scripts/JF02-buffer-worker.sh
index 226db66..e8f0d2b 100644
--- a/scripts/JF02-buffer-worker.sh
+++ b/scripts/JF02-buffer-worker.sh
@@ -9,9 +9,10 @@ fi
 M=$1
 
 # Add ourselves to the user cpuset.
-# echo $$ > /sys/fs/cgroup/cpuset/user/tasks
+echo $$ > /sys/fs/cgroup/cpuset/user/tasks
 
-coreAssociatedBuffer=(39 39 39 40 40 40 41 41 41)
+#coreAssociatedBuffer=(25 25 26 26 27 27 28 28 29)
+coreAssociatedBuffer=(1 2 2 3 3 4 4 5 5)
 
 initialUDPport=50020
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF02-stream.sh b/scripts/JF02-stream.sh
index f150b3e..38b113d 100644
--- a/scripts/JF02-stream.sh
+++ b/scripts/JF02-stream.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
-coreAssociated="17,18,19"
+echo $$ > /sys/fs/cgroup/cpuset/user/tasks
+coreAssociated="33,34,35"
 
 taskset -c ${coreAssociated} /usr/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF02.json
diff --git a/scripts/JF06-buffer-worker.sh b/scripts/JF06-buffer-worker.sh
index dd9c721..bac2bdb 100644
--- a/scripts/JF06-buffer-worker.sh
+++ b/scripts/JF06-buffer-worker.sh
@@ -11,7 +11,8 @@ M=$1
 # Add ourselves to the user cpuset.
 # echo $$ > /sys/fs/cgroup/cpuset/user/tasks
 
-coreAssociatedBuffer=(22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 32 33 33 34 34 35 35 36 36 37 37)
+#coreAssociatedBuffer=(22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 32 33 33 34 34 35 35 36 36 37 37)
+coreAssociatedBuffer=(6 6 7 7 8 8 9 9 10 10 22 22 23 23 24 24 25 25 26 26 27 27 28 28 29 29 30 30 31 31 32 32)
 
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
diff --git a/scripts/JF06-stream.service b/scripts/JF06-stream.service
index 9f6d3b6..9c5b2c6 100644
--- a/scripts/JF06-stream.service
+++ b/scripts/JF06-stream.service
@@ -8,7 +8,7 @@ User=root
 ExecStart=/usr/bin/sh /home/writer/git/sf_daq_buffer/scripts/JF06-stream.sh
 TimeoutStartSec=10
 Restart=on-failure
-RestartSec=10
+RestartSec=1
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/JF06-stream.sh b/scripts/JF06-stream.sh
index 6d39268..c778845 100644
--- a/scripts/JF06-stream.sh
+++ b/scripts/JF06-stream.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-coreAssociated="13,14,15,16"
+coreAssociated="2,3,4,5"
+#echo $$ > /sys/fs/cgroup/cpuset/user/tasks
 
 taskset -c ${coreAssociated} /usr/bin/sf_stream /gpfs/photonics/swissfel/buffer/config/stream-JF06.json
diff --git a/scripts/JF06_4M-buffer-worker.sh b/scripts/JF06_4M-buffer-worker.sh
index c67c0e5..c596d9d 100644
--- a/scripts/JF06_4M-buffer-worker.sh
+++ b/scripts/JF06_4M-buffer-worker.sh
@@ -2,7 +2,7 @@
 
 if [ $# != 1 ]
 then
-    systemctl start JF06_4M-buffer-worker@{00..31}
+    systemctl start JF06_4M-buffer-worker@{00..07}
     exit
 fi
 
@@ -15,6 +15,6 @@ coreAssociatedBuffer=(22 23 24 25 26 27 28 29)
 
 initialUDPport=50060
 port=$((${initialUDPport}+10#${M}))
-DETECTOR=JF06T08V01
+DETECTOR=JF06T08V02
 
 taskset -c ${coreAssociatedBuffer[10#${M}]} /usr/bin/sf_buffer ${DETECTOR} M${M} ${port} /gpfs/photonics/swissfel/buffer/${DETECTOR} ${M}
diff --git a/sf-stream/include/stream_config.hpp b/sf-stream/include/stream_config.hpp
index ac28d86..745b9cd 100644
--- a/sf-stream/include/stream_config.hpp
+++ b/sf-stream/include/stream_config.hpp
@@ -1,7 +1,7 @@
 namespace stream_config
 {
     // N of IO threads to receive data from modules.
-    const int STREAM_ZMQ_IO_THREADS = 2;
+    const int STREAM_ZMQ_IO_THREADS = 5;
     // How long should the RECV queue be.
     const size_t STREAM_RCVHWM = 100;
     // Size of buffer between the receiving and sending part.