work with new schema and smarter take strategy
better log levels, consistent logging