More changes according to Mathilde