Navigation tracking rethink