Always remove and re-add