Doesn't it make sense to fine tune the navigator using navigator_list here too?