Merge "Rework the logs"