Nav tree, improve mercury integration.