some improvements..