added Notification + other client Feedback changes