Back to old boiler for interpolation, but keeping the scaling of mass fl...

See #167