FIX?: Different pairing algorithm