further changes from the summer school