Updated the group code to actually work