minor edit + Geoff's edit