Apply feedbacks from Alain.