still fixing navi :(