merged github with school version