Improve on logs