Regex update and some MARS directives