Changes from matias and Jean-Lou