Improved notification