implemented some of the feedback