26 notification refactoring