Updates after first review