update according to review