Reword some of the path discovery