Logging rework