removed Yuan's latest modifications to this file