enhance the regex