removed group_by stuff since it didnt work