Change from toggle to rem/add