some design changes