MAJOR revisions to logging