flavio's changes