global edits - 4th round of client changes