Updates after discussion with Allyn and Bob