Major progress on logging