add and remove properly