Reflect comments from Esteban