Files were updated with Edson's comments.