06 incorporating comments from Xian sent 7/12

See Ina's reply on the list from 7/18