moving more plugins to use notifications