Updated notification system