Revised the regex