Added Class 10 stuff