a change corresponding to the some bug fixes and improvements