modified TimDiscovery, but not test