update according to the feedback