Improved and fixed pair selection