Working on the feedback