This is the main line I added. Most other changes are whitespace conflcits, there was weird spacing in the original file.