Improved pairing