Better visualization and routing