changed message regexes