another round of client revisions