Incorporated edits from call