Added vehicle demo and fixing up the methods