new regex, more logging