major correctif and refractoring