Adding v2v logic