Updated for Joe's comments.