a lot of design changes