New changes
Only regular expression remaining