Better waiting and searching