Pairing improvements