Moved Navstrate to the Haddon format