Fabio's changes included