minor changes in match