More revisions to Class 2