new version of the new route, I still feel awkward around getting some of the waypoints tho :(