Main regexp updated