Updates after review by John