polishing add/remove and code