Incorporate Ed and Anne's suggestions