changes based on discussion with david