Apply feedbacks from Lydie.