Discovery tool (10/28)

Discovery tool