Updates to Class 4