+ swapped location based waypoint logic