fixed VPA, change in file structure