Added grouping draft