Tweaked the logging