Changing the regular expression to be much simpler