added toggleActivate