add groupBy & each