First round of edits by Saeed