Refine according to Jon's comments.