Changed all instances of class to group