some design changes.