Improving mates analysis