diff --git a/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf b/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf
index af96f02e144ae7cb4d32553022cd9cfdd66825f9..d08c9c2d4352689ec8ebef372156faaeac379776 100644
--- a/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf
+++ b/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf
@@ -1,8 +1,9 @@
+# CableDelays.conf KAIRA (FI609)
 #
-# CableDelays.conf KAIRA
+# Derek McKay-Bukowski, SGO, 2012-09-27
 #
-# This file contains for each input of each RCU the delay the length of the cable
-# connected to it adds to the signal path.
+# This file contains for each input of each RCU the delay the length of
+# the cable connected to it adds to the signal path.
 #
 # Lenghts are in meters, delays are in ns.
 #
@@ -13,102 +14,126 @@
 #   115m    465.5254
 #   130m    530.6981
 #
+# 50m cables are formed from an 80m cable, joined with half of a second
+# 80m cable. Joins for these cables are located in the LBA cable
+# mausoleum.
+#
+# HBA cable delays are based on the nominal cable length values (from
+# the cable barcodes). LBA values are based on a combination of bar
+# codes and the measured group delays of the 40m extension components.
+#
+#
+#
+# ACHTUNG!!!
+#
+# There is currently no 50m column in Attenuation.conf. Additionally,
+# the software can only cope
+# with three LBA cable values. This will require some hacking...
+# *ahem* modification by Menno to
+# make this work. Thus, in the interim, we shall use 115m attenuations
+# for the 50m cables
+# (although the cable delay lengths themselves will still be the
+# correct values for teh 50m
+# length.
+#
+#
+#
 #	LBL           	LBH             	HBA
-#RCUnr  len 	delay       	len 	delay       	len 	delay
+#RCUnr  len 	delay  	len 	delay	len 	delay
 #-----------------------------------------------------------------------
-0	0	0.0		0	0.0		85	342.5133
-1	0	0.0		0	0.0		85	342.5133
-2	0	0.0		0	0.0		85	342.5133
-3	0	0.0		0	0.0		85	342.5133
-4	0	0.0		0	0.0		85	342.5133
-5	0	0.0		0	0.0		85	342.5133
-6	0	0.0		0	0.0		85	342.5133
-7	0	0.0		0	0.0		85	342.5133
-8	0	0.0		0	0.0		85	342.5133
-9	0	0.0		0	0.0		85	342.5133
-10	0	0.0		0	0.0		85	342.5133
-11	0	0.0		0	0.0		85	342.5133
-12	0	0.0		0	0.0		115	465.5254
-13	0	0.0		0	0.0		115	465.5254
-14	0	0.0		0	0.0		115	465.5254
-15	0	0.0		0	0.0		115	465.5254
-16	0	0.0		0	0.0		85	342.5133
-17	0	0.0		0	0.0		85	342.5133
-18	0	0.0		0	0.0		85	342.5133
-19	0	0.0		0	0.0		85	342.5133
-20	0	0.0		0	0.0		85	342.5133
-21	0	0.0		0	0.0		85	342.5133
-22	0	0.0		0	0.0		85	342.5133
-23	0	0.0		0	0.0		85	342.5133
-24	0	0.0		0	0.0		85	342.5133
-25	0	0.0		0	0.0		85	342.5133
-26	0	0.0		0	0.0		115	465.5254
-27	0	0.0		0	0.0		115	465.5254
-28	0	0.0		0	0.0		115	465.5254
-29	0	0.0		0	0.0		115	465.5254
-30	0	0.0		0	0.0		115	465.5254
-31	0	0.0		0	0.0		115	465.5254
-32	0	0.0		0	0.0		85	342.5133
-33	0	0.0		0	0.0		85	342.5133
-34	0	0.0		0	0.0		85	342.5133
-35	0	0.0		0	0.0		85	342.5133
-36	0	0.0		0	0.0		85	342.5133
-37	0	0.0		0	0.0		85	342.5133
-38	0	0.0		0	0.0		85	342.5133
-39	0	0.0		0	0.0		85	342.5133
-40	0	0.0		0	0.0		115	465.5254
-41	0	0.0		0	0.0		115	465.5254
-42	0	0.0		0	0.0		115	465.5254
-43	0	0.0		0	0.0		115	465.5254
-44	0	0.0		0	0.0		115	465.5254
-45	0	0.0		0	0.0		115	465.5254
-46	0	0.0		0	0.0		115	465.5254
-47	0	0.0		0	0.0		115	465.5254
-48	0	0.0		0	0.0		85	342.5133
-49	0	0.0		0	0.0		85	342.5133
-50	0	0.0		0	0.0		85	342.5133
-51	0	0.0		0	0.0		85	342.5133
-52	0	0.0		0	0.0		85	342.5133
-53	0	0.0		0	0.0		85	342.5133
-54	0	0.0		0	0.0		85	342.5133
-55	0	0.0		0	0.0		85	342.5133
-56	0	0.0		0	0.0		115	465.5254
-57	0	0.0		0	0.0		115	465.5254
-58	0	0.0		0	0.0		115	465.5254
-59	0	0.0		0	0.0		115	465.5254
-60	0	0.0		0	0.0		115	465.5254
-61	0	0.0		0	0.0		115	465.5254
-62	0	0.0		0	0.0		115	465.5254
-63	0	0.0		0	0.0		115	465.5254
-64	0	0.0		0	0.0		85	342.5133
-65	0	0.0		0	0.0		85	342.5133
-66	0	0.0		0	0.0		85	342.5133
-67	0	0.0		0	0.0		85	342.5133
-68	0	0.0		0	0.0		85	342.5133
-69	0	0.0		0	0.0		85	342.5133
-70	0	0.0		0	0.0		115	465.5254
-71	0	0.0		0	0.0		115	465.5254
-72	0	0.0		0	0.0		115	465.5254
-73	0	0.0		0	0.0		115	465.5254
-74	0	0.0		0	0.0		115	465.5254
-75	0	0.0		0	0.0		115	465.5254
-76	0	0.0		0	0.0		115	465.5254
-77	0	0.0		0	0.0		115	465.5254
-78	0	0.0		0	0.0		115	465.5254
-79	0	0.0		0	0.0		115	465.5254
-80	0	0.0		0	0.0		85	342.5133
-81	0	0.0		0	0.0		85	342.5133
-82	0	0.0		0	0.0		85	342.5133
-83	0	0.0		0	0.0		85	342.5133
-84	0	0.0		0	0.0		115	465.5254
-85	0	0.0		0	0.0		115	465.5254
-86	0	0.0		0	0.0		115	465.5254
-87	0	0.0		0	0.0		115	465.5254
-88	0	0.0		0	0.0		115	465.5254
-89	0	0.0		0	0.0		115	465.5254
-90	0	0.0		0	0.0		115	465.5254
-91	0	0.0		0	0.0		115	465.5254
-92	0	0.0		0	0.0		115	465.5254
-93	0	0.0		0	0.0		115	465.5254
-94	0	0.0		0	0.0		115	465.5254
-95	0	0.0		0	0.0		115	465.5254
\ No newline at end of file
+0	115	465.60		115	465.60		85	342.40
+1	115	465.60		115	465.60		85	342.40
+2	115	465.60		115	465.60		85	342.70
+3	115	465.60		115	465.60		85	342.40
+4	115	465.60		115	465.60		85	342.60
+5	115	465.60		115	465.60		85	342.40
+6	115	465.60		115	465.60		85	342.50
+7	115	465.60		115	465.60		85	342.40
+8	115	465.40		115	465.40		85	342.60
+9	115	465.60		115	465.60		85	342.40
+10	50	483.60		50	483.60		85	342.50
+11	50	483.80		50	483.80		85	342.50
+12	50	477.70		50	477.70		115	465.60
+13	50	478.70		50	478.70		115	465.50
+14	115	465.60		115	465.60		115	465.60
+15	115	465.60		115	465.60		115	465.60
+16	115	465.60		115	465.60		85	342.60
+17	115	465.60		115	465.60		85	342.40
+18	50	478.70		50	478.70		85	342.60
+19	50	477.70		50	477.70		85	342.00
+20	50	482.70		50	482.70		85	342.60
+21	50	483.80		50	483.80		85	342.40
+22	50	478.70		50	478.70		85	342.30
+23	50	477.70		50	477.70		85	342.40
+24	50	478.80		50	478.80		85	342.50
+25	50	478.70		50	478.70		85	342.40
+26	115	465.60		115	465.60		115	465.50
+27	115	465.60		115	465.60		115	465.40
+28	115	465.50		115	465.50		115	465.60
+29	115	465.50		115	465.50		115	465.50
+30	115	465.60		115	465.60		115	465.50
+31	115	465.60		115	465.60		115	465.60
+32	115	465.60		115	465.60		85	342.40
+33	115	465.60		115	465.60		85	342.40
+34	115	465.60		115	465.60		85	342.60
+35	115	465.60		115	465.60		85	342.40
+36	115	465.60		115	465.60		85	342.40
+37	115	465.60		115	465.60		85	342.40
+38	50	477.80		50	477.80		85	342.40
+39	50	477.80		50	477.80		85	342.40
+40	50	478.50		50	478.50		115	465.60
+41	50	478.70		50	478.70		115	465.60
+42	50	482.80		50	482.80		115	465.50
+43	50	482.80		50	482.80		115	465.70
+44	50	483.70		50	483.70		115	465.50
+45	50	482.80		50	482.80		115	465.40
+46	50	477.70		50	477.70		115	465.60
+47	50	478.70		50	478.70		115	465.40
+48	50	483.10		50	483.10		85	342.20
+49	50	482.70		50	482.70		85	342.30
+50	50	478.80		50	478.80		85	342.70
+51	50	478.80		50	478.80		85	342.40
+52	50	478.80		50	478.80		85	342.40
+53	50	477.80		50	477.80		85	342.40
+54	115	465.60		115	465.60		85	342.40
+55	115	465.60		115	465.60		85	342.50
+56	115	465.60		115	465.60		115	465.60
+57	115	465.60		115	465.60		115	465.50
+58	80	320.60		80	320.60		115	465.60
+59	80	319.70		80	319.70		115	465.50
+60	115	465.60		115	465.60		115	465.60
+61	115	465.60		115	465.60		115	465.50
+62	115	465.60		115	465.60		115	465.50
+63	115	465.60		115	465.60		115	465.50
+64	50	478.70		50	478.70		85	342.60
+65	50	477.80		50	477.80		85	342.40
+66	50	478.80		50	478.80		85	342.40
+67	50	478.70		50	478.70		85	342.10
+68	50	478.70		50	478.70		85	342.60
+69	50	478.70		50	478.70		85	342.50
+70	50	482.80		50	482.80		115	465.60
+71	50	483.80		50	483.80		115	465.60
+72	130	518.70		130	518.70		115	465.60
+73	130	519.00		130	519.00		115	465.40
+74	50	482.70		50	482.70		115	465.50
+75	50	482.70		50	482.70		115	465.50
+76	130	519.30		130	519.30		115	465.50
+77	130	519.10		130	519.10		115	465.50
+78	50	482.70		50	482.70		115	465.50
+79	50	483.60		50	483.60		115	465.40
+80	50	482.70		50	482.70		85	342.60
+81	50	483.80		50	483.80		85	342.30
+82	50	478.80		50	478.80		85	342.60
+83	50	478.80		50	478.80		85	342.50
+84	50	478.70		50	478.70		115	465.60
+85	50	478.70		50	478.70		115	465.40
+86	115	465.60		115	465.60		115	465.60
+87	115	465.60		115	465.60		115	465.50
+88	115	465.60		115	465.60		115	465.60
+89	115	465.40		115	465.40		115	465.50
+90	80	326.80		80	326.80		115	465.50
+91	80	326.90		80	326.90		115	465.40
+92	50	477.80		50	477.80		115	465.60
+93	50	477.80		50	477.80		115	465.60
+94	115	465.60		115	465.60		115	465.40
+95	115	465.60		115	465.60		115	465.60