added remove and edit ability