Fit with the new version of Eddy