Navigation thrown out and redone