Changes requested by Matt Heffernan.