Terms saving implemented (or at least i hope so)