Logging is now done in one place