8th commit with edit delete features