notifications refactoring 2
notifications refactoring 2