Added grouping and section delete