Updated for Logging