reconciled Tim's changes with my copy changes because I don't know how to dif on the command line.