Added back the notify feature
Remove notify function call