fixes to class 11