Class 2 and more updates