remove and re-add