- some improvements