Altered how waypoints get inlcuded.