added waypoint control