Added some improvements.