Class 8 updates