control & design changes