added enhanced navigation