Update according to review