more class4 changes