Changes based on discussion with Peter