switch back to using index sets for added and removed items