added more matching criterias