More changes for V0