Changed the regex pattern to match more stuff