bit more logging, bit less to be simple