Updated internals of the navs