Final changes to v1