Incorporate Marcelo's edits. I'm DONE!