More Robust Navigation [DONE]