Delete and Edit added #7