Addressed Pierre-Antoine's comments.