added some regexes