Maybe it's better to name this as "Improve NavigateTo performance"?