Completed incorporating all of Michelle's edits