adding more grouping fixes