- added remove and assign