Applied some of the feedbacks