Adds Nicki and Glenn's edits