Address feedback from Marcelo and Patrick