pairing id refactoring works