Improved notification system II