some navigation polishing