Changes requested by Xavier Perseguers.