added remove and add functions
conflicts