More changes to Class 3