Incorporate Daniel's comments.