Adding some improvements

Adding some improvements