some more changes from school