changes I left out of the previous