more terms, and some updated