Worked more on Notifications