Class 2 improvements