Adding some improvements.