Added a notification system