Completed vv validation changes