v1.2 Update for Navigator