new way of handling notifications