changed notifications logic