Update to latest work