Added group by back in