Update discovery logic to be more battery friendly