New class1 changes