Class needs updated for groups 2/3