lots of design changes