- some design improvements