changes
Adding some improvements