first batch of design changes