changed to use group_by