all of my small changes and chris's larger