added better navigator