some changes I did not keep track of