Added Feedbacks and fix