Revise based on Evan's comments.