[No need for review] Updates after review