some improvements on discovery.