add/remove and commit