More changes to version2