Updates based on Marcelo's review feedback