Changed how pairing are made.