Added remove and edit