Changed UC7 to also handle adding and removing. Also removed specific terms