Second try for mass dependent fitter