Logging still needs adding back in.