Integrating Seth's comments