New way of handling notifications