revisions as per discussion with clair