v10:Made some changes