updated regular expression