remove and add in public