Added criteria checking to assist with the matching options