some changes - included logger