Modified existing code to work with Notifications

Modified existing code to work with Notifications