work on Notifications mechanism