Modified with option to show/hide notification message.