added simple waypoints