Re add logging