updated regexmatcher