added testing and reenabled regexes. logging is not necessary