Improve logging again, commit was lost with revert