Added better logs