Update to a working V1