syntax update, regex update