Optimized

by J.-B. Morizot