Fixed last set of bugs
Group or Aggregate