further format changes to classes from 8 to 13