better notification handling