joined and improved regexes