Changed approach to a notification