diff --git a/sources/Aramis_spectrometers.sources b/sources/Aramis_spectrometers.sources
index ef676b6..f3e04c6 100644
--- a/sources/Aramis_spectrometers.sources
+++ b/sources/Aramis_spectrometers.sources
@@ -2,6 +2,6 @@
 {
     "sources": [
         /* ESA spectrometer: SLAAR11-CPCW-SPEC01:SPECTRUM*/
-        {"stream": "tcp://sf-daqbuf-23:3000", "stream_original": "tcp://sf-sioc-cs-81:8105"}
+        {"stream": "tcp://sf-sioc-cs-81:8105"}
     ]
 }
diff --git a/sources/ECMC.sources b/sources/ECMC.sources
index 5d547dd..5e2f6c6 100644
--- a/sources/ECMC.sources
+++ b/sources/ECMC.sources
@@ -1,6 +1,6 @@
 {
     "sources": [
       /* SARMA01-CPCL-DBCM0302, alias sf-ecmc-04 */
-      {"stream": "tcp://sf-daqbuf-30:3001", "stream_original": "tcp://sf-ecmc-04.psi.ch:9999"}
+      {"stream": "tcp://sf-ecmc-04.psi.ch:9999"}
     ]
 }
diff --git a/sources/SARES10.sources b/sources/SARES10.sources
index 7122f5f..c9ac247 100644
--- a/sources/SARES10.sources
+++ b/sources/SARES10.sources
@@ -1,24 +1,24 @@
 {
 /* ESA Alvra - Responsible Edwin Divall & Scott Stubbs */
     "sources": [
-        {"stream": "tcp://sf-daqbuf-33:3002", "stream_original": "tcp://SARES11-CPCL-GES1:9999"},
-        {"stream": "tcp://sf-daqbuf-22:3003", "stream_original": "tcp://SARES11-CPCL-GES1:9990"},
-        {"stream": "tcp://sf-daqbuf-25:3004", "stream_original": "tcp://SARES11-CPCL-GES1:9980"},
-        {"stream": "tcp://sf-daqbuf-22:3005", "stream_original": "tcp://SARES11-CPCL-GES1:9970"},
-        {"stream": "tcp://sf-daqbuf-29:3006", "stream_original": "tcp://SLAAR11-CPPM-MOT6891:9999"},
-        {"stream": "tcp://sf-daqbuf-33:3007", "stream_original": "tcp://SLAAR11-CVME-LAS6891:9999"},
-        {"stream": "tcp://sf-daqbuf-28:3008", "stream_original": "tcp://SARES11-CVME-PRIME1:9999"},
-        {"stream": "tcp://sf-daqbuf-28:3009", "stream_original": "tcp://SARES12-CPCL-GES1:9999"},
-        {"stream": "tcp://sf-daqbuf-31:3010", "stream_original": "tcp://SARES12-CVME-FLEX1:9999"},
+        {"stream": "tcp://SARES11-CPCL-GES1:9999"},
+        {"stream": "tcp://SARES11-CPCL-GES1:9990"},
+        {"stream": "tcp://SARES11-CPCL-GES1:9980"},
+        {"stream": "tcp://SARES11-CPCL-GES1:9970"},
+        {"stream": "tcp://SLAAR11-CPPM-MOT6891:9999"},
+        {"stream": "tcp://SLAAR11-CVME-LAS6891:9999"},
+        {"stream": "tcp://SARES11-CVME-PRIME1:9999"},
+        {"stream": "tcp://SARES12-CPCL-GES1:9999"},
+        {"stream": "tcp://SARES12-CVME-FLEX1:9999"},
         
         /* Prime sample stage bsread */
-        {"stream": "tcp://sf-daqbuf-27:3011", "stream_original": "tcp://SARES11-CPPM-MOT6912:9999"},
+        {"stream": "tcp://SARES11-CPPM-MOT6912:9999"},
         
         /* Flex sample stage bsread */
-        {"stream": "tcp://sf-daqbuf-33:3012", "stream_original": "tcp://SARES12-CPPM-MOT6952:9999"},
+        {"stream": "tcp://SARES12-CPPM-MOT6952:9999"},
     
         /* Arrival time tool pipeline */
-        {"stream": "tcp://sf-daqbuf-24:3013", "stream_original": "tcp://sf-daqsync-10:9001"}
+        {"stream": "tcp://sf-daqsync-10:9001"}
 
     ]
 }
diff --git a/sources/SARES20.sources b/sources/SARES20.sources
index f767032..e0668f3 100644
--- a/sources/SARES20.sources
+++ b/sources/SARES20.sources
@@ -1,12 +1,12 @@
 {
 /* ESB Bernina - Responsible Edwin Divall */
     "sources": [
-	    {"stream": "tcp://sf-daqbuf-22:3014", "stream_original": "tcp://SARES21-CPCL-GES1:9999"}
-	    ,{"stream": "tcp://sf-daqbuf-29:3015", "stream_original": "tcp://SARES21-CPCL-GES1:9990"}
-	    ,{"stream": "tcp://sf-daqbuf-21:3016", "stream_original": "tcp://SARES21-CPCL-GES1:9980"}
-        ,{"stream": "tcp://sf-daqbuf-27:3017", "stream_original": "tcp://SARES21-CPCL-GES1:9970"}
-        ,{"stream": "tcp://sf-daqbuf-28:3018", "stream_original": "tcp://SLAAR21-CPPM-MOT6991:9999"}
-        ,{"stream": "tcp://sf-daqbuf-31:3019", "stream_original": "tcp://SLAAR21-CVME-LAS6991:9999"}
-        ,{"stream": "tcp://sf-daqbuf-33:3020", "stream_original": "tcp://SARES20-CVME-01:9999"}
+	    {"stream": "tcp://SARES21-CPCL-GES1:9999"}
+	    ,{"stream": "tcp://SARES21-CPCL-GES1:9990"}
+	    ,{"stream": "tcp://SARES21-CPCL-GES1:9980"}
+        ,{"stream": "tcp://SARES21-CPCL-GES1:9970"}
+        ,{"stream": "tcp://SLAAR21-CPPM-MOT6991:9999"}
+        ,{"stream": "tcp://SLAAR21-CVME-LAS6991:9999"}
+        ,{"stream": "tcp://SARES20-CVME-01:9999"}
     ]
 }
diff --git a/sources/SARES30.sources b/sources/SARES30.sources
index eb68852..345870b 100644
--- a/sources/SARES30.sources
+++ b/sources/SARES30.sources
@@ -1,6 +1,6 @@
 {
 /* ESC Cristallina - Responsible T. Zamofing & E. Divall */
     "sources": [
-        {"stream": "tcp://sf-daqbuf-33:3021", "stream_original": "tcp://SARES30-CVME-CRISTA1:9999"}
+        {"stream": "tcp://SARES30-CVME-CRISTA1:9999"}
     ]
 }
diff --git a/sources/SATES20.sources b/sources/SATES20.sources
index 66405b1..e079913 100644
--- a/sources/SATES20.sources
+++ b/sources/SATES20.sources
@@ -2,16 +2,16 @@
 /* ESE MALOJA - Responsible Scott Stubbs & Edwin Divall */
     "sources": [
         /* IFC SATES20-CVME */
-         {"stream": "tcp://sf-daqbuf-21:3022", "stream_original": "tcp://sates20-cvme-maloja1:9999"}
+         {"stream": "tcp://sates20-cvme-maloja1:9999"}
 
         /* KEYSIGHT RAW DATA */
-        ,{"stream": "tcp://sf-daqbuf-32:3023", "stream_original": "tcp://sates21-cpcl-ges1:9999"}
+        ,{"stream": "tcp://sates21-cpcl-ges1:9999"}
         
         /* KEYSIGHT ANALYSIS 1  */
-        ,{"stream": "tcp://sf-daqbuf-28:3024", "stream_original": "tcp://sates21-cpcl-ges1:9989"}
+        ,{"stream": "tcp://sates21-cpcl-ges1:9989"}
 
         /* CAM TEST  */
-        ,{"stream": "tcp://sf-daqbuf-25:3025", "stream_original": "tcp://camtest:9999"}
+        ,{"stream": "tcp://camtest:9999"}
 
     ]
 }
diff --git a/sources/SATES30.sources b/sources/SATES30.sources
index 6949f5c..a9b4094 100644
--- a/sources/SATES30.sources
+++ b/sources/SATES30.sources
@@ -3,14 +3,14 @@
     "sources": [
         /* to be uncommented as added */
         /* IFC SATES30-CVME */
-         {"stream": "tcp://sf-daqbuf-32:3026", "stream_original": "tcp://sates30-cvme-furka1:9999"}
+         {"stream": "tcp://sates30-cvme-furka1:9999"}
 
-         ,{"stream": "tcp://sf-daqbuf-24:3027", "stream_original": "tcp://sates30-cvme-furka1:9989"}
+         ,{"stream": "tcp://sates30-cvme-furka1:9989"}
         /* KEYSIGHT RAW DATA */
-/*        ,{"stream": "tcp://sf-daqbuf-30:3028", "stream_original": "tcp://sates31-cpcl-ges1:9999"} */
+/*        ,{"stream": "tcp://sates31-cpcl-ges1:9999"} */
         
         /* KEYSIGHT ANALYSIS 1  */
-/*        ,{"stream": "tcp://sf-daqbuf-22:3029", "stream_original": "tcp://sates31-cpcl-ges1:9989"} */
+/*        ,{"stream": "tcp://sates31-cpcl-ges1:9989"} */
 
     ]
 }
diff --git a/sources/SATFE10.sources b/sources/SATFE10.sources
index a509832..dc9e65d 100644
--- a/sources/SATFE10.sources
+++ b/sources/SATFE10.sources
@@ -1,6 +1,6 @@
 {
 /* Responsible Jose Gabadinho */
     "sources": [
-        {"stream": "tcp://sf-daqbuf-26:3030", "stream_original": "SATFE10-CVME-PEPG046:9999"}
+        {"stream": "SATFE10-CVME-PEPG046:9999"}
     ]
 }
\ No newline at end of file
diff --git a/sources/bam.sources b/sources/bam.sources
index e83181e..e6a5454 100644
--- a/sources/bam.sources
+++ b/sources/bam.sources
@@ -1,10 +1,10 @@
 {
 /*DBAMs IOC's - Responsible P. Chetsov and D. Llorente */
     "sources": [
-        {"stream": "tcp://sf-daqbuf-21:3031", "stream_original": "tcp://SINLH01-CVME-DBAM12:9999"},
-        /* {"stream": "tcp://sf-daqbuf-21:3032", "stream_original": "tcp://SINBC01-CVME-DBAM22:9999"}, */
-        {"stream": "tcp://sf-daqbuf-21:3033", "stream_original": "tcp://S10BC01-CVME-DBAM32:9999"},
-        {"stream": "tcp://sf-daqbuf-31:3034", "stream_original": "tcp://SARCL01-CVME-DBAM42:9999"},
-		{"stream": "tcp://sf-daqbuf-29:3035", "stream_original": "tcp://SARUN20-CVME-DBAM52:9999"}
+        {"stream": "tcp://SINLH01-CVME-DBAM12:9999"},
+        /* {"stream": "tcp://SINBC01-CVME-DBAM22:9999"}, */
+        {"stream": "tcp://S10BC01-CVME-DBAM32:9999"},
+        {"stream": "tcp://SARCL01-CVME-DBAM42:9999"},
+		{"stream": "tcp://SARUN20-CVME-DBAM52:9999"}
     ]
 }
diff --git a/sources/bcm.sources b/sources/bcm.sources
index d8bc2c6..6e690d9 100644
--- a/sources/bcm.sources
+++ b/sources/bcm.sources
@@ -1,8 +1,8 @@
 /*DBCMs IOC's - Responsible Waldemar Koprek (KW84) */
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-21:3036", "stream_original": "tcp://SINBC02-CVME-DBCM077:9999"},
-        {"stream": "tcp://sf-daqbuf-27:3037", "stream_original": "tcp://SINDI02-CVME-DCDR083:9999"},
-        {"stream": "tcp://sf-daqbuf-32:3038", "stream_original": "tcp://S10MA01-CVME-DCDR216:9999"}
+        {"stream": "tcp://SINBC02-CVME-DBCM077:9999"},
+        {"stream": "tcp://SINDI02-CVME-DCDR083:9999"},
+        {"stream": "tcp://S10MA01-CVME-DCDR216:9999"}
     ]
 }
diff --git a/sources/blm.sources b/sources/blm.sources
index 00bbdb6..44268ec 100644
--- a/sources/blm.sources
+++ b/sources/blm.sources
@@ -1,33 +1,33 @@
 {
 /*DBLMs IOC's - Responsible D. Llorente */
     "sources": [
-        {"stream": "tcp://sf-daqbuf-24:3039", "stream_original": "tcp://SINEG01-CVME-DBLM009:9999"},
-        {"stream": "tcp://sf-daqbuf-27:3040", "stream_original": "tcp://SINLH02-CVME-DBLM018:9999"},
-        {"stream": "tcp://sf-daqbuf-32:3041", "stream_original": "tcp://SINDI02-CVME-DBLM084:9999"},
-        {"stream": "tcp://sf-daqbuf-21:3042", "stream_original": "tcp://S10DI01-CVME-DBLM113:9999"},
-        {"stream": "tcp://sf-daqbuf-29:3043", "stream_original": "tcp://S10CB04-CVME-DBLM130:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3044", "stream_original": "tcp://S10CB06-CVME-DBLM153:9999"},
-        {"stream": "tcp://sf-daqbuf-33:3045", "stream_original": "tcp://S10CB08-CVME-DBLM170:9999"},
-        {"stream": "tcp://sf-daqbuf-28:3046", "stream_original": "tcp://S10BC01-CVME-DBLM184:9999"},
-        {"stream": "tcp://sf-daqbuf-29:3047", "stream_original": "tcp://S20CB02-CVME-DBLM234:9999"},
-        {"stream": "tcp://sf-daqbuf-30:3048", "stream_original": "tcp://S20CB04-CVME-DBLM255:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3049", "stream_original": "tcp://S20SY03-CVME-DBLM269:9999"},
-        {"stream": "tcp://sf-daqbuf-26:3050", "stream_original": "tcp://S20SY03-CVME-DBLM292:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3051", "stream_original": "tcp://S30CB02-CVME-DBLM310:9999"},
-        {"stream": "tcp://sf-daqbuf-32:3052", "stream_original": "tcp://SATCL01-CVME-DBLM328:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3053", "stream_original": "tcp://SATDI01-CVME-DBLM344:9999"},
-        {"stream": "tcp://sf-daqbuf-33:3054", "stream_original": "tcp://SATCB01-CVME-DBLM355:9999"},
-        {"stream": "tcp://sf-daqbuf-28:3055", "stream_original": "tcp://S30CB10-CVME-DBLM381:9999"},
-        {"stream": "tcp://sf-daqbuf-25:3056", "stream_original": "tcp://S30CB14-CVME-DBLM417:9999"},
-        {"stream": "tcp://sf-daqbuf-21:3057", "stream_original": "tcp://SARCL02-CVME-DBLM457:9999"},
-        {"stream": "tcp://sf-daqbuf-27:3058", "stream_original": "tcp://SARCL02-CVME-DBLM469:9999"},
-        {"stream": "tcp://sf-daqbuf-30:3059", "stream_original": "tcp://SARMA01-CVME-DBLM482:9999"},
-        {"stream": "tcp://sf-daqbuf-31:3060", "stream_original": "tcp://SARUN01-CVME-DBLM499:9999"},
-        {"stream": "tcp://sf-daqbuf-22:3061", "stream_original": "tcp://SARUN04-CVME-DBLM516:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3062", "stream_original": "tcp://SARUN08-CVME-DBLM537:9999"},
-        {"stream": "tcp://sf-daqbuf-31:3063", "stream_original": "tcp://SARUN11-CVME-DBLM546:9999"},
-        {"stream": "tcp://sf-daqbuf-32:3064", "stream_original": "tcp://SARUN13-CVME-DBLM555:9999"},
-        {"stream": "tcp://sf-daqbuf-25:3065", "stream_original": "tcp://SARUN15-CVME-DBLM567:9999"},
-        {"stream": "tcp://sf-daqbuf-22:3066", "stream_original": "tcp://SARUN20-CVME-DBLM599:9999"}
+        {"stream": "tcp://SINEG01-CVME-DBLM009:9999"},
+        {"stream": "tcp://SINLH02-CVME-DBLM018:9999"},
+        {"stream": "tcp://SINDI02-CVME-DBLM084:9999"},
+        {"stream": "tcp://S10DI01-CVME-DBLM113:9999"},
+        {"stream": "tcp://S10CB04-CVME-DBLM130:9999"},
+        {"stream": "tcp://S10CB06-CVME-DBLM153:9999"},
+        {"stream": "tcp://S10CB08-CVME-DBLM170:9999"},
+        {"stream": "tcp://S10BC01-CVME-DBLM184:9999"},
+        {"stream": "tcp://S20CB02-CVME-DBLM234:9999"},
+        {"stream": "tcp://S20CB04-CVME-DBLM255:9999"},
+        {"stream": "tcp://S20SY03-CVME-DBLM269:9999"},
+        {"stream": "tcp://S20SY03-CVME-DBLM292:9999"},
+        {"stream": "tcp://S30CB02-CVME-DBLM310:9999"},
+        {"stream": "tcp://SATCL01-CVME-DBLM328:9999"},
+        {"stream": "tcp://SATDI01-CVME-DBLM344:9999"},
+        {"stream": "tcp://SATCB01-CVME-DBLM355:9999"},
+        {"stream": "tcp://S30CB10-CVME-DBLM381:9999"},
+        {"stream": "tcp://S30CB14-CVME-DBLM417:9999"},
+        {"stream": "tcp://SARCL02-CVME-DBLM457:9999"},
+        {"stream": "tcp://SARCL02-CVME-DBLM469:9999"},
+        {"stream": "tcp://SARMA01-CVME-DBLM482:9999"},
+        {"stream": "tcp://SARUN01-CVME-DBLM499:9999"},
+        {"stream": "tcp://SARUN04-CVME-DBLM516:9999"},
+        {"stream": "tcp://SARUN08-CVME-DBLM537:9999"},
+        {"stream": "tcp://SARUN11-CVME-DBLM546:9999"},
+        {"stream": "tcp://SARUN13-CVME-DBLM555:9999"},
+        {"stream": "tcp://SARUN15-CVME-DBLM567:9999"},
+        {"stream": "tcp://SARUN20-CVME-DBLM599:9999"}
     ]
 }
diff --git a/sources/bpm.sources b/sources/bpm.sources
index 23631c7..0762e50 100644
--- a/sources/bpm.sources
+++ b/sources/bpm.sources
@@ -1,63 +1,63 @@
 {
     "sources": [
-    {"stream": "tcp://sf-daqbuf-33:3067", "stream_original": "tcp://SIN-CVME-DBPM0421:9000"},
-    {"stream": "tcp://sf-daqbuf-26:3068", "stream_original": "tcp://SIN-CVME-DBPM0422:9000"},
-    {"stream": "tcp://sf-daqbuf-32:3069", "stream_original": "tcp://S10-CVME-DBPM1431:9000"},
-    {"stream": "tcp://sf-daqbuf-32:3070", "stream_original": "tcp://S20-CVME-DBPM2371:9000"},
-    {"stream": "tcp://sf-daqbuf-29:3071", "stream_original": "tcp://S30-CVME-DBPM3391:9000"},
-    {"stream": "tcp://sf-daqbuf-27:3072", "stream_original": "tcp://S30-CVME-DBPM3392:9000"},
-    {"stream": "tcp://sf-daqbuf-29:3073", "stream_original": "tcp://S30-CVME-DBPM4101:9000"},
-    {"stream": "tcp://sf-daqbuf-32:3074", "stream_original": "tcp://S30-CVME-DBPM4102:9000"},
-    {"stream": "tcp://sf-daqbuf-24:3075", "stream_original": "tcp://SARUN-CVME-DBPM4941:9000"},
-    {"stream": "tcp://sf-daqbuf-25:3076", "stream_original": "tcp://SARUN-CVME-DBPM4942:9000"},
-    {"stream": "tcp://sf-daqbuf-25:3077", "stream_original": "tcp://SARUN-CVME-DBPM5411:9000"},
-    {"stream": "tcp://sf-daqbuf-30:3078", "stream_original": "tcp://SARUN-CVME-DBPM5412:9000"},
+    {"stream": "tcp://SIN-CVME-DBPM0421:9000"},
+    {"stream": "tcp://SIN-CVME-DBPM0422:9000"},
+    {"stream": "tcp://S10-CVME-DBPM1431:9000"},
+    {"stream": "tcp://S20-CVME-DBPM2371:9000"},
+    {"stream": "tcp://S30-CVME-DBPM3391:9000"},
+    {"stream": "tcp://S30-CVME-DBPM3392:9000"},
+    {"stream": "tcp://S30-CVME-DBPM4101:9000"},
+    {"stream": "tcp://S30-CVME-DBPM4102:9000"},
+    {"stream": "tcp://SARUN-CVME-DBPM4941:9000"},
+    {"stream": "tcp://SARUN-CVME-DBPM4942:9000"},
+    {"stream": "tcp://SARUN-CVME-DBPM5411:9000"},
+    {"stream": "tcp://SARUN-CVME-DBPM5412:9000"},
 
-    {"stream": "tcp://sf-daqbuf-29:3079", "stream_original": "tcp://SATMA01-DBPM-DIA3761:9000"},
-    {"stream": "tcp://sf-daqbuf-29:3080", "stream_original": "tcp://SATMA01-DBPM-DIA3761:9002"},
-    {"stream": "tcp://sf-daqbuf-27:3081", "stream_original": "tcp://SATMA01-DBPM-DIA3761:9004"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3761:9000"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3761:9002"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3761:9004"},
 
-    {"stream": "tcp://sf-daqbuf-30:3082", "stream_original": "tcp://SATMA01-DBPM-DIA3901:9000"},
-    {"stream": "tcp://sf-daqbuf-21:3083", "stream_original": "tcp://SATMA01-DBPM-DIA3901:9002"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3901:9000"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3901:9002"},
     
-    {"stream": "tcp://sf-daqbuf-28:3084", "stream_original": "tcp://SATMA01-DBPM-DIA3902:9000"},
-    {"stream": "tcp://sf-daqbuf-24:3085", "stream_original": "tcp://SATMA01-DBPM-DIA3902:9002"},
-    {"stream": "tcp://sf-daqbuf-33:3086", "stream_original": "tcp://SATMA01-DBPM-DIA3902:9004"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3902:9000"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3902:9002"},
+    {"stream": "tcp://SATMA01-DBPM-DIA3902:9004"},
 
-    {"stream": "tcp://sf-daqbuf-27:3087", "stream_original": "tcp://SATMA01-DBPM-DIA4191:9000"},
-    {"stream": "tcp://sf-daqbuf-27:3088", "stream_original": "tcp://SATMA01-DBPM-DIA4191:9002"},
-    {"stream": "tcp://sf-daqbuf-31:3089", "stream_original": "tcp://SATMA01-DBPM-DIA4191:9004"},
-    {"stream": "tcp://sf-daqbuf-23:3090", "stream_original": "tcp://SATMA01-DBPM-DIA4191:9006"},
+    {"stream": "tcp://SATMA01-DBPM-DIA4191:9000"},
+    {"stream": "tcp://SATMA01-DBPM-DIA4191:9002"},
+    {"stream": "tcp://SATMA01-DBPM-DIA4191:9004"},
+    {"stream": "tcp://SATMA01-DBPM-DIA4191:9006"},
 
-    {"stream": "tcp://sf-daqbuf-27:3091", "stream_original": "tcp://SATUN04-DBPM-DIA4191:9002"},
+    {"stream": "tcp://SATUN04-DBPM-DIA4191:9002"},
 
-    {"stream": "tcp://sf-daqbuf-30:3092", "stream_original": "tcp://SATUN06-DBPM-DIA4261:9000"},
-    {"stream": "tcp://sf-daqbuf-32:3093", "stream_original": "tcp://SATUN06-DBPM-DIA4261:9002"},
-    {"stream": "tcp://sf-daqbuf-33:3094", "stream_original": "tcp://SATUN06-DBPM-DIA4261:9004"},
-    {"stream": "tcp://sf-daqbuf-32:3095", "stream_original": "tcp://SATUN06-DBPM-DIA4261:9006"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4261:9000"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4261:9002"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4261:9004"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4261:9006"},
 
-    {"stream": "tcp://sf-daqbuf-33:3096", "stream_original": "tcp://SATUN06-DBPM-DIA4262:9000"},
-    {"stream": "tcp://sf-daqbuf-27:3097", "stream_original": "tcp://SATUN06-DBPM-DIA4262:9002"},
-    {"stream": "tcp://sf-daqbuf-22:3098", "stream_original": "tcp://SATUN06-DBPM-DIA4262:9004"},
-    {"stream": "tcp://sf-daqbuf-28:3099", "stream_original": "tcp://SATUN06-DBPM-DIA4262:9006"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4262:9000"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4262:9002"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4262:9004"},
+    {"stream": "tcp://SATUN06-DBPM-DIA4262:9006"},
  
-    {"stream": "tcp://sf-daqbuf-31:3100", "stream_original": "tcp://SATUN13-DBPM-DIA4511:9000"},
-    {"stream": "tcp://sf-daqbuf-29:3101", "stream_original": "tcp://SATUN13-DBPM-DIA4511:9002"},
-    {"stream": "tcp://sf-daqbuf-22:3102", "stream_original": "tcp://SATUN13-DBPM-DIA4511:9004"},
-    {"stream": "tcp://sf-daqbuf-33:3103", "stream_original": "tcp://SATUN13-DBPM-DIA4511:9006"},
+    {"stream": "tcp://SATUN13-DBPM-DIA4511:9000"},
+    {"stream": "tcp://SATUN13-DBPM-DIA4511:9002"},
+    {"stream": "tcp://SATUN13-DBPM-DIA4511:9004"},
+    {"stream": "tcp://SATUN13-DBPM-DIA4511:9006"},
 
-    {"stream": "tcp://sf-daqbuf-23:3104", "stream_original": "tcp://SATUN17-DBPM-DIA4512:9000"},
-    {"stream": "tcp://sf-daqbuf-29:3105", "stream_original": "tcp://SATUN17-DBPM-DIA4512:9002"},
-    {"stream": "tcp://sf-daqbuf-27:3106", "stream_original": "tcp://SATUN17-DBPM-DIA4512:9004"},
-    {"stream": "tcp://sf-daqbuf-27:3107", "stream_original": "tcp://SATUN17-DBPM-DIA4512:9006"},
+    {"stream": "tcp://SATUN17-DBPM-DIA4512:9000"},
+    {"stream": "tcp://SATUN17-DBPM-DIA4512:9002"},
+    {"stream": "tcp://SATUN17-DBPM-DIA4512:9004"},
+    {"stream": "tcp://SATUN17-DBPM-DIA4512:9006"},
   
-    {"stream": "tcp://sf-daqbuf-29:3108", "stream_original": "tcp://SATUN21-DBPM-DIA4711:9004"},
-    {"stream": "tcp://sf-daqbuf-33:3109", "stream_original": "tcp://SATUN21-DBPM-DIA4711:9006"},
+    {"stream": "tcp://SATUN21-DBPM-DIA4711:9004"},
+    {"stream": "tcp://SATUN21-DBPM-DIA4711:9006"},
     
-    {"stream": "tcp://sf-daqbuf-21:3110", "stream_original": "tcp://S30CB03-SOM-DBPM420:9000"},
-    {"stream": "tcp://sf-daqbuf-28:3111", "stream_original": "tcp://S30CB03-SOM-DBPM420:9002"},
-    {"stream": "tcp://sf-daqbuf-21:3112", "stream_original": "tcp://S30CB03-SOM-DBPM420:9004"},
-    {"stream": "tcp://sf-daqbuf-26:3113", "stream_original": "tcp://S30CB03-SOM-DBPM420:9006"}
+    {"stream": "tcp://S30CB03-SOM-DBPM420:9000"},
+    {"stream": "tcp://S30CB03-SOM-DBPM420:9002"},
+    {"stream": "tcp://S30CB03-SOM-DBPM420:9004"},
+    {"stream": "tcp://S30CB03-SOM-DBPM420:9006"}
     
     ]
 }
diff --git a/sources/camserver.sources b/sources/camserver.sources
index 901e95d..45fbc24 100644
--- a/sources/camserver.sources
+++ b/sources/camserver.sources
@@ -7,68 +7,68 @@
 
 {
     "sources": [
-		{"stream": "tcp://sf-daqbuf-32:3114", "labels": ["SARFE10-PSSS059"], "stream_original": "tcp://sf-daqsync-02:8889"}
-        ,{"stream": "tcp://sf-daqbuf-31:3115", "labels": ["SARFE10-PSSS059"], "stream_original": "tcp://sf-daqsync-03:9012"}
+		{"stream": "tcp://sf-daqsync-02:8889", "labels": ["SARFE10-PSSS059"]}
+        ,{"stream": "tcp://sf-daqsync-03:9012", "labels": ["SARFE10-PSSS059"]}
 
         /* PMOS SATOP31-PMOS132-2D */
-        ,{"stream": "tcp://sf-daqbuf-30:3116", "labels": ["SATOP31-PMOS132-2D"], "stream_original": "tcp://sf-daqsync-03.psi.ch:9001"}
+        ,{"stream": "tcp://sf-daqsync-03.psi.ch:9001", "labels": ["SATOP31-PMOS132-2D"]}
 
         /* SATES21-CAMS154-M1 */
-        ,{"stream": "tcp://sf-daqbuf-30:3117", "labels": ["SATES21-CAMS154-M1"], "stream_original": "tcp://sf-daqsync-04.psi.ch:9001"}
+        ,{"stream": "tcp://sf-daqsync-04.psi.ch:9001", "labels": ["SATES21-CAMS154-M1"]}
 
         /* SATES24-CAMS161-M1 */
-        ,{"stream": "tcp://sf-daqbuf-27:3118", "labels": ["SATES24-CAMS161-M1"], "stream_original": "tcp://sf-daqsync-04.psi.ch:9011"}
+        ,{"stream": "tcp://sf-daqsync-04.psi.ch:9011", "labels": ["SATES24-CAMS161-M1"]}
 
         /* SATES21-CAMS-PATT1 */
-        ,{"stream": "tcp://sf-daqbuf-31:3119", "labels": ["SATES21-CAMS-PATT1"], "stream_original": "tcp://sf-daqsync-04.psi.ch:9003"}
+        ,{"stream": "tcp://sf-daqsync-04.psi.ch:9003", "labels": ["SATES21-CAMS-PATT1"]}
 
         /* SARES11-SPEC125-M1 */
-                ,{"stream": "tcp://sf-daqbuf-23:3120", "labels": ["SARES11-SPEC125-M1"], "stream_original": "tcp://sf-daqsync-05:9001"}
+                ,{"stream": "tcp://sf-daqsync-05:9001", "labels": ["SARES11-SPEC125-M1"]}
 
         /* SARES11-SPEC125-M2 */
-		,{"stream": "tcp://sf-daqbuf-23:3121", "labels": ["SARES11-SPEC125-M2"], "stream_original": "tcp://sf-daqsync-05:9011"}
+		,{"stream": "tcp://sf-daqsync-05:9011", "labels": ["SARES11-SPEC125-M2"]}
 		        
         /* FLEX SARES12-CAMS128-M1 */
-		,{"stream": "tcp://sf-daqbuf-29:3122", "labels": ["SARES12-CAMS128-M1"], "stream_original": "tcp://sf-daqsync-05:9003"}
+		,{"stream": "tcp://sf-daqsync-05:9003", "labels": ["SARES12-CAMS128-M1"]}
 
         /* PSEN SARES20-CAMS142-M1 */
-    	,{"stream": "tcp://sf-daqbuf-24:3123", "labels": ["SARES20-CAMS142-M1"], "stream_original": "tcp://sf-daqsync-06:9003"}
+    	,{"stream": "tcp://sf-daqsync-06:9003", "labels": ["SARES20-CAMS142-M1"]}
 
         /* PSEN SARES20-CAMS142-M4 */
-       	,{"stream": "tcp://sf-daqbuf-21:3124", "labels": ["SARES20-CAMS142-M4"], "stream_original": "tcp://sf-daqsync-06:9001"}
+       	,{"stream": "tcp://sf-daqsync-06:9001", "labels": ["SARES20-CAMS142-M4"]}
 
         /* PSEN SARES20-CAMS142-M5 */
-		,{"stream": "tcp://sf-daqbuf-33:3125", "labels": ["SARES20-CAMS142-M5"], "stream_original": "tcp://sf-daqsync-06:9011"}
+		,{"stream": "tcp://sf-daqsync-06:9011", "labels": ["SARES20-CAMS142-M5"]}
 
 		/* SARES20-PROF142-M1 */
-        ,{"stream": "tcp://sf-daqbuf-24:3126", "labels": ["SARES20-PROF142-M1"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9017"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9017", "labels": ["SARES20-PROF142-M1"]}
 
         /* SAROP21-PPRM138 pipeline */
-        ,{"stream": "tcp://sf-daqbuf-29:3127", "labels": ["SAROP21-PPRM138"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9015"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9015", "labels": ["SAROP21-PPRM138"]}
 
         /* SAROP21-PPRM102 pipeline */
-        ,{"stream": "tcp://sf-daqbuf-30:3128", "labels": ["SAROP21-PPRM102"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9007"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9007", "labels": ["SAROP21-PPRM102"]}
 
         /* SARES20-PROF141-M1 pipeline */
-        ,{"stream": "tcp://sf-daqbuf-24:3129", "labels": ["SARES20-PROF141-M1"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9016"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9016", "labels": ["SARES20-PROF141-M1"]}
 
         /* SARES20-PROF146-M1 pipeline */
-        ,{"stream": "tcp://sf-daqbuf-27:3130", "labels": ["SARES20-PROF146-M1"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9018"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9018", "labels": ["SARES20-PROF146-M1"]}
 
         /* SARES20-DSDPPRM pipeline */
-        ,{"stream": "tcp://sf-daqbuf-29:3131", "labels": ["SARES20-DSDPPRM"], "stream_original": "tcp://sf-daqsync-06.psi.ch:9014"}
+        ,{"stream": "tcp://sf-daqsync-06.psi.ch:9014", "labels": ["SARES20-DSDPPRM"]}
 
         /* SATES31-CAMS187-RIXS1 pipeline */
-        ,{"stream": "tcp://sf-daqbuf-26:3132", "labels": ["SATES31-CAMS187-RIXS1"], "stream_original": "tcp://sf-daqsync-09.psi.ch:9000"}
+        ,{"stream": "tcp://sf-daqsync-09.psi.ch:9000", "labels": ["SATES31-CAMS187-RIXS1"]}
 
         /* SARFE10-PBPS053_proc*/
-        ,{"stream": "tcp://sf-daqbuf-30:3133", "labels": ["SARFE10-PBPS053"], "stream_original": "tcp://sf-daqsync-03.psi.ch:9004"}
+        ,{"stream": "tcp://sf-daqsync-03.psi.ch:9004", "labels": ["SARFE10-PBPS053"]}
 
         /* SAROP31-PBPS149_proc*/
-        ,{"stream": "tcp://sf-daqbuf-26:3134", "labels": ["SAROP31-PBPS149"], "stream_original": "tcp://sf-daqsync-03.psi.ch:9011"}
+        ,{"stream": "tcp://sf-daqsync-03.psi.ch:9011", "labels": ["SAROP31-PBPS149"]}
 
         /* SAROP21-att01_proc*/
-        ,{"stream": "tcp://sf-daqbuf-28:3135", "labels": ["SAROP21-ATT01"], "stream_original": "tcp://sf-daqsync-03.psi.ch:9003"}
+        ,{"stream": "tcp://sf-daqsync-03.psi.ch:9003", "labels": ["SAROP21-ATT01"]}
 
 
     ]
diff --git a/sources/dwsc.sources b/sources/dwsc.sources
index 554ebd7..6fdeeb5 100644
--- a/sources/dwsc.sources
+++ b/sources/dwsc.sources
@@ -1,16 +1,16 @@
 {
 /*DWSC IOC's - Responsible: arturo alarcon, alarcon_a, 3476*/
     "sources": [
-       {"stream": "tcp://sf-daqbuf-25:3136", "stream_original": "tcp://SIN-CPPM-MOT0841:9999"},
-       {"stream": "tcp://sf-daqbuf-31:3137", "stream_original": "tcp://S10-CPPM-MOT0991:9999"},
-       {"stream": "tcp://sf-daqbuf-30:3138", "stream_original": "tcp://S10-CPPM-MOT1531:9999"},
-       {"stream": "tcp://sf-daqbuf-31:3139", "stream_original": "tcp://S10-CPPM-MOT2161:9999"},
-       {"stream": "tcp://sf-daqbuf-33:3140", "stream_original": "tcp://S20-CPPM-MOT2551:9999"},
-       {"stream": "tcp://sf-daqbuf-21:3141", "stream_original": "tcp://S30-CPPM-MOT3101:9999"},
-       {"stream": "tcp://sf-daqbuf-27:3142", "stream_original": "tcp://SAT-CPPM-MOT3391:9999"},
-       {"stream": "tcp://sf-daqbuf-33:3143", "stream_original": "tcp://SAT-CPPM-MOT4001:9999"},
-       {"stream": "tcp://sf-daqbuf-33:3144", "stream_original": "tcp://SAR-CPPM-MOT4693:9999"},
-       {"stream": "tcp://sf-daqbuf-29:3145", "stream_original": "tcp://SAT-CPPM-MOT4891:9999"},
-       {"stream": "tcp://sf-daqbuf-23:3146", "stream_original": "tcp://SAR-CPPM-MOT5631:9999"}
+       {"stream": "tcp://SIN-CPPM-MOT0841:9999"},
+       {"stream": "tcp://S10-CPPM-MOT0991:9999"},
+       {"stream": "tcp://S10-CPPM-MOT1531:9999"},
+       {"stream": "tcp://S10-CPPM-MOT2161:9999"},
+       {"stream": "tcp://S20-CPPM-MOT2551:9999"},
+       {"stream": "tcp://S30-CPPM-MOT3101:9999"},
+       {"stream": "tcp://SAT-CPPM-MOT3391:9999"},
+       {"stream": "tcp://SAT-CPPM-MOT4001:9999"},
+       {"stream": "tcp://SAR-CPPM-MOT4693:9999"},
+       {"stream": "tcp://SAT-CPPM-MOT4891:9999"},
+       {"stream": "tcp://SAR-CPPM-MOT5631:9999"}
     ]
 }
diff --git a/sources/gunlaser.sources b/sources/gunlaser.sources
index b9ae4b0..747522c 100644
--- a/sources/gunlaser.sources
+++ b/sources/gunlaser.sources
@@ -1,11 +1,11 @@
 {
 /* Laser IOC's - Responsible E. Divall */
     "sources": [
-         {"stream": "tcp://sf-daqbuf-29:3147", "stream_original": "tcp://SIN-CVME-LAS0041:9999"}
-        ,{"stream": "tcp://sf-daqbuf-33:3148", "stream_original": "tcp://SIN-CVME-LAS0042:9999"}
-        ,{"stream": "tcp://sf-daqbuf-30:3149", "stream_original": "tcp://SIN-CVME-LAS0051:9999"}
-        ,{"stream": "tcp://sf-daqbuf-24:3150", "stream_original": "tcp://SIN-CVME-LAS0051:9989"}
-        ,{"stream": "tcp://sf-daqbuf-28:3151", "stream_original": "tcp://SIN-CVME-LAS0071:9999"}
-        ,{"stream": "tcp://sf-daqbuf-21:3152", "stream_original": "tcp://SIN-CVME-LAS0201:9999"}
+         {"stream": "tcp://SIN-CVME-LAS0041:9999"}
+        ,{"stream": "tcp://SIN-CVME-LAS0042:9999"}
+        ,{"stream": "tcp://SIN-CVME-LAS0051:9999"}
+        ,{"stream": "tcp://SIN-CVME-LAS0051:9989"}
+        ,{"stream": "tcp://SIN-CVME-LAS0071:9999"}
+        ,{"stream": "tcp://SIN-CVME-LAS0201:9999"}
     ]
 }
diff --git a/sources/ict.sources b/sources/ict.sources
index 88bc0f7..033b32b 100644
--- a/sources/ict.sources
+++ b/sources/ict.sources
@@ -1,11 +1,11 @@
 {
 /*DICTs IOC's - Responsible D. Llorente */
     "sources": [
-       {"stream": "tcp://sf-daqbuf-28:3153", "stream_original": "tcp://SINEG01-CVME-DICT009:9999"},
-	   {"stream": "tcp://sf-daqbuf-26:3154", "stream_original": "tcp://S10DI01-CVME-DICT113:9999"},
-       {"stream": "tcp://sf-daqbuf-30:3155", "stream_original": "tcp://SATDI01-CVME-DICT344:9999"},
-       {"stream": "tcp://sf-daqbuf-30:3156", "stream_original": "tcp://SATBD02-CVME-DICT499:9999"},
-	   {"stream": "tcp://sf-daqbuf-24:3157", "stream_original": "tcp://SARMA01-CVME-DICT482:9999"},
-	   {"stream": "tcp://sf-daqbuf-29:3158", "stream_original": "tcp://SARBD01-CVME-DICT599:9999"}
+       {"stream": "tcp://SINEG01-CVME-DICT009:9999"},
+	   {"stream": "tcp://S10DI01-CVME-DICT113:9999"},
+       {"stream": "tcp://SATDI01-CVME-DICT344:9999"},
+       {"stream": "tcp://SATBD02-CVME-DICT499:9999"},
+	   {"stream": "tcp://SARMA01-CVME-DICT482:9999"},
+	   {"stream": "tcp://SARBD01-CVME-DICT599:9999"}
     ]
 }
diff --git a/sources/llrf.sources b/sources/llrf.sources
index 63478b6..0a19310 100644
--- a/sources/llrf.sources
+++ b/sources/llrf.sources
@@ -5,178 +5,178 @@
     - the RF interlock post-mortem sources are located / configured here https://git.psi.ch/archiver_config/sf_rf_databuffer/blob/master/sources/llrf.sources */
     "sources": [
     /*injector*/
-    {"stream": "tcp://sf-daqbuf-27:3159", "stream_original": "tcp://SINEG01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3160", "stream_original": "tcp://SINEG01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3161", "stream_original": "tcp://SINSB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-27:3162", "stream_original": "tcp://SINSB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3163", "stream_original": "tcp://SINSB02-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3164", "stream_original": "tcp://SINSB02-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3165", "stream_original": "tcp://SINSB03-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3166", "stream_original": "tcp://SINSB03-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3167", "stream_original": "tcp://SINSB04-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-33:3168", "stream_original": "tcp://SINSB04-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3169", "stream_original": "tcp://SINXB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3170", "stream_original": "tcp://SINXB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3171", "stream_original": "tcp://SINDI01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-30:3172", "stream_original": "tcp://SINDI01-CVME-LLRF2:20000"}
+    {"stream": "tcp://SINEG01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINEG01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINSB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINSB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINSB02-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINSB02-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINSB03-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINSB03-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINSB04-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINSB04-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINXB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINXB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINDI01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINDI01-CVME-LLRF2:20000"}
     
-    ,{"stream": "tcp://sf-daqbuf-21:3173", "stream_original": "tcp://SINEG01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-24:3174", "stream_original": "tcp://SINEG01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-31:3175", "stream_original": "tcp://SINSB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3176", "stream_original": "tcp://SINSB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3177", "stream_original": "tcp://SINSB02-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3178", "stream_original": "tcp://SINSB02-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3179", "stream_original": "tcp://SINSB03-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-22:3180", "stream_original": "tcp://SINSB03-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3181", "stream_original": "tcp://SINSB04-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3182", "stream_original": "tcp://SINSB04-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3183", "stream_original": "tcp://SINXB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3184", "stream_original": "tcp://SINXB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-22:3185", "stream_original": "tcp://SINDI01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-22:3186", "stream_original": "tcp://SINDI01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINEG01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINEG01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINSB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINSB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINSB02-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINSB02-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINSB03-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINSB03-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINSB04-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINSB04-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINXB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINXB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINDI01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINDI01-CVME-LLRF2:20002"}
     
-    /*,{"stream": "tcp://sf-daqbuf-21:3187", "stream_original": "tcp://SIN-CVME-LLRF:20000"}*/
+    /*,{"stream": "tcp://SIN-CVME-LLRF:20000"}*/
     
     /*linac 1*/
-    ,{"stream": "tcp://sf-daqbuf-28:3188", "stream_original": "tcp://S10CB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3189", "stream_original": "tcp://S10CB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-33:3190", "stream_original": "tcp://S10CB02-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-33:3191", "stream_original": "tcp://S10CB02-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3192", "stream_original": "tcp://S10CB03-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3193", "stream_original": "tcp://S10CB03-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3194", "stream_original": "tcp://S10CB04-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-22:3195", "stream_original": "tcp://S10CB04-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3196", "stream_original": "tcp://S10CB05-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3197", "stream_original": "tcp://S10CB05-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3198", "stream_original": "tcp://S10CB06-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3199", "stream_original": "tcp://S10CB06-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-22:3200", "stream_original": "tcp://S10CB07-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-23:3201", "stream_original": "tcp://S10CB07-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-23:3202", "stream_original": "tcp://S10CB08-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3203", "stream_original": "tcp://S10CB08-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3204", "stream_original": "tcp://S10CB09-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-23:3205", "stream_original": "tcp://S10CB09-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB02-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB02-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB03-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB03-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB04-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB04-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB05-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB05-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB06-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB06-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB07-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB07-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB08-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB08-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S10CB09-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S10CB09-CVME-LLRF2:20000"}
         
-    ,{"stream": "tcp://sf-daqbuf-31:3206", "stream_original": "tcp://S10CB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3207", "stream_original": "tcp://S10CB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-31:3208", "stream_original": "tcp://S10CB02-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3209", "stream_original": "tcp://S10CB02-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3210", "stream_original": "tcp://S10CB03-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-28:3211", "stream_original": "tcp://S10CB03-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3212", "stream_original": "tcp://S10CB04-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-26:3213", "stream_original": "tcp://S10CB04-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-29:3214", "stream_original": "tcp://S10CB05-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-28:3215", "stream_original": "tcp://S10CB05-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-22:3216", "stream_original": "tcp://S10CB06-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3217", "stream_original": "tcp://S10CB06-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-26:3218", "stream_original": "tcp://S10CB07-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-27:3219", "stream_original": "tcp://S10CB07-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-26:3220", "stream_original": "tcp://S10CB08-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-27:3221", "stream_original": "tcp://S10CB08-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-24:3222", "stream_original": "tcp://S10CB09-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3223", "stream_original": "tcp://S10CB09-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB02-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB02-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB03-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB03-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB04-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB04-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB05-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB05-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB06-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB06-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB07-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB07-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB08-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB08-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S10CB09-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S10CB09-CVME-LLRF2:20002"}
     
-    /*,{"stream": "tcp://sf-daqbuf-22:3224", "stream_original": "tcp://S10-CVME-LLRF:20000"}*/
+    /*,{"stream": "tcp://S10-CVME-LLRF:20000"}*/
     
     /*linac 2*/
-    ,{"stream": "tcp://sf-daqbuf-25:3225", "stream_original": "tcp://S20CB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-33:3226", "stream_original": "tcp://S20CB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3227", "stream_original": "tcp://S20CB02-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3228", "stream_original": "tcp://S20CB02-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-30:3229", "stream_original": "tcp://S20CB03-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3230", "stream_original": "tcp://S20CB03-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3231", "stream_original": "tcp://S20CB04-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3232", "stream_original": "tcp://S20CB04-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S20CB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S20CB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S20CB02-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S20CB02-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S20CB03-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S20CB03-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S20CB04-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S20CB04-CVME-LLRF2:20000"}
 
-    ,{"stream": "tcp://sf-daqbuf-21:3233", "stream_original": "tcp://S20CB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-27:3234", "stream_original": "tcp://S20CB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3235", "stream_original": "tcp://S20CB02-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3236", "stream_original": "tcp://S20CB02-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3237", "stream_original": "tcp://S20CB03-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3238", "stream_original": "tcp://S20CB03-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-28:3239", "stream_original": "tcp://S20CB04-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3240", "stream_original": "tcp://S20CB04-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S20CB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S20CB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S20CB02-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S20CB02-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S20CB03-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S20CB03-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S20CB04-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S20CB04-CVME-LLRF2:20002"}
     
-    /*,{"stream": "tcp://sf-daqbuf-29:3241", "stream_original": "tcp://S20-CVME-LLRF:20000"}*/
+    /*,{"stream": "tcp://S20-CVME-LLRF:20000"}*/
     
     /*linac 3*/
-    ,{"stream": "tcp://sf-daqbuf-32:3242", "stream_original": "tcp://S30CB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3243", "stream_original": "tcp://S30CB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3244", "stream_original": "tcp://S30CB02-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3245", "stream_original": "tcp://S30CB02-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3246", "stream_original": "tcp://S30CB03-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-32:3247", "stream_original": "tcp://S30CB03-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3248", "stream_original": "tcp://S30CB04-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3249", "stream_original": "tcp://S30CB04-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3250", "stream_original": "tcp://S30CB05-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3251", "stream_original": "tcp://S30CB05-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3252", "stream_original": "tcp://S30CB06-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3253", "stream_original": "tcp://S30CB06-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-27:3254", "stream_original": "tcp://S30CB07-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-32:3255", "stream_original": "tcp://S30CB07-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-30:3256", "stream_original": "tcp://S30CB08-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3257", "stream_original": "tcp://S30CB08-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3258", "stream_original": "tcp://S30CB09-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-31:3259", "stream_original": "tcp://S30CB09-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-28:3260", "stream_original": "tcp://S30CB10-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3261", "stream_original": "tcp://S30CB10-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-33:3262", "stream_original": "tcp://S30CB11-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-25:3263", "stream_original": "tcp://S30CB11-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-23:3264", "stream_original": "tcp://S30CB12-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3265", "stream_original": "tcp://S30CB12-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3266", "stream_original": "tcp://S30CB13-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-26:3267", "stream_original": "tcp://S30CB13-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-22:3268", "stream_original": "tcp://S30CB14-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-22:3269", "stream_original": "tcp://S30CB14-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB02-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB02-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB03-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB03-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB04-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB04-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB05-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB05-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB06-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB06-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB07-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB07-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB08-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB08-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB09-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB09-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB10-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB10-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB11-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB11-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB12-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB12-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB13-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB13-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://S30CB14-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://S30CB14-CVME-LLRF2:20000"}
 
-    ,{"stream": "tcp://sf-daqbuf-26:3270", "stream_original": "tcp://S30CB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3271", "stream_original": "tcp://S30CB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-33:3272", "stream_original": "tcp://S30CB02-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3273", "stream_original": "tcp://S30CB02-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-28:3274", "stream_original": "tcp://S30CB03-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3275", "stream_original": "tcp://S30CB03-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3276", "stream_original": "tcp://S30CB04-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3277", "stream_original": "tcp://S30CB04-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3278", "stream_original": "tcp://S30CB05-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3279", "stream_original": "tcp://S30CB05-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3280", "stream_original": "tcp://S30CB06-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3281", "stream_original": "tcp://S30CB06-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-24:3282", "stream_original": "tcp://S30CB07-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3283", "stream_original": "tcp://S30CB07-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-28:3284", "stream_original": "tcp://S30CB08-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-23:3285", "stream_original": "tcp://S30CB08-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-33:3286", "stream_original": "tcp://S30CB09-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3287", "stream_original": "tcp://S30CB09-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-31:3288", "stream_original": "tcp://S30CB10-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-29:3289", "stream_original": "tcp://S30CB10-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-21:3290", "stream_original": "tcp://S30CB11-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-27:3291", "stream_original": "tcp://S30CB11-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-24:3292", "stream_original": "tcp://S30CB12-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-26:3293", "stream_original": "tcp://S30CB12-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-22:3294", "stream_original": "tcp://S30CB13-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-24:3295", "stream_original": "tcp://S30CB13-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-30:3296", "stream_original": "tcp://S30CB14-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-32:3297", "stream_original": "tcp://S30CB14-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB02-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB02-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB03-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB03-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB04-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB04-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB05-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB05-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB06-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB06-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB07-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB07-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB08-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB08-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB09-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB09-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB10-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB10-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB11-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB11-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB12-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB12-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB13-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB13-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://S30CB14-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://S30CB14-CVME-LLRF2:20002"}
     
-    /*,{"stream": "tcp://sf-daqbuf-28:3298", "stream_original": "tcp://S30-CVME-LLRF:20000"}*/
+    /*,{"stream": "tcp://S30-CVME-LLRF:20000"}*/
     
     /*athos*/
-    ,{"stream": "tcp://sf-daqbuf-30:3299", "stream_original": "tcp://SATCB01-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-24:3300", "stream_original": "tcp://SATCB01-CVME-LLRF2:20000"}
-    ,{"stream": "tcp://sf-daqbuf-29:3301", "stream_original": "tcp://SATMA02-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-22:3302", "stream_original": "tcp://SATMA02-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SATCB01-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SATCB01-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SATMA02-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SATMA02-CVME-LLRF2:20000"}
 
-    ,{"stream": "tcp://sf-daqbuf-31:3303", "stream_original": "tcp://SATCB01-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-27:3304", "stream_original": "tcp://SATCB01-CVME-LLRF2:20002"}
-    ,{"stream": "tcp://sf-daqbuf-25:3305", "stream_original": "tcp://SATMA02-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-29:3306", "stream_original": "tcp://SATMA02-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SATCB01-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SATCB01-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SATMA02-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SATMA02-CVME-LLRF2:20002"}
     
     /*lab system OSFA Physiklabor in machine network*/
-    ,{"stream": "tcp://sf-daqbuf-30:3307", "stream_original": "tcp://SINEGTS-CVME-LLRF1:20000"}
-    ,{"stream": "tcp://sf-daqbuf-21:3308", "stream_original": "tcp://SINEGTS-CVME-LLRF2:20000"}
+    ,{"stream": "tcp://SINEGTS-CVME-LLRF1:20000"}
+    ,{"stream": "tcp://SINEGTS-CVME-LLRF2:20000"}
 
-    ,{"stream": "tcp://sf-daqbuf-26:3309", "stream_original": "tcp://SINEGTS-CVME-LLRF1:20002"}
-    ,{"stream": "tcp://sf-daqbuf-31:3310", "stream_original": "tcp://SINEGTS-CVME-LLRF2:20002"}
+    ,{"stream": "tcp://SINEGTS-CVME-LLRF1:20002"}
+    ,{"stream": "tcp://SINEGTS-CVME-LLRF2:20002"}
     
     ]
 }
diff --git a/sources/mps.sources b/sources/mps.sources
index 436eba8..919e5a5 100644
--- a/sources/mps.sources
+++ b/sources/mps.sources
@@ -1,5 +1,5 @@
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-27:3311", "stream_original": "tcp://SIN-CVME-MPS0151:9999"}
+        {"stream": "tcp://SIN-CVME-MPS0151:9999"}
     ]
 }
diff --git a/sources/pho_digitizer.sources b/sources/pho_digitizer.sources
index 377a54a..6f51164 100644
--- a/sources/pho_digitizer.sources
+++ b/sources/pho_digitizer.sources
@@ -1,15 +1,15 @@
 /* Frontend Digitizers - resp. Arturo Alarcon */
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-25:3312", "stream_original": "tcp://SARFE10-CVME-PHO6211:9999"},
-        {"stream": "tcp://sf-daqbuf-21:3313", "stream_original": "tcp://SARFE10-CVME-PHO6212:9999"},
-        {"stream": "tcp://sf-daqbuf-23:3314", "stream_original": "tcp://SARFE10-CVME-PBIG050:9999"},
-        {"stream": "tcp://sf-daqbuf-24:3315", "stream_original": "tcp://SAROP11-CVME-PBPS1:9999"},
-        {"stream": "tcp://sf-daqbuf-26:3316", "stream_original": "tcp://SAROP11-CVME-PBPS2:9999"},
-        {"stream": "tcp://sf-daqbuf-30:3317", "stream_original": "tcp://SAROP21-CVME-PBPS1:9999"},
-        {"stream": "tcp://sf-daqbuf-21:3318", "stream_original": "tcp://SAROP21-CVME-PBPS2:9999"},
-        {"stream": "tcp://sf-daqbuf-23:3319", "stream_original": "tcp://SAROP21-CVME-PBPS3:9999"},
-        {"stream": "tcp://sf-daqbuf-26:3320", "stream_original": "tcp://SAROP31-CVME-PBPS149:9999"}
+        {"stream": "tcp://SARFE10-CVME-PHO6211:9999"},
+        {"stream": "tcp://SARFE10-CVME-PHO6212:9999"},
+        {"stream": "tcp://SARFE10-CVME-PBIG050:9999"},
+        {"stream": "tcp://SAROP11-CVME-PBPS1:9999"},
+        {"stream": "tcp://SAROP11-CVME-PBPS2:9999"},
+        {"stream": "tcp://SAROP21-CVME-PBPS1:9999"},
+        {"stream": "tcp://SAROP21-CVME-PBPS2:9999"},
+        {"stream": "tcp://SAROP21-CVME-PBPS3:9999"},
+        {"stream": "tcp://SAROP31-CVME-PBPS149:9999"}
         
     ]
 }
diff --git a/sources/pho_keysight.sources b/sources/pho_keysight.sources
index 8e81a1e..dcaa119 100644
--- a/sources/pho_keysight.sources
+++ b/sources/pho_keysight.sources
@@ -1,10 +1,10 @@
 /* Responsible Edwin Divall */
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-28:3321", "stream_original": "tcp://SAROP11-CPCL-PALM118:9990"}
-        ,{"stream": "tcp://sf-daqbuf-25:3322", "stream_original": "tcp://SAROP11-CPCL-PALM118:9999"}
+        {"stream": "tcp://SAROP11-CPCL-PALM118:9990"}
+        ,{"stream": "tcp://SAROP11-CPCL-PALM118:9999"}
         /* temporarily moved to different IP:  */
-        /*,{"stream": "tcp://sf-daqbuf-25:3323", "stream_original": "tcp://SAROP21-CPCL-PALM134:9999"}*/
-        ,{"stream": "tcp://sf-daqbuf-32:3324", "stream_original": "tcp://172.26.2.89:9999"}
+        /*,{"stream": "tcp://SAROP21-CPCL-PALM134:9999"}*/
+        ,{"stream": "tcp://172.26.2.89:9999"}
     ]
 }
diff --git a/sources/pumplaser.sources b/sources/pumplaser.sources
index 9f5dbcc..9cd288a 100644
--- a/sources/pumplaser.sources
+++ b/sources/pumplaser.sources
@@ -1,9 +1,9 @@
 {
 /* Laser IOC's - Responsible E. Divall */
     "sources": [
-         {"stream": "tcp://sf-daqbuf-22:3325", "stream_original": "tcp://SLAAR-CVME-LAS6861:9999"}
-        ,{"stream": "tcp://sf-daqbuf-27:3326", "stream_original": "tcp://SLAAR-CVME-LAS6861:9989"}
-        ,{"stream": "tcp://sf-daqbuf-30:3327", "stream_original": "tcp://SLAAR-CVME-LAS6891:9999"}
-        ,{"stream": "tcp://sf-daqbuf-26:3328", "stream_original": "tcp://SLAAR-CVME-LAS6891:9989"}
+         {"stream": "tcp://SLAAR-CVME-LAS6861:9999"}
+        ,{"stream": "tcp://SLAAR-CVME-LAS6861:9989"}
+        ,{"stream": "tcp://SLAAR-CVME-LAS6891:9999"}
+        ,{"stream": "tcp://SLAAR-CVME-LAS6891:9989"}
     ]
 }
diff --git a/sources/rf_interlock.sources b/sources/rf_interlock.sources
index e2684ca..7864ed3 100644
--- a/sources/rf_interlock.sources
+++ b/sources/rf_interlock.sources
@@ -2,49 +2,49 @@
 /*LLRF's RF Interlock IOC's with bsread streaming from IOC (=port:9999)*/
 	"sources": [
 /*injector*/
-		 {"stream": "tcp://sf-daqbuf-32:3329", "stream_original": "tcp://SINEG01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-30:3330", "stream_original": "tcp://SINSB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-29:3331", "stream_original": "tcp://SINSB02-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-33:3332", "stream_original": "tcp://SINSB03-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3333", "stream_original": "tcp://SINSB04-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-25:3334", "stream_original": "tcp://SINXB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3335", "stream_original": "tcp://SINDI01-CVME-ILK:9999"}
+		 {"stream": "tcp://SINEG01-CVME-ILK:9999"}
+		,{"stream": "tcp://SINSB01-CVME-ILK:9999"}
+		,{"stream": "tcp://SINSB02-CVME-ILK:9999"}
+		,{"stream": "tcp://SINSB03-CVME-ILK:9999"}
+		,{"stream": "tcp://SINSB04-CVME-ILK:9999"}
+		,{"stream": "tcp://SINXB01-CVME-ILK:9999"}
+		,{"stream": "tcp://SINDI01-CVME-ILK:9999"}
 /*linac 1*/
-		,{"stream": "tcp://sf-daqbuf-33:3336", "stream_original": "tcp://S10CB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3337", "stream_original": "tcp://S10CB02-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3338", "stream_original": "tcp://S10CB03-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-23:3339", "stream_original": "tcp://S10CB04-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-23:3340", "stream_original": "tcp://S10CB05-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-24:3341", "stream_original": "tcp://S10CB06-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3342", "stream_original": "tcp://S10CB07-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-25:3343", "stream_original": "tcp://S10CB08-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-25:3344", "stream_original": "tcp://S10CB09-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB01-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB02-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB03-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB04-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB05-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB06-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB07-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB08-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CB09-CVME-ILK:9999"}
 /*linac 2*/
-		,{"stream": "tcp://sf-daqbuf-33:3345", "stream_original": "tcp://S20CB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-26:3346", "stream_original": "tcp://S20CB02-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3347", "stream_original": "tcp://S20CB03-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3348", "stream_original": "tcp://S20CB04-CVME-ILK:9999"}
+		,{"stream": "tcp://S20CB01-CVME-ILK:9999"}
+		,{"stream": "tcp://S20CB02-CVME-ILK:9999"}
+		,{"stream": "tcp://S20CB03-CVME-ILK:9999"}
+		,{"stream": "tcp://S20CB04-CVME-ILK:9999"}
 /*linac 3*/
-		,{"stream": "tcp://sf-daqbuf-25:3349", "stream_original": "tcp://S30CB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-27:3350", "stream_original": "tcp://S30CB02-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-26:3351", "stream_original": "tcp://S30CB03-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-26:3352", "stream_original": "tcp://S30CB04-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3353", "stream_original": "tcp://S30CB05-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-26:3354", "stream_original": "tcp://S30CB06-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-25:3355", "stream_original": "tcp://S30CB07-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3356", "stream_original": "tcp://S30CB08-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3357", "stream_original": "tcp://S30CB09-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-32:3358", "stream_original": "tcp://S30CB10-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3359", "stream_original": "tcp://S30CB11-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-23:3360", "stream_original": "tcp://S30CB12-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-31:3361", "stream_original": "tcp://S30CB13-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-32:3362", "stream_original": "tcp://S30CB14-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB01-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB02-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB03-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB04-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB05-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB06-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB07-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB08-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB09-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB10-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB11-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB12-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB13-CVME-ILK:9999"}
+		,{"stream": "tcp://S30CB14-CVME-ILK:9999"}
 /*athos*/
-		,{"stream": "tcp://sf-daqbuf-22:3363", "stream_original": "tcp://SATCB01-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-22:3364", "stream_original": "tcp://SATMA02-CVME-ILK:9999"}
+		,{"stream": "tcp://SATCB01-CVME-ILK:9999"}
+		,{"stream": "tcp://SATMA02-CVME-ILK:9999"}
 /*lab system OSFA Physiklabor in machine network*/
-		,{"stream": "tcp://sf-daqbuf-26:3365", "stream_original": "tcp://SINEGTS-CVME-ILK:9999"}
-		/*,{"stream": "tcp://sf-daqbuf-22:3366", "stream_original": "tcp://SINSBTS-CVME-ILK:9999"}
-		,{"stream": "tcp://sf-daqbuf-27:3367", "stream_original": "tcp://S10CBTS-CVME-ILK:9999"}*/
+		,{"stream": "tcp://SINEGTS-CVME-ILK:9999"}
+		/*,{"stream": "tcp://SINSBTS-CVME-ILK:9999"}
+		,{"stream": "tcp://S10CBTS-CVME-ILK:9999"}*/
 	]
 }
diff --git a/sources/rf_modulator.sources b/sources/rf_modulator.sources
index 512ea2e..2165777 100644
--- a/sources/rf_modulator.sources
+++ b/sources/rf_modulator.sources
@@ -2,36 +2,36 @@
 /*LLRF's RF Interlock IOC's with bsread streaming from HV modulator over EtherCAT bridge (=port:9000)*/
 	"sources": [
 /*linac 1*/
-		/* {"stream": "tcp://sf-daqbuf-22:3368", "stream_original": "tcp://S10CB01-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-27:3369", "stream_original": "tcp://S10CB02-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-22:3370", "stream_original": "tcp://S10CB03-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3371", "stream_original": "tcp://S10CB04-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3372", "stream_original": "tcp://S10CB05-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-26:3373", "stream_original": "tcp://S10CB06-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-22:3374", "stream_original": "tcp://S10CB07-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-32:3375", "stream_original": "tcp://S10CB08-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-32:3376", "stream_original": "tcp://S10CB09-CVME-ILK:9000"}*/
+		/* {"stream": "tcp://S10CB01-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB02-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB03-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB04-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB05-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB06-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB07-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB08-CVME-ILK:9000"}
+		,{"stream": "tcp://S10CB09-CVME-ILK:9000"}*/
 /*linac 2*/
-		/*,{"stream": "tcp://sf-daqbuf-23:3377", "stream_original": "tcp://S20CB01-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-28:3378", "stream_original": "tcp://S20CB02-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3379", "stream_original": "tcp://S20CB03-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-32:3380", "stream_original": "tcp://S20CB04-CVME-ILK:9000"}*/
+		/*,{"stream": "tcp://S20CB01-CVME-ILK:9000"}
+		,{"stream": "tcp://S20CB02-CVME-ILK:9000"}
+		,{"stream": "tcp://S20CB03-CVME-ILK:9000"}
+		,{"stream": "tcp://S20CB04-CVME-ILK:9000"}*/
 /*linac 3*/
-		{"stream": "tcp://sf-daqbuf-32:3381", "stream_original": "tcp://S30CB01-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-25:3382", "stream_original": "tcp://S30CB02-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-32:3383", "stream_original": "tcp://S30CB03-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3384", "stream_original": "tcp://S30CB04-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-25:3385", "stream_original": "tcp://S30CB05-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-27:3386", "stream_original": "tcp://S30CB06-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-26:3387", "stream_original": "tcp://S30CB07-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-33:3388", "stream_original": "tcp://S30CB08-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-33:3389", "stream_original": "tcp://S30CB09-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3390", "stream_original": "tcp://S30CB10-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-28:3391", "stream_original": "tcp://S30CB11-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-26:3392", "stream_original": "tcp://S30CB12-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3393", "stream_original": "tcp://S30CB13-CVME-ILK:9000"}
+		{"stream": "tcp://S30CB01-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB02-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB03-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB04-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB05-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB06-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB07-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB08-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB09-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB10-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB11-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB12-CVME-ILK:9000"}
+		,{"stream": "tcp://S30CB13-CVME-ILK:9000"}
 	]
 /*athos*/
-                /*,{"stream": "tcp://sf-daqbuf-23:3394", "stream_original": "tcp://SATCB01-CVME-ILK:9000"}
-		,{"stream": "tcp://sf-daqbuf-23:3395", "stream_original": "tcp://SATMA02-CVME-ILK:9000"}*/
+                /*,{"stream": "tcp://SATCB01-CVME-ILK:9000"}
+		,{"stream": "tcp://SATMA02-CVME-ILK:9000"}*/
 }
diff --git a/sources/spectrometer.sources b/sources/spectrometer.sources
index fc9fb4d..72d1327 100644
--- a/sources/spectrometer.sources
+++ b/sources/spectrometer.sources
@@ -1,6 +1,6 @@
 /* Optical spectrometer - Responsible Helge Brands */
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-26:3396", "stream_original": "tcp://sf-sioc-cs-61:9030"}
+        {"stream": "tcp://sf-sioc-cs-61:9030"}
     ]
 }
diff --git a/sources/timing.sources b/sources/timing.sources
index da1e25e..7040def 100644
--- a/sources/timing.sources
+++ b/sources/timing.sources
@@ -2,12 +2,12 @@
 /* ========================================================= */
 {
     "sources": [
-        {"stream": "tcp://sf-daqbuf-24:3397", "stream_original": "tcp://SIN-CVME-TIFGUN:9999"}
-        ,{"stream": "tcp://sf-daqbuf-33:3398", "stream_original": "tcp://SFTEST-CVME-CON1331:9999"}
-        ,{"stream": "tcp://sf-daqbuf-24:3399", "stream_original": "tcp://SAR-CVME-TIFALL4:9999"}
-        ,{"stream": "tcp://sf-daqbuf-27:3400", "stream_original": "tcp://SAR-CVME-TIFALL5:9999"}
-        ,{"stream": "tcp://sf-daqbuf-28:3401", "stream_original": "tcp://SAR-CVME-TIFALL6:9999"}
-        ,{"stream": "tcp://sf-daqbuf-28:3402", "stream_original": "tcp://SAT-CVME-TIFALL5:9999"}
-        ,{"stream": "tcp://sf-daqbuf-28:3403", "stream_original": "tcp://SAT-CVME-TIFALL6:9999"}
+        {"stream": "tcp://SIN-CVME-TIFGUN:9999"}
+        ,{"stream": "tcp://SFTEST-CVME-CON1331:9999"}
+        ,{"stream": "tcp://SAR-CVME-TIFALL4:9999"}
+        ,{"stream": "tcp://SAR-CVME-TIFALL5:9999"}
+        ,{"stream": "tcp://SAR-CVME-TIFALL6:9999"}
+        ,{"stream": "tcp://SAT-CVME-TIFALL5:9999"}
+        ,{"stream": "tcp://SAT-CVME-TIFALL6:9999"}
     ]
 }