- Fixed a bug in range finding and started using custom pairs