changed regexps