handled the second round of edits from maxim