Refactoring outcome to use notification object.