Changes so as SchAcademia is working properly