Deanh/updates