changes for school functionality