Additional client edits