Finished Work on Navigation