updated case regexps