Revised James merge. Fixed get_route_points calling