Improving logging #2