Updated the regex