Updated navigate states to use the waypoint file