logging enhanced a little bit