more changes to v2