Update from Niall Lennon

Update from Niall Lennon