update according to comments