More work on logging.