Our changes for vpl