Discovery tool (7/28)

Discovery tool