merged ADD and  REMOVE Controllers to a single controller