Merging work with john and ciarans