updates according to comments