Notification modifications
resolved issues