revisions from Eduardo