Reflect comments by Marcos