Added two-stage fitter