Dan's revisions