Updates after 2nd round of discussion with Tim