Changes due to discussion with Mickael Leclercq 11/23