added more regexes