Apply feedbacks from Nadine.