discovery need to be more smarter