all changes up to navi