Update according to comments