Add pretty log
Try and make it a bit safer