more discovery and performance measurement