useing waypoints now