Changes by Marco

As title says