updated logging behaviour
adapted
adapted