update per Juan's comments.