More changes to v2