Add group name and change a bit in report