Refactoring to the notification branch