addressed feedbacks