modify according to comments