Updated to add client link control