Re-instate rhys' changes after merge