worked a bit on grouping by