moved to notifier class architecture