More changes by Nicolas