log refactoring undergoing - not yet complete