several design changes