final changes to v1