More client edits