Apply half of feedbacks from Alain.