making some design changes