adjust code to feedback