Worked on fixing issues with groups