Add Vy algorithm
Improve Vy's algorithm
Clean ups