Worked more on the notification system