made matches more strict