Adapt navigate()