made changes from John and Brandon's notes