revisions as per Angelique's suggestions