Address Keith's second round of comments.
Revert figure back to the version with improvement numbers