refactor of term changes