Updating to latest work