Need to change: logger 2