doing some improvements