Re: redesign term evaluation and assembling