tidied: after fiddle with logging