Round of client Edits