smarter notification handling