Further transition to new math classes