modify according to feedback