Client should be able to detect other clients better.