updated regexes