Working version, added the term information