Responds to some of Francesc's feedback