More work on the new logging