Working version, Added term information