Comments from Romain Clt (@RomainClt1)