Improving the logging.