Apply Florent's modifications.