Added more params, trying to integrate navigate_loiter.