Changes made by Nicolas in his last version