added regexes