Incorporating Jon's comments.