Updates to working V1