new logger2 branch with all changes from old logger