grouping done and correcting mistakes