Integrating Matias's feedback