Updates after discussion