minor modification for the navigator part