more year class refactor