added waypoints and fixed class