design changes

structural