More changes for VI