Edits cont'd