making michael's last round of edits