Incorporate John's suggestions