Rhys add in latest changes