Replaced notify with noop()