Making some improvements