logging rework