added the regex to deal with name