more tweaking on on logging