Updated for logging output