modified regexes for added cases