new version with Annie's revisions