Import logger changes from TV.. ooops