Updated Navigator