design changes from Emily