Adding Mike's work

Mike's work fine tuning the matching criteria