#13 refactored matchers