Niall final commit