Apply feedbacks from Alexis.