merged with changes made in school