Improved unique pads detection