added/updated regexes