Last changes

you can choose to use the new way of scaling or not