Improve term-cycle