Minor changes before implemtning Van