Updates after review