Use remove/add instead of toggle