Update according to design review