Updated for school year logic