Added group name and did testing