Rewrote the feedback part