making some improvements