More work on global navigation