diff --git a/GPUProc/etc/parset-additions.d/default/StationCalibration.parset b/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
index a445be60775748adf9ec92a05182c6961e87d39c..7d2c9ee4513207d94cae5b897297c41a9a8e47b3 100644
--- a/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
+++ b/GPUProc/etc/parset-additions.d/default/StationCalibration.parset
@@ -1,151 +1,76 @@
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X        = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y        = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X        = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y        = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X        = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y        = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.X              = 4.675321e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.Y              = 4.674847e-06
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.X              = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.Y              = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.X              = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.Y              = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.X              = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.Y              = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.X             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.phase0.Y             = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X        = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y        = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X        = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y        = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X        = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y        = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.X       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.phase0.Y       = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.X               = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.Y               = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.X              = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.phase0.Y              = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.X               = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.Y               = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.X              = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.phase0.Y              = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.X               = 4.675269e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.Y               = 4.674857e-06
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.X              = 0.000000e+00
-PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.phase0.Y              = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.X             = 4.675295e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.delay.Y             = 4.674852e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.phase0.X            = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_110_190.phase0.Y            = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.X             = 4.675295e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.delay.Y             = 4.674852e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.phase0.X            = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_170_230.phase0.Y            = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.X             = 4.675295e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.delay.Y             = 4.674852e-06
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.phase0.X            = 0.000000e+00
-PIC.Core.CS001HBA.HBA_JOINED.HBA_210_250.phase0.Y            = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.phase0.Y               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.delay.X                = 4.674506e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.delay.Y                = 4.674821e-06
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.phase0.X               = 0.000000e+00
-PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.phase0.Y               = 0.000000e+00
+# LOFAR2 has no calibration values yet. Should be better calibrated due to WR though, so
+# we assume a 0 delay for now.
+# NB: LOFAR2 does not support HBA_JOINED, so that is omitted from this list.
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA0.HBA_ZERO.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_DUAL_INNER.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_110_190.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_170_230.delay.Y = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.X = 0.0
+PIC.Core.CS001HBA1.HBA_ONE.HBA_210_250.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_10_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_INNER.LBA_30_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_10_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_OUTER.LBA_30_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_10_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_EVEN.LBA_30_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_10_90.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_70.delay.Y = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.delay.X = 0.0
+PIC.Core.CS001LBA.LBA_SPARSE_ODD.LBA_30_90.delay.Y = 0.0
+
+# LOFAR1 stations
 PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.X              = 6.894965e-06
 PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.delay.Y              = 6.895319e-06
 PIC.Core.CS002HBA0.HBA_DUAL.HBA_110_190.phase0.X             = 0.000000e+00
diff --git a/GPUProc/etc/parset-additions.d/default/StationStreams.parset b/GPUProc/etc/parset-additions.d/default/StationStreams.parset
index 41e134986fbb933e8168b58eb7c8bc39e3919c35..f155ad79f27621b4b9f3725b3b6d7b2d75ef2051 100644
--- a/GPUProc/etc/parset-additions.d/default/StationStreams.parset
+++ b/GPUProc/etc/parset-additions.d/default/StationStreams.parset
@@ -1,12 +1,21 @@
-# StationStreams.parset  This file is generated by generateStationStreams.sh
-PIC.Core.CS001HBA.RSP.receiver  = cbt201_0
-PIC.Core.CS001HBA.RSP.sources     = [udp+sdp:cbt201-10GB01.online.lofar:10010]
+# LOFAR2 stations
 PIC.Core.CS001HBA0.RSP.receiver = cbt201_0
-PIC.Core.CS001HBA0.RSP.sources    = [udp+sdp:cbt201-10GB01.online.lofar:10010]
+PIC.Core.CS001HBA0.RSP.sources    = [udp+sdp:cbt201-10GB01.online.lofar:10011]
+PIC.Core.CS001HBA0.RSP.nrBeamletsPerBoard = 488
 PIC.Core.CS001HBA1.RSP.receiver = cbt201_0
-PIC.Core.CS001HBA1.RSP.sources    = [udp+sdp:cbt201-10GB01.online.lofar:10016]
+PIC.Core.CS001HBA1.RSP.sources    = [udp+sdp:cbt201-10GB01.online.lofar:10012]
+PIC.Core.CS001HBA1.RSP.nrBeamletsPerBoard = 488
 PIC.Core.CS001LBA.RSP.receiver  = cbt201_0
 PIC.Core.CS001LBA.RSP.sources     = [udp+sdp:cbt201-10GB01.online.lofar:10010]
+PIC.Core.CS001LBA.RSP.nrBeamletsPerBoard = 488
+Observation.Dataslots.CS001HBA0.RSPBoardList=[488*0]
+Observation.Dataslots.CS001HBA0.DataslotList=[0..487]
+Observation.Dataslots.CS001HBA1.RSPBoardList=[488*0]
+Observation.Dataslots.CS001HBA1.DataslotList=[0..487]
+Observation.Dataslots.CS001LBA.RSPBoardList=[488*0]
+Observation.Dataslots.CS001LBA.DataslotList=[0..487]
+
+# LOFAR1 stations
 PIC.Core.CS002HBA.RSP.receiver  = cbt207_0
 PIC.Core.CS002HBA.RSP.sources     = [udp:cbt207-10GB01.online.lofar:10020, udp:cbt207-10GB01.online.lofar:10021, udp:cbt207-10GB01.online.lofar:10022, udp:cbt207-10GB01.online.lofar:10023]
 PIC.Core.CS002HBA0.RSP.receiver = cbt207_0