- some design changes