modified navigate