Updated code to include Notifications