Few changes and improvements.