added some design changes