Added more Class 12 stuff