modification to matching, no final version