diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1.parset b/Appl/CEP/CS1/CS1_Run/src/CS1.parset
index 512bc850fd4febd331c09135c2616fc0f4be7b2d..2ec52cb12ce8fe6a09d5ddc1005383dbc0820cd4 100644
--- a/Appl/CEP/CS1/CS1_Run/src/CS1.parset
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1.parset
@@ -14,7 +14,7 @@ OLAP.DelayComp.hostname = list001
 # The ports for all (socket)connections
 
 OLAP.OLAP_Conn.AMCServerPort = 31337
-OLAP.DelayComp.ports = [7200..7220]
+OLAP.DelayComp.ports = [7200..7263]
 OLAP.OLAP_Conn.input_BGLProc_Ports = [8100..8163]
 OLAP.OLAP_Conn.BGLProc_Storage_Ports = [8300..8363]
 OLAP.firstInputPortnr = 4346
diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
index f4970448e508a744f619017f6ffc210f66fbe5b7..c064a54ea82eaa3745cc756986857945edb79643 100644
--- a/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
@@ -81,6 +81,24 @@ CS016_dipole10 = [Station('CS016_dipole10')]
 CS016_dipole14 = [Station('CS016_dipole14')]
 CS016_4dipoles2_6_10_14 = CS016_dipole2 + CS016_dipole6 + CS016_dipole10 + CS016_dipole14
 
+CS030_dipole0  = [Station('CS030_dipole0')]
+CS030_dipole7  = [Station('CS030_dipole7')]
+CS030_dipole10 = [Station('CS030_dipole10')]
+CS030_dipole14 = [Station('CS030_dipole14')]
+CS030_4dipoles = CS030_dipole0 + CS030_dipole7 + CS030_dipole10 + CS030_dipole14
+
+CS031_dipole16 = [Station('CS031_dipole16')]
+CS031_dipole22 = [Station('CS031_dipole22')]
+CS031_dipole24 = [Station('CS031_dipole24')]
+CS031_dipole31 = [Station('CS031_dipole31')]
+CS031_4dipoles = CS031_dipole16 + CS031_dipole22 + CS031_dipole24 + CS031_dipole31
+
+CS032_dipole34 = [Station('CS032_dipole34')]
+CS032_dipole37 = [Station('CS032_dipole37')]
+CS032_dipole42 = [Station('CS032_dipole42')]
+CS032_dipole46 = [Station('CS032_dipole46')]
+CS032_4dipoles = CS032_dipole34 + CS032_dipole37 + CS032_dipole42 + CS032_dipole46
+
 CS010_us0  = [Station('CS010_us0')]
 CS010_us1  = [Station('CS010_us1')]
 CS010_us2  = [Station('CS010_us2')]
@@ -109,3 +127,6 @@ AllMicroStations = CS010_4us + CS001_4us + CS008_4us + CS016_4us
 AllDipoles0_4_8_12 = CS010_4dipoles0_4_8_12 + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
 AllDipolesMixed = CS010_4dipoles0_4_8_12 + CS001_4dipoles2_6_10_14 + CS008_4dipoles2_6_10_14 + CS016_4dipoles2_6_10_14
 AllHBAs = CS010_HBAs + CS001_HBAs + CS008_HBAs + CS016_HBAs
+Mixed = CS010_us0 + CS010_dipole4 + CS010_dipole8 + CS010_dipole12 + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
+All24Dipoles = CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12 + CS030_4dipoles + CS031_4dipoles + CS032_4dipoles
+Test = CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
diff --git a/Appl/CEP/CS1/CS1_Run/src/OLAP.parset b/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
index 2f3b72abfa55e894713f975c9fd41a05aa3b0cf0..854208b32b7d5725aeeff6f8e6fe748877ee72e4 100644
--- a/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
+++ b/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
@@ -5,6 +5,169 @@ PIC.Core.CS010.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
 PIC.Core.CS008.phaseCenter = [0.119875714863, 0.920290262694, 6364620.51091]
 PIC.Core.CS001.phaseCenter = [0.119858559246, 0.920235787778, 6364622.29921]
 PIC.Core.CS016.phaseCenter = [0.119965884875, 0.920263367124, 6364621.33052]
+PIC.Core.CS030.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS031.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS032.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+
+#new phase centers; need to synchronize with the stations
+#PIC.Core.CS001.phaseCenter = [0.119858391986, 0.920235296277, 6364622.34733]
+#PIC.Core.CS008.phaseCenter = [0.119884048326, 0.920287750732, 6364620.64062]
+#PIC.Core.CS010.phaseCenter = [0.119884571924, 0.920263271879, 6364621.23448]
+#PIC.Core.CS016.phaseCenter = [0.119965904268, 0.920263271948, 6364621.36948]
+#PIC.Core.CS030.phaseCenter = [0.119884571924, 0.920263271879, 6364621.23448]
+#PIC.Core.CS031.phaseCenter = [0.119884571924, 0.920263271879, 6364621.23448]
+#PIC.Core.CS032.phaseCenter = [0.119884571924, 0.920263271879, 6364621.23448]
+
+PIC.Core.CS001_dipole0.position = [0.119851061603, 0.920235296278, 6364622.34933]
+PIC.Core.CS001_dipole1.position = [0.119851934267, 0.920237044779, 6364622.33234]
+PIC.Core.CS001_dipole2.position = [0.119852981465, 0.92023529628, 6364622.35333]
+PIC.Core.CS001_dipole3.position = [0.119851934267, 0.920235296279, 6364622.35233]
+PIC.Core.CS001_dipole4.position = [0.119857693854, 0.92024054175, 6364622.23536]
+PIC.Core.CS001_dipole5.position = [0.119858566519, 0.920240541747, 6364622.22836]
+PIC.Core.CS001_dipole6.position = [0.119859439183, 0.920240541755, 6364622.24536]
+PIC.Core.CS001_dipole7.position = [0.119858566519, 0.920238793259, 6364622.27335]
+PIC.Core.CS001_dipole8.position = [0.119863977039, 0.920235296262, 6364622.31833]
+PIC.Core.CS001_dipole9.position = [0.119865024237, 0.92023704477, 6364622.31334]
+PIC.Core.CS001_dipole10.position = [0.119865896901, 0.920235296272, 6364622.33833]
+PIC.Core.CS001_dipole11.position = [0.119864849704, 0.920235296275, 6364622.34433]
+PIC.Core.CS001_dipole12.position = [0.119857344788, 0.920231799293, 6364622.41931]
+PIC.Core.CS001_dipole13.position = [0.119858391986, 0.920231799297, 6364622.42731]
+PIC.Core.CS001_dipole14.position = [0.11985926465, 0.920231799295, 6364622.42431]
+PIC.Core.CS001_dipole15.position = [0.119858391986, 0.920231799293, 6364622.41931]
+
+PIC.Core.CS008_dipole0.position = [0.119868340362, 0.920291247693, 6364620.51764]
+PIC.Core.CS008_dipole1.position = [0.119869213027, 0.920291247697, 6364620.52664]
+PIC.Core.CS008_dipole2.position = [0.119870085692, 0.920289499199, 6364620.55363]
+PIC.Core.CS008_dipole3.position = [0.119869213027, 0.920289499202, 6364620.55863]
+PIC.Core.CS008_dipole4.position = [0.119874972614, 0.920294744687, 6364620.46066]
+PIC.Core.CS008_dipole5.position = [0.119875845278, 0.920294744689, 6364620.46466]
+PIC.Core.CS008_dipole6.position = [0.119876717943, 0.920294744688, 6364620.46366]
+PIC.Core.CS008_dipole7.position = [0.119875845278, 0.920292996194, 6364620.49765]
+PIC.Core.CS008_dipole8.position = [0.11989801096, 0.920286002266, 6364620.72861]
+PIC.Core.CS008_dipole9.position = [0.119899058157, 0.920286002257, 6364620.71161]
+PIC.Core.CS008_dipole10.position = [0.119899930822, 0.920286002248, 6364620.69461]
+PIC.Core.CS008_dipole11.position = [0.119898883624, 0.920286002256, 6364620.71061]
+PIC.Core.CS008_dipole12.position = [0.119891378708, 0.920282505287, 6364620.81559]
+PIC.Core.CS008_dipole13.position = [0.119892425906, 0.920282505285, 6364620.81059]
+PIC.Core.CS008_dipole14.position = [0.119893298571, 0.920282505263, 6364620.76859]
+PIC.Core.CS008_dipole15.position = [0.119892251373, 0.920282505277, 6364620.79559]
+
+PIC.Core.CS010_dipole0.position = [0.119881255799, 0.920263271867, 6364621.21048]
+PIC.Core.CS010_dipole1.position = [0.119881081266, 0.920263271878, 6364621.23348]
+PIC.Core.CS010_dipole2.position = [0.119880383134, 0.920263271876, 6364621.22848]
+PIC.Core.CS010_dipole3.position = [0.119880208601, 0.920263271874, 6364621.22548]
+PIC.Core.CS010_dipole4.position = [0.119888760715, 0.92026502038, 6364621.21449]
+PIC.Core.CS010_dipole5.position = [0.119888411649, 0.920266768872, 6364621.1785]
+PIC.Core.CS010_dipole6.position = [0.11989085511, 0.920265020383, 6364621.22149]
+PIC.Core.CS010_dipole7.position = [0.11989085511, 0.920266768869, 6364621.1715]
+PIC.Core.CS010_dipole8.position = [0.119879859535, 0.920261523396, 6364621.28847]
+PIC.Core.CS010_dipole9.position = [0.119879335937, 0.920261523393, 6364621.28347]
+PIC.Core.CS010_dipole10.position = [0.119878637805, 0.9202597749, 6364621.31846]
+PIC.Core.CS010_dipole11.position = [0.11987776514, 0.920261523398, 6364621.29247]
+PIC.Core.CS010_dipole12.position = [0.119885619122, 0.920263271866, 6364621.20948]
+PIC.Core.CS010_dipole13.position = [0.119884048326, 0.920265020376, 6364621.20649]
+PIC.Core.CS010_dipole14.position = [0.119884048326, 0.920265020367, 6364621.19049]
+PIC.Core.CS010_dipole15.position = [0.119885270056, 0.920265020366, 6364621.18849]
+PIC.Core.CS010_dipole16.position = [0.119883350194, 0.920265020364, 6364621.18349]
+PIC.Core.CS010_dipole17.position = [0.119882128463, 0.920265020366, 6364621.18849]
+PIC.Core.CS010_dipole18.position = [0.119882652062, 0.920266768862, 6364621.1595]
+PIC.Core.CS010_dipole19.position = [0.119881430332, 0.920266768849, 6364621.1335]
+PIC.Core.CS010_dipole20.position = [0.119887538984, 0.920261523377, 6364621.25247]
+PIC.Core.CS010_dipole21.position = [0.119885793655, 0.920259774903, 6364621.32446]
+PIC.Core.CS010_dipole22.position = [0.119888760715, 0.920259774902, 6364621.32246]
+PIC.Core.CS010_dipole23.position = [0.119885793655, 0.920259774902, 6364621.32246]
+PIC.Core.CS010_dipole24.position = [0.119882826595, 0.92026152338, 6364621.25847]
+PIC.Core.CS010_dipole25.position = [0.119881779398, 0.920261523389, 6364621.27647]
+PIC.Core.CS010_dipole26.position = [0.119883175661, 0.920261523383, 6364621.26347]
+PIC.Core.CS010_dipole27.position = [0.119882826595, 0.920259774877, 6364621.27346]
+PIC.Core.CS010_dipole28.position = [0.119889807912, 0.920263271881, 6364621.23848]
+PIC.Core.CS010_dipole29.position = [0.119890680577, 0.920263271888, 6364621.25248]
+PIC.Core.CS010_dipole30.position = [0.119890156978, 0.920261523386, 6364621.26947]
+PIC.Core.CS010_dipole31.position = [0.119891727774, 0.920261523378, 6364621.25447]
+PIC.Core.CS010_dipole32.position = [0.119883001128, 0.920266768856, 6364621.1465]
+PIC.Core.CS010_dipole33.position = [0.119884571924, 0.920266768859, 6364621.1535]
+PIC.Core.CS010_dipole34.position = [0.119884222859, 0.920268517355, 6364621.12251]
+PIC.Core.CS010_dipole35.position = [0.119882652062, 0.920268517355, 6364621.12251]
+PIC.Core.CS010_dipole36.position = [0.119886491787, 0.92026327188, 6364621.23748]
+PIC.Core.CS010_dipole37.position = [0.119886840852, 0.920265020355, 6364621.16549]
+PIC.Core.CS010_dipole38.position = [0.119887364451, 0.920263271882, 6364621.24148]
+PIC.Core.CS010_dipole39.position = [0.11988788805, 0.920263271883, 6364621.24248]
+PIC.Core.CS010_dipole40.position = [0.119877939673, 0.920263271878, 6364621.23348]
+PIC.Core.CS010_dipole41.position = [0.119878986871, 0.920265020372, 6364621.20049]
+PIC.Core.CS010_dipole42.position = [0.119876717943, 0.920265020377, 6364621.20849]
+PIC.Core.CS010_dipole43.position = [0.119877939673, 0.920266768867, 6364621.1685]
+PIC.Core.CS010_dipole44.position = [0.119885619122, 0.920263271884, 6364621.24448]
+PIC.Core.CS010_dipole45.position = [0.119886666319, 0.92026152339, 6364621.27747]
+PIC.Core.CS010_dipole46.position = [0.11988492099, 0.920261523389, 6364621.27547]
+PIC.Core.CS010_dipole47.position = [0.119886317254, 0.920261523385, 6364621.26847]
+
+PIC.Core.CS016_dipole0.position = [0.119958573885, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole1.position = [0.119959446549, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole2.position = [0.119960319214, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole3.position = [0.119959446549, 0.920263271944, 6364621.36248]
+PIC.Core.CS016_dipole4.position = [0.119965206136, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole5.position = [0.1199660788, 0.920268517423, 6364621.25651]
+PIC.Core.CS016_dipole6.position = [0.119966951465, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole7.position = [0.1199660788, 0.92026676893, 6364621.2925]
+PIC.Core.CS016_dipole8.position = [0.119971489321, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole9.position = [0.119972536519, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole10.position = [0.119973409183, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole11.position = [0.119972361986, 0.920263271948, 6364621.37048]
+PIC.Core.CS016_dipole12.position = [0.11996485707, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole13.position = [0.119965904268, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole14.position = [0.119966776932, 0.920259774969, 6364621.45346]
+PIC.Core.CS016_dipole15.position = [0.119965729735, 0.920258026476, 6364621.48945]
+
+PIC.Core.CS030_dipole0.position = [0.119881255799, 0.920263271867, 6364621.21048]
+PIC.Core.CS030_dipole1.position = [0.119881081266, 0.920263271878, 6364621.23348]
+PIC.Core.CS030_dipole2.position = [0.119880383134, 0.920263271876, 6364621.22848]
+PIC.Core.CS030_dipole3.position = [0.119880208601, 0.920263271874, 6364621.22548]
+PIC.Core.CS030_dipole4.position = [0.119888760715, 0.92026502038, 6364621.21449]
+PIC.Core.CS030_dipole5.position = [0.119888411649, 0.920266768872, 6364621.1785]
+PIC.Core.CS030_dipole6.position = [0.11989085511, 0.920265020383, 6364621.22149]
+PIC.Core.CS030_dipole7.position = [0.11989085511, 0.920266768869, 6364621.1715]
+PIC.Core.CS030_dipole8.position = [0.119879859535, 0.920261523396, 6364621.28847]
+PIC.Core.CS030_dipole9.position = [0.119879335937, 0.920261523393, 6364621.28347]
+PIC.Core.CS030_dipole10.position = [0.119878637805, 0.9202597749, 6364621.31846]
+PIC.Core.CS030_dipole11.position = [0.11987776514, 0.920261523398, 6364621.29247]
+PIC.Core.CS030_dipole12.position = [0.119885619122, 0.920263271866, 6364621.20948]
+PIC.Core.CS030_dipole13.position = [0.119884048326, 0.920265020376, 6364621.20649]
+PIC.Core.CS030_dipole14.position = [0.119884048326, 0.920265020367, 6364621.19049]
+PIC.Core.CS030_dipole15.position = [0.119885270056, 0.920265020366, 6364621.18849]
+
+PIC.Core.CS031_dipole16.position = [0.119883350194, 0.920265020364, 6364621.18349]
+PIC.Core.CS031_dipole17.position = [0.119882128463, 0.920265020366, 6364621.18849]
+PIC.Core.CS031_dipole18.position = [0.119882652062, 0.920266768862, 6364621.1595]
+PIC.Core.CS031_dipole19.position = [0.119881430332, 0.920266768849, 6364621.1335]
+PIC.Core.CS031_dipole20.position = [0.119887538984, 0.920261523377, 6364621.25247]
+PIC.Core.CS031_dipole21.position = [0.119885793655, 0.920259774903, 6364621.32446]
+PIC.Core.CS031_dipole22.position = [0.119888760715, 0.920259774902, 6364621.32246]
+PIC.Core.CS031_dipole23.position = [0.119885793655, 0.920259774902, 6364621.32246]
+PIC.Core.CS031_dipole24.position = [0.119882826595, 0.92026152338, 6364621.25847]
+PIC.Core.CS031_dipole25.position = [0.119881779398, 0.920261523389, 6364621.27647]
+PIC.Core.CS031_dipole26.position = [0.119883175661, 0.920261523383, 6364621.26347]
+PIC.Core.CS031_dipole27.position = [0.119882826595, 0.920259774877, 6364621.27346]
+PIC.Core.CS031_dipole28.position = [0.119889807912, 0.920263271881, 6364621.23848]
+PIC.Core.CS031_dipole29.position = [0.119890680577, 0.920263271888, 6364621.25248]
+PIC.Core.CS031_dipole30.position = [0.119890156978, 0.920261523386, 6364621.26947]
+PIC.Core.CS031_dipole31.position = [0.119891727774, 0.920261523378, 6364621.25447]
+
+PIC.Core.CS032_dipole32.position = [0.119883001128, 0.920266768856, 6364621.1465]
+PIC.Core.CS032_dipole33.position = [0.119884571924, 0.920266768859, 6364621.1535]
+PIC.Core.CS032_dipole34.position = [0.119884222859, 0.920268517355, 6364621.12251]
+PIC.Core.CS032_dipole35.position = [0.119882652062, 0.920268517355, 6364621.12251]
+PIC.Core.CS032_dipole36.position = [0.119886491787, 0.92026327188, 6364621.23748]
+PIC.Core.CS032_dipole37.position = [0.119886840852, 0.920265020355, 6364621.16549]
+PIC.Core.CS032_dipole38.position = [0.119887364451, 0.920263271882, 6364621.24148]
+PIC.Core.CS032_dipole39.position = [0.11988788805, 0.920263271883, 6364621.24248]
+PIC.Core.CS032_dipole40.position = [0.119877939673, 0.920263271878, 6364621.23348]
+PIC.Core.CS032_dipole41.position = [0.119878986871, 0.920265020372, 6364621.20049]
+PIC.Core.CS032_dipole42.position = [0.119876717943, 0.920265020377, 6364621.20849]
+PIC.Core.CS032_dipole43.position = [0.119877939673, 0.920266768867, 6364621.1685]
+PIC.Core.CS032_dipole44.position = [0.119885619122, 0.920263271884, 6364621.24448]
+PIC.Core.CS032_dipole45.position = [0.119886666319, 0.92026152339, 6364621.27747]
+PIC.Core.CS032_dipole46.position = [0.11988492099, 0.920261523389, 6364621.27547]
+PIC.Core.CS032_dipole47.position = [0.119886317254, 0.920261523385, 6364621.26847]
 
 PIC.Core.CS010_HBA0.position = [0.119881248042,  0.920262545738, 6364621.18843]
 PIC.Core.CS010_HBA1.position = [0.119888779622,  0.920265564336, 6364621.16629]
@@ -98,41 +261,6 @@ PIC.Core.CS016_us1.port  = lii011:4347
 PIC.Core.CS016_us2.port  = lii012:4348
 PIC.Core.CS016_us3.port  = lii012:4349
 
-PIC.Core.CS010_dipole0.position  = [0.119881248042,  0.920262545738, 6364621.18843]
-PIC.Core.CS010_dipole4.position  = [0.119888779622,  0.920265564336, 6364621.16629]
-PIC.Core.CS010_dipole8.position  = [0.119879764027,  0.920262155263, 6364621.23847]
-PIC.Core.CS010_dipole12.position = [0.119885557551,  0.920264027099, 6364621.15694]
-
-PIC.Core.CS008_dipole0.position  = [0.119868321939,  0.920290354485, 6364620.49802]
-PIC.Core.CS008_dipole4.position  = [0.119874940131,  0.920294201177, 6364620.43385]
-PIC.Core.CS008_dipole8.position  = [0.11989802405 ,  0.920286213523, 6364620.68626]
-PIC.Core.CS008_dipole12.position = [0.119891406343,  0.920282367332, 6364620.78143]
-
-PIC.Core.CS008_dipole2.position  = [0.119870138051,  0.920290332143, 6364620.49848]
-PIC.Core.CS008_dipole6.position  = [0.119876755758,  0.920294178352, 6364620.43832]
-PIC.Core.CS008_dipole10.position = [0.119899840162,  0.920286191164, 6364620.65372]
-PIC.Core.CS008_dipole14.position = [0.11989322197 ,  0.92028234448 , 6364620.7349 ]
-
-PIC.Core.CS001_dipole0.position  = [0.119851166807,  0.920235879575, 6364622.29932]
-PIC.Core.CS001_dipole4.position  = [0.119857784514,  0.920239726254, 6364622.21414]
-PIC.Core.CS001_dipole8.position  = [0.119864135573,  0.92023571831 , 6364622.27264]
-PIC.Core.CS001_dipole12.position = [0.119857518351,  0.920231872127, 6364622.37981]
-
-PIC.Core.CS001_dipole2.position  = [0.119852982435,  0.920235857235, 6364622.30378]
-PIC.Core.CS001_dipole6.position  = [0.119859600141,  0.920239703431, 6364622.22461]
-PIC.Core.CS001_dipole10.position = [0.119865951201,  0.920235695977, 6364622.2921 ]
-PIC.Core.CS001_dipole14.position = [0.119859333979,  0.920231849302, 6364622.38528]
-
-PIC.Core.CS016_dipole0.position  = [0.119958492436,  0.920263459402, 6364621.32162]
-PIC.Core.CS016_dipole4.position  = [0.119965110628,  0.920267305601, 6364621.24345]
-PIC.Core.CS016_dipole8.position  = [0.119971461687,  0.920263297671, 6364621.33295]
-PIC.Core.CS016_dipole12.position = [0.119964843495,  0.920259451478, 6364621.42212]
-
-PIC.Core.CS016_dipole2.position  = [0.119960308063,  0.920263437061, 6364621.32208]
-PIC.Core.CS016_dipole6.position  = [0.119966926255,  0.920267283259, 6364621.24391]
-PIC.Core.CS016_dipole10.position = [0.119973277314,  0.920263274843, 6364621.33342]
-PIC.Core.CS016_dipole14.position = [0.119966659122,  0.920259428651, 6364621.42259]
-
 PIC.Core.CS001_dipole0.port  = lii001:4346
 PIC.Core.CS001_dipole4.port  = lii001:4347
 PIC.Core.CS001_dipole8.port  = lii002:4348
@@ -169,17 +297,17 @@ PIC.Core.CS016_dipole10.port = lii012:4348
 PIC.Core.CS016_dipole14.port = lii012:4349
 
 PIC.Core.CS030_dipole0.port  = lii005:4346
-PIC.Core.CS030_dipole4.port  = lii005:4347
-PIC.Core.CS030_dipole8.port  = lii006:4348
-PIC.Core.CS030_dipole12.port = lii006:4349
-
-PIC.Core.CS031_dipole0.port  = lii007:4346
-PIC.Core.CS031_dipole4.port  = lii007:4347
-PIC.Core.CS031_dipole8.port  = lii008:4348
-PIC.Core.CS031_dipole12.port = lii008:4349
-
-PIC.Core.CS032_dipole0.port  = lii009:4346
-PIC.Core.CS032_dipole4.port  = lii009:4347
-PIC.Core.CS032_dipole8.port  = lii010:4348
-PIC.Core.CS032_dipole12.port = lii010:4349
+PIC.Core.CS030_dipole7.port  = lii005:4347
+PIC.Core.CS030_dipole10.port = lii006:4348
+PIC.Core.CS030_dipole14.port = lii006:4349
+
+PIC.Core.CS031_dipole16.port = lii007:4346
+PIC.Core.CS031_dipole22.port = lii007:4347
+PIC.Core.CS031_dipole24.port = lii008:4348
+PIC.Core.CS031_dipole31.port = lii008:4349
+
+PIC.Core.CS032_dipole34.port = lii009:4346
+PIC.Core.CS032_dipole37.port = lii009:4347
+PIC.Core.CS032_dipole42.port = lii010:4348
+PIC.Core.CS032_dipole46.port = lii010:4349