Added Delete and Edit functions