UPDATE - v.1.5.2 for The Navigator