change s.schoolYear to s.code