Changes to classes effective 11/6