modified the removal and set addition as well as exercise addition