Improved notification system