Improve pairing post a bit