Comments from Audric Martel (@martel09)