Added changes to feedback, a lot nicer now