Improved logging again