Add and remove and new code